Updated getting ways and nodes from DB using predicate

- Instead of fetching all the records and applying filters, running RQL query before fetching the data will give better performance and less memory

Author: srikanth-vg

GoInfoGame/GoInfoGame/AppQuestManager.swift

@@ -26,10 +26,8 @@ class AppQuestManager {
     private let seedBox = BBox(minLat: 47.70312160869372, maxLat: 47.718964653825054, minLon: -122.20866792353317, maxLon: -122.18570621653987)
 
     func getUpdatedQuest(elementId: String) -> DisplayUnitWithCoordinate? {
-        let nodesFromStorage = dbInstance.getNodes().filter { n in
-            n.tags.count != 0
-        }
-        let waysFromStorage = dbInstance.getWays().filter{w in w.tags.count != 0 }
+        let nodesFromStorage = dbInstance.getNodes(NSPredicate(format: "tags.@count != 0"))
+        let waysFromStorage = dbInstance.getWays(NSPredicate(format: "tags.@count != 0"))
         let theWay = waysFromStorage.first(where: {$0.id == Int64(elementId)})
         let theNode = nodesFromStorage.first(where: {$0.id == Int64(elementId)})
         let allQuests = QuestsRepository.shared.applicableQuests
@@ -68,33 +66,17 @@ class AppQuestManager {
 
     // Fetches all the available quests from Database
     func fetchQuestsFromDB() ->  [DisplayUnitWithCoordinate] {
-            
-        let allOriginalNodes = dbInstance.getNodes().filter {$0.tags.count != 0 && ($0.point.latitude != 0.0 || $0.point.longitude != 0.0)}
 
-    
-        var nodesFromStorage: [StoredNode] = []
-        for node in allOriginalNodes {
-            autoreleasepool {
-                if node.tags["ext:gig_complete"] != "yes" {
-                    nodesFromStorage.append(node)
-                }
-            }
-        }
-             
-        let allOriginalWays = dbInstance.getWays().filter {
-            $0.tags.count != 0 && !$0.polyline.isEmpty
-        }
-
-        var waysFromStorage: [StoredWay] = []
+        let nodesFromStorage = dbInstance.getNodes(NSPredicate(format: """
+                                                            tags.@count != 0 AND 
+                                                            tags['ext:gig_complete'] != 'yes'
+                                                            """))
 
-        for way in allOriginalWays {
-            autoreleasepool {
-                if way.tags["ext:gig_complete"] != "yes" {
-                    waysFromStorage.append(way)
-                }
-            }
-        }
-    
+        let waysFromStorage = dbInstance.getWays(NSPredicate(format: """
+                                                            tags.@count != 0 AND
+                                                            polyline.@count > 0 AND
+                                                            tags['ext:gig_complete'] != 'yes' 
+                                                            """ ))
 
         let nodeElements = nodesFromStorage.map({ node in
             autoreleasepool {

GoInfoGame/GoInfoGame/DataBase/DatabaseConnector.swift

@@ -184,8 +184,6 @@ class DatabaseConnector {
      Fetches all the StoredNodes in the Database
      @returns a Results object containing StoredNodes
      */
-    func getNodes() -> Results<StoredNode> {
-        return realm.objects(StoredNode.self)
 
     func getNodes(_ predicate: NSPredicate) -> Results<StoredNode> {
         return realm.objects(StoredNode.self).filter(predicate)
@@ -194,8 +192,6 @@ class DatabaseConnector {
     Fetches all the storedWays in the Database
      @returns a Results object containing StoredWay
      */
-    func getWays() -> Results<StoredWay> {
-        return realm.objects(StoredWay.self)
 
     func getWays(_ predicate: NSPredicate) -> Results<StoredWay> {
         return realm.objects(StoredWay.self).filter(predicate)