Implemented submitting the quest answers in the background

- updated syncDataToOSM method to responding back in same thread
- removed holding realm objects in long duration
- updated getChangesets API with predicate
- removed dependancy of submitted state in answering quest
- added new state syncBackground in answer quest
- removed alerting user on success / failure cases of answer quests

Author: srikanth-vg

GoInfoGame/GoInfoGame/DataBase/DatabaseConnector.swift

@@ -326,15 +326,9 @@ class DatabaseConnector {
     /// - parameter synced: Optional variable of whether synced or non synced
     /// - Returns: an instance of `Results<StoredChangeset>`
     func getChangesets(synced: Bool = false) -> Results<StoredChangeset> {
-        let results: Results<StoredChangeset>
         let realm = try! Realm(configuration: RealmConfig.configuration)
-        if synced {
-            results = realm.objects(StoredChangeset.self).where { $0.changesetId != -1 }
-        } else {
-            results = realm.objects(StoredChangeset.self).where { $0.changesetId == -1 }
-        }
-        print("Found \(results.count) changesets for synced=\(synced)")
-        return results
+        let predicateString = synced ? "updatedVersion != -1" : "updatedVersion == -1"
+        return realm.objects(StoredChangeset.self).filter(NSPredicate(format: predicateString))
     }
 
     func getChangeset(for id: String) -> StoredChangeset? {

GoInfoGame/GoInfoGame/UI/Map/MapView.swift

@@ -220,8 +220,13 @@ struct MapView: View {
             .toolbar {
 
                 ToolbarItem(placement: .navigationBarTrailing) {
-                    QuestSyncButton(badgeCount: 0, isSyncing: isSyncing, action: {
+                    QuestSyncButton(badgeCount: viewModel.syncFailedElementsCount, isSyncing: isSyncing, action: {
                         debugPrint("Sync taped")
+                        isSyncing = true
+                        DatasyncManager.shared.syncDataToOSM(exclude_gig_tags: false) { _ in
+                            isSyncing = false
+                            viewModel.checkSyncStatus()
+                        }
                     })
                     .frame(width: 20, height: 20)
                     .foregroundStyle(Color("theme"))
@@ -424,23 +429,15 @@ struct MapView: View {
             switch scenario {
             case .dismissed:
                 shouldShowPolyline = false
-            case .submitted(let elementId):
-                shouldShowPolyline = false
-                showAlert = true
-                alertMessage = "Quest Submitted"
-                viewModel.refreshMapAfterSubmission(elementId: elementId)
             case .syncing:
                 isSyncing = true
                 print("syncing")
             case .synced:
                 isSyncing = false
                 print("synced")
-                alertIcon = "checkmark.circle.fill"
             case .failed(let message):
                 isSyncing = false
-                alertIcon = "exclamationmark.triangle.fill"
-                alertMessage = message
-                showAlert = true
+                viewModel.checkSyncStatus()
             case .hideElement(let elementId, let elementName):
                 shouldShowPolyline = false
                 viewModel.hideQuest(elementId: elementId, elementName: elementName)
@@ -449,6 +446,9 @@ struct MapView: View {
                 showAlert = true
                 alertMessage = "Changes reverted"
                 viewModel.refreshMapAfterUndoSumbit(storedChangesetId: changesetId)
+            case .syncBackground(let elementID):
+                shouldShowPolyline = false
+                viewModel.refreshMapAfterSubmission(elementId: elementID)
             }
         }
         .onReceive(QuestsPublisher.shared.refreshQuest, perform: { _ in
@@ -565,12 +565,12 @@ public class QuestsPublisher: ObservableObject {
 
 public enum SheetDismissalScenario {
     case dismissed
-    case submitted(String)
     case syncing
     case synced
     case failed(String)
     case hideElement(String, String)
     case undoDone(String)
+    case syncBackground(Int)
 }
 
 //TODO: Move to a new file

GoInfoGame/GoInfoGame/UI/Map/MapViewModel.swift

@@ -41,6 +41,7 @@ class MapViewModel: ObservableObject {
     @Published var availableOptions: [SatelliteOption] = []
     @Published var selectedOption: SatelliteOption = .none
     @Published var showSatellitePicker: Bool = false
+    @Published private(set) var syncFailedElementsCount: Int = 0
 
     init(mapRepo: MapRepositoryProtocol = MapRepository()) {
         self.mapRepo = mapRepo
@@ -55,8 +56,13 @@ class MapViewModel: ObservableObject {
         Task {
             self.allSattileLayers = try await self.mapRepo.fetchAvailableServers()
         }
+        checkSyncStatus()
        }
 
+    func checkSyncStatus() {
+        self.syncFailedElementsCount = dbInstance.getChangesets(synced: false).count
+    }
+    
     func sattiliteServersFor(point: CLLocationCoordinate2D) -> [SatelliteServer] {
         return allSattileLayers.filter{ $0.extent.isPointInsideBoundary(point)}
     }
@@ -157,21 +163,10 @@ class MapViewModel: ObservableObject {
         self.items = AppQuestManager.shared.fetchQuestsFromDB()
     }
 
-    func refreshMapAfterSubmission(elementId: String) {
-            
-//        if let newItem = AppQuestManager.shared.getUpdatedQuest(elementId: elementId) {
-//            let toReplace = self.items.first(where: {$0.id == Int(elementId)!})
-//            let index = self.items.firstIndex(where: {$0.id == Int(elementId)!})
-//            
-//            self.items.remove(at: index!)
-//            self.items.insert(newItem, at: index!)
-//        }
-//        else{
-            if let toReplace = self.items.first(where: {$0.id == Int(elementId)!}) {
-                let index = self.items.firstIndex(where: {$0.id == Int(elementId)!})
-                self.items.remove(at: index!)
-            }
-      //  }
+    func refreshMapAfterSubmission(elementId: Int) {
+        if let index = self.items.firstIndex(where: {$0.id == elementId}) {
+            self.items.remove(at: index)
+        }
     }
 
     // The item may have been already resolved or changed.

GoInfoGame/GoInfoGame/data/DatasyncManager.swift

@@ -21,6 +21,8 @@ class DatasyncManager {
     private let barrierQueue: DispatchQueue = DispatchQueue(label: "com.goinfogame.DatasyncManager.barrierQueue", attributes: .concurrent)
 
     func syncDataToOSM(exclude_gig_tags: Bool, completionHandler: @escaping (Result<Bool, APIError>)  -> Void) {
+        let currentQueue = OperationQueue.current?.underlyingQueue ?? .main
+        
         barrierQueue.async(flags: .barrier) { [weak self] in
             guard let self = self else { return }
             let semaphore = DispatchSemaphore(value: 0)
@@ -30,16 +32,20 @@ class DatasyncManager {
                     let isSynced = try await self.syncData(exclude_gig_tags: exclude_gig_tags)
 
                     print("Sync finished")
-                    if isSynced {
-                        print("Sync successful")
-                        completionHandler(.success(true)) // Success
-                    } else {
-                        print("Sync failed")
-                        completionHandler(.failure(APIError.custom("Sync failed. Please try again."))) // Failure
+                    currentQueue.async {
+                        if isSynced {
+                            print("Sync successful")
+                            completionHandler(.success(true)) // Success
+                        } else {
+                            print("Sync failed")
+                            completionHandler(.failure(APIError.custom("Sync failed. Please try again."))) // Failure
+                        }
                     }
                 } catch {
-                    print("Sync failed: \(error)")
-                    completionHandler(.failure(error as! APIError)) // Failure
+                    currentQueue.async {
+                        print("Sync failed: \(error)")
+                        completionHandler(.failure(error as! APIError)) // Failure
+                    }
                 }
                 semaphore.signal()
             }
@@ -79,14 +85,14 @@ class DatasyncManager {
 
         print("📦 Found \(validChangesets.count) unsynced changesets with valid edits")
 
-        var nodesToSync: [String: StoredChangeset] = [:]
-        var waysToSync: [String: StoredChangeset] = [:]
+        var nodesToSync: [String: OSMNode] = [:]
+        var waysToSync: [String: OSMWay] = [:]
 
         for cs in validChangesets {
             if cs.elementType == .node {
-                nodesToSync[cs.id] = cs
+                nodesToSync[cs.id] = cs.asOSMNode()
             } else if cs.elementType == .way {
-                waysToSync[cs.id] = cs
+                waysToSync[cs.id] = cs.asOSMWay()
             }
         }
 
@@ -98,10 +104,10 @@ class DatasyncManager {
         }
 
         for (key, node) in nodesToSync {
-            print("📤 Syncing node ID: \(node.id)")
-            let payload = node.asOSMNode()
+//            print("📤 Syncing node ID: \(node.id)")
+            let payload = node
             do {
-                let status = try await syncNode(node: payload, exclude_gig_tags: exclude_gig_tags, editedTags: node.tags.toDictionary())
+                let status = try await syncNode(node: payload, exclude_gig_tags: exclude_gig_tags, editedTags: node.tags)
                 if status.result {
                     _ = self.dbInstance.assignChangesetId(obj: key, changesetId: 0, updatedVersion: status.version)
                     print("✅ Node sync finished: \(payload.id)")
@@ -117,10 +123,10 @@ class DatasyncManager {
         }
 
         for (key, way) in waysToSync {
-            print("📤 Syncing way ID: \(way.id)")
-            let payload = way.asOSMWay()
+//            print("📤 Syncing way ID: \(way.id)")
+            let payload = way
             do {
-                let status = try await syncWay(way: payload, exclude_gig_tags: exclude_gig_tags, editedTags: way.tags.toDictionary())
+                let status = try await syncWay(way: payload, exclude_gig_tags: exclude_gig_tags, editedTags: way.tags)
                 if status.result {
                     _ = self.dbInstance.assignChangesetId(obj: key, changesetId: 0, updatedVersion: status.version)
                     print("✅ Way sync finished: \(payload.id)")

GoInfoGame/GoInfoGame/quests/QuestProtocols.swift

@@ -104,18 +104,15 @@ class QuestBase {
 
        // Dismiss sheet after syncing to db
        MapViewPublisher.shared.dismissSheet.send(.syncing)
+       MapViewPublisher.shared.dismissSheet.send(.syncBackground(Int(id)))
 
        DatasyncManager.shared.syncDataToOSM(exclude_gig_tags: exclude_gig_tags) { success in
            DispatchQueue.main.async {
                MapViewPublisher.shared.dismissSheet.send(.synced)
 
                switch success {
                case .success(let success):
-                   if success {
-
-                       MapViewPublisher.shared.dismissSheet.send(.submitted("\(id)"))
-                   }
- else {
+                   if !success {
                        print("Sync failed. Handle accordingly.")
                        MapViewPublisher.shared.dismissSheet.send(.failed("Submission failed. Please try again."))
                    }