Fixed handling change set records with primary key ID. Fixed undo UI issues

prateekan6 · prateekan6 · commit 4e56cce97119 · 2025-05-11T19:09:11.000+05:30
diff --git a/GoInfoGame/GoInfoGame/DataBase/DatabaseConnector.swift b/GoInfoGame/GoInfoGame/DataBase/DatabaseConnector.swift
@@ -414,11 +414,8 @@ class DatabaseConnector {
         return results
     }
     
-    func getChangeset(for id: Int64, type: ElementType) -> StoredChangeset? {
-        let storedType: StoredElementEnum = (type == .way) ? .way : .node
-        return realm.objects(StoredChangeset.self)
-            .filter("elementId == %@ AND elementType == %@", id, storedType.rawValue)
-            .first
+    func getChangeset(for id: String) -> StoredChangeset? {
+        return realm.object(ofType: StoredChangeset.self, forPrimaryKey: id)
     }
 
     /// Assigns changesetId for a stored changeset
diff --git a/GoInfoGame/GoInfoGame/UI/Map/MapView.swift b/GoInfoGame/GoInfoGame/UI/Map/MapView.swift
@@ -146,8 +146,8 @@ struct MapView: View {
                             },
                             onRemovePreview: {
                             },
-                            onRevert: { id, type in
-                                MapUndoManager.shared.undo(for: Int64(id), type: type)
+                            onRevert: { id in
+                                MapUndoManager.shared.undo(for: id)
                             }
                         )
                         .padding(.bottom, 24)
diff --git a/GoInfoGame/GoInfoGame/UI/Utils/UndoButton.swift b/GoInfoGame/GoInfoGame/UI/Utils/UndoButton.swift
@@ -11,7 +11,7 @@ import osmparser
 struct UndoButton: View {
     var onPreview: (Int, ElementType) -> Void
     var onRemovePreview: () -> Void
-    var onRevert: (Int, ElementType) -> Void
+    var onRevert: (String) -> Void
 
     @State private var showSidebar = false
     @State private var undoItems: [UndoItem] = []
@@ -22,8 +22,8 @@ struct UndoButton: View {
         ZStack(alignment: .leading) {
             if showSidebar {
                 UndoSidebarView(
-                    onUndo: { id, type in
-                        onRevert(id, type)
+                    onUndo: { id in
+                        onRevert(id)
                         undoItems = MapUndoManager.shared.getUndoItems()
                         withAnimation { showSidebar = false }
                     },
@@ -65,7 +65,7 @@ struct UndoButton: View {
                     }
 
                 VStack(spacing: 16) {
-                    Text("\(item.type == .way ? "Way" : "Node") #\(item.elementId)")
+                    Text("\(item.type == .way ? "Way" : "Node") #\(String(item.elementId))")
                         .font(.headline)
 
                     if !item.changedKeys.isEmpty {
@@ -89,7 +89,7 @@ struct UndoButton: View {
                         Spacer()
 
                         Button("Revert") {
-                            onRevert(item.elementId, item.type)
+                            onRevert(item.id)
                             showUndoPopup = false
                             showSidebar = false
                         }
diff --git a/GoInfoGame/GoInfoGame/UI/Utils/UndoSidebarView.swift b/GoInfoGame/GoInfoGame/UI/Utils/UndoSidebarView.swift
@@ -7,12 +7,12 @@ struct UndoItem: Identifiable {
     let elementId: Int
     let type: ElementType
     let changedKeys: [String]
-    var id: String { "\(type)-\(elementId)" }
+    var id: String
 }
 
 struct UndoSidebarView: View {
     @State private var undoItems: [UndoItem] = []
-    var onUndo: (Int, ElementType) -> Void
+    var onUndo: (String) -> Void
     var onClose: () -> Void
     var onItemSelected: (UndoItem) -> Void
 
diff --git a/GoInfoGame/GoInfoGame/quests/QuestProtocols.swift b/GoInfoGame/GoInfoGame/quests/QuestProtocols.swift
@@ -37,6 +37,14 @@ class QuestBase {
     
    private var elementSubmittingToPOSM: ElementSubmittingToPOSM?
     
+    init () {
+        MapUndoManager.shared.updateTagsHandler = { [weak self] changeset in
+            guard let changeSet = changeset else { return }
+            
+            self?.updateUndoTags(changeSet: changeSet)
+        }
+    }
+    
     func updateUndoTags(changeSet: StoredChangeset) {
         // Convert from ElementType enum to StoredElementEnum
         Task.detached(operation: { @MainActor in
@@ -68,13 +76,6 @@ class QuestBase {
     
    public func updateTags(id: Int64, tags:[String:String], type: ElementType, exclude_gig_tags: Bool = false) {
        
-       MapUndoManager.shared.updateTagsHandler = { [weak self] changeset in
-           guard let changeSet = changeset else { return }
-           
-           self?.updateUndoTags(changeSet: changeSet)
-       }
-       
-       
        // Convert from ElementType enum to StoredElementEnum
        let storedElementType: StoredElementEnum = type == .way ? .way : .node
        
@@ -106,10 +107,6 @@ class QuestBase {
                switch success {
                case .success(let success):
                    if success {
-                       if MapUndoManager.shared.isUndoInProgress {
-                           MapUndoManager.shared.finalizeSuccessfulSubmit(id: Int(id), type: type)
-                           MapUndoManager.shared.isUndoInProgress = false
-                       }
 
                        MapViewPublisher.shared.dismissSheet.send(.submitted("\(id)"))
                    }
diff --git a/GoInfoGame/GoInfoGame/quests/QuestUndoManager.swift b/GoInfoGame/GoInfoGame/quests/QuestUndoManager.swift
@@ -14,18 +14,14 @@ class MapUndoManager {
     
     private let realm: Realm
     
-    var isUndoInProgress: Bool = false
-
     private init() {
         realm = try! Realm()
     }
 
     var updateTagsHandler: ((_ changeset: StoredChangeset?) -> Void)?
 
-    func undo(for id: Int64, type: ElementType) {
-        MapUndoManager.shared.isUndoInProgress = true
-
-        guard let changeSet = DatabaseConnector.shared.getChangeset(for: id, type: type) else {
+    func undo(for id: String) {
+        guard let changeSet = DatabaseConnector.shared.getChangeset(for: id) else {
             print("❌ Undo failed: Element not found")
             updateTagsHandler?(nil)
             return
@@ -42,7 +38,7 @@ class MapUndoManager {
         for edited in editedNodes {
             let keys = Array(edited.tags.keys)
             if !keys.isEmpty {
-                items.append(UndoItem(elementId: edited.elementId, type: edited.elementType.elementType(), changedKeys: keys))
+                items.append(UndoItem(elementId: edited.elementId, type: edited.elementType.elementType(), changedKeys: keys, id: edited.id))
             }
         }
 
@@ -51,36 +47,36 @@ class MapUndoManager {
 }
 
 extension MapUndoManager {
-    func finalizeSuccessfulSubmit(id: Int, type: ElementType) {
-        let realm = try! Realm()
-
-        try? realm.write {
-            switch type {
-            case .way:
-                if let original = DatabaseConnector.shared.getWay(id: id, version: .original) {
-                    original.tags["ext:gig_complete"] = "yes"
-                }
-                if let edited = DatabaseConnector.shared.getWay(id: id, version: .edited) {
-                    realm.delete(edited)
-                }
-
-            case .node:
-                if let original = DatabaseConnector.shared.getNode(id: id, version: .original) {
-                    original.tags["ext:gig_complete"] = "yes"
-                }
-                if let edited = DatabaseConnector.shared.getNode(id: id, version: .edited) {
-                    realm.delete(edited)
-                }
-
-            default:
-                break
-            }
-
-            if let changeset = DatabaseConnector.shared.getChangeset(for: Int64(id), type: type) {
-                realm.delete(changeset)
-            }
-        }
-    }
+//    func finalizeSuccessfulSubmit(id: Int, type: ElementType) {
+//        let realm = try! Realm()
+//
+//        try? realm.write {
+//            switch type {
+//            case .way:
+//                if let original = DatabaseConnector.shared.getWay(id: id, version: .original) {
+//                    original.tags["ext:gig_complete"] = "yes"
+//                }
+//                if let edited = DatabaseConnector.shared.getWay(id: id, version: .edited) {
+//                    realm.delete(edited)
+//                }
+//
+//            case .node:
+//                if let original = DatabaseConnector.shared.getNode(id: id, version: .original) {
+//                    original.tags["ext:gig_complete"] = "yes"
+//                }
+//                if let edited = DatabaseConnector.shared.getNode(id: id, version: .edited) {
+//                    realm.delete(edited)
+//                }
+//
+//            default:
+//                break
+//            }
+//
+//            if let changeset = DatabaseConnector.shared.getChangeset(for: Int64(id), type: type) {
+//                realm.delete(changeset)
+//            }
+//        }
+//    }
 
 
 }

Original file line number	Diff line number	Diff line change
`@@ -414,11 +414,8 @@ class DatabaseConnector {`
`414`	`414`	`return results`
`415`	`415`	`}`
`416`	`416`
`417`		`- func getChangeset(for id: Int64, type: ElementType) -> StoredChangeset? {`
`418`		`- let storedType: StoredElementEnum = (type == .way) ? .way : .node`
`419`		`- return realm.objects(StoredChangeset.self)`
`420`		`- .filter("elementId == %@ AND elementType == %@", id, storedType.rawValue)`
`421`		`- .first`
	`417`	`+ func getChangeset(for id: String) -> StoredChangeset? {`
	`418`	`+ return realm.object(ofType: StoredChangeset.self, forPrimaryKey: id)`
`422`	`419`	`}`
`423`	`420`
`424`	`421`	`/// Assigns changesetId for a stored changeset`
Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,8 @@ struct MapView: View {`
`146`	`146`	`},`
`147`	`147`	`onRemovePreview: {`
`148`	`148`	`},`
`149`		`- onRevert: { id, type in`
`150`		`- MapUndoManager.shared.undo(for: Int64(id), type: type)`
	`149`	`+ onRevert: { id in`
	`150`	`+ MapUndoManager.shared.undo(for: id)`
`151`	`151`	`}`
`152`	`152`	`)`
`153`	`153`	`.padding(.bottom, 24)`