auto sync proper data merging

cookbook/serializer.py

@@ -1152,7 +1152,7 @@ class ShoppingListEntrySerializer(WritableNestedModelSerializer):
             'recipe_mealplan',
             'created_by', 'created_at', 'updated_at', 'completed_at', 'delay_until'
         )
-        read_only_fields = ('id', 'created_by', 'created_at',)
+        read_only_fields = ('id', 'created_by', 'created_at','updated_at',)
 
 
 class ShoppingListEntryBulkSerializer(serializers.Serializer):

cookbook/views/api.py

@@ -1168,7 +1168,8 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
         try:
             last_autosync = self.request.query_params.get('last_autosync', None)
             if last_autosync:
-                last_autosync = make_aware(datetime.datetime.fromtimestamp(int(last_autosync) / 1000))
+
+                last_autosync = datetime.datetime.fromtimestamp(int(last_autosync) / 1000, datetime.timezone.utc)
                 self.queryset = self.queryset.filter(updated_at__gte=last_autosync)
         except:
             traceback.print_exc()
@@ -1189,7 +1190,10 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
                 Q(created_by=self.request.user)
                 | Q(shoppinglist__shared=self.request.user)
                 | Q(created_by__in=list(self.request.user.get_shopping_share()))
-            ).filter(space=request.space, id__in=serializer.validated_data['ids']).update(checked=serializer.validated_data['checked'])
+            ).filter(space=request.space, id__in=serializer.validated_data['ids']).update(
+                checked=serializer.validated_data['checked'],
+                updated_at=timezone.now(),
+            )
             return Response(serializer.data)
         else:
             return Response(serializer.errors, 400)

vue/src/apps/ShoppingListView/ShoppingListView.vue

@@ -1,10 +1,9 @@
 <template>
     <div id="app">
-        <b-alert :show="shopping_list_store.has_failed_items" dismissible class="float-up mt-2" variant="warning">
+        <b-alert :show="shopping_list_store.has_failed_items" class="float-up mt-2" variant="warning">
             {{$t('ShoppingBackgroundSyncWarning')}}
         </b-alert>
 
-
         <div class="row float-top w-100">
             <div class="col-auto no-gutter ml-auto">
                 <b-button variant="link" @click="useShoppingListStore().undoChange()"><i class="fas fa-undo"></i>
@@ -555,10 +554,6 @@ export default {
         useUserPreferenceStore().loadUserSettings()
         useUserPreferenceStore().loadDeviceSettings()
         this.autoSyncLoop()
-
-        setInterval(() => {
-            this.getSyncQueueLength()
-        },1000)
     },
     methods: {
         useUserPreferenceStore,

vue/src/stores/ShoppingListStore.js

@@ -157,6 +157,8 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         refreshFromAPI() {
             if (!this.currently_updating) {
                 this.currently_updating = true
+                this.last_autosync = new Date().getTime();
+
                 let apiClient = new ApiApiFactory()
                 apiClient.listShoppingListEntrys().then((r) => {
                     this.entries = {}
@@ -189,6 +191,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
          */
         autosync() {
             if (!this.currently_updating && this.autosync_has_focus) {
+
                 this.currently_updating = true
 
                 let previous_autosync = this.last_autosync
@@ -200,6 +203,8 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 }).then((r) => {
                     r.data.forEach((e) => {
                         // dont update stale client data
+                        console.log('new: ', !(Object.keys(this.entries).includes(e.id.toString())), ' updated at ', Date.parse(this.entries[e.id].updated_at) < Date.parse(e.updated_at))
+                        console.log('client updated at ', this.entries[e.id].updated_at,Date.parse(this.entries[e.id].updated_at), ' server updated at ', e.updated_at,Date.parse(e.updated_at))
                         if (!(Object.keys(this.entries).includes(e.id.toString())) || Date.parse(this.entries[e.id].updated_at) < Date.parse(e.updated_at)) {
                             console.log('auto sync updating entry ', e)
                             Vue.set(this.entries, e.id, e)
@@ -242,7 +247,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             let apiClient = new ApiApiFactory()
             // sets the update_at timestamp on the client to prevent auto sync from overriding with older changes
             // moment().format() yields locale aware datetime without ms 2024-01-04T13:39:08.607238+01:00
-            Vue.set(object, 'update_at', moment().format())
+            Vue.set(object, 'updated_at', moment().format())
 
             return apiClient.updateShoppingListEntry(object.id, object).then((r) => {
                 Vue.set(this.entries, r.data.id, r.data)
@@ -321,11 +326,12 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
             if (undo) {
                 this.registerChange((checked ? 'CHECKED' : 'UNCHECKED'), entries)
             }
+            console.log('entry changed at ', Date.now(), ' setting to ', moment().format())
 
             let entry_id_list = []
             for (let i in entries) {
                 Vue.set(this.entries[i], 'checked', checked)
-                Vue.set(this.entries[i], 'update_at', moment().format())
+                Vue.set(this.entries[i], 'updated_at', moment().format())
                 entry_id_list.push(i)
             }