Merge pull request #289 from TaskarCenterAtUW/TASK-2360-Update-long-quest-and-imagery-data-handling

Updated handling long quests and imagery data handling

Author: srikanth-vg

GoInfoGame/GoInfoGame/Network/APIEndPoint.swift

@@ -37,7 +37,7 @@ struct APIEndpoint {
             ]
         return APIEndpoint(path: "/workspaces/mine?lat=\(location.latitude.roundedTo7Digits())&lon=\(location.longitude.roundedTo7Digits())&radius=\(radius)&gig_only=\(gig_only)", method: "GET", body: nil, headers: header, formData: nil)}
 
-    static let fetchLongQuests = { (workspaceId: String) in APIEndpoint(path: "/workspaces/\(workspaceId)/quests/long", method: "GET", body: nil, headers: ["Content-Type":"application/json"], formData: nil) }
+    static let fetchWorkspaceDetails = { (workspaceId: String) in APIEndpoint(path: "/workspaces/\(workspaceId)", method: "GET", body: nil, headers: ["Content-Type":"application/json"], formData: nil) }
 
     static let fetchOSMElements = { (left: Double, bottom: Double, right: Double, top: Double, workspaceID: String) in
           let header = [

GoInfoGame/GoInfoGame/Network/models/WorkspacesResponse.swift

@@ -13,7 +13,7 @@
 import Foundation
 
 // MARK: - WorkSpacesResponse
-class WorkSpacesResponse: Codable {
+class WorkSpacesResponse: Decodable {
     let workspaces: [Workspace]
 
     init(workspaces: [Workspace]) {
@@ -22,12 +22,13 @@ class WorkSpacesResponse: Codable {
 }
 
 // MARK: - Workspace
-struct Workspace: Codable,Hashable {
+struct Workspace: Decodable {
     let id: Int
     let title: String
     let type: String?
     let externalAppAccess: Int
     let imageryList: SatelliteServers?
+    let longFormQuest: LongFormResponse?
 
     init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
@@ -36,11 +37,14 @@ struct Workspace: Codable,Hashable {
         type = try container.decodeIfPresent(String.self, forKey: .type) ?? "osw"
         externalAppAccess = try container.decode(Int.self, forKey: .externalAppAccess)
         imageryList = try container.decodeIfPresent(SatelliteServers.self, forKey: .imageryList)
+        longFormQuest = try container.decodeIfPresent(LongFormResponse.self, forKey: .longFormQuest)
     }
 
-   enum CodingKeys: String, CodingKey {
-       case id, title, type, externalAppAccess, imageryList
-   }
+    enum CodingKeys: String, CodingKey {
+        case id, title, type, externalAppAccess
+        case imageryList = "imageryListDef"
+        case longFormQuest = "longFormQuestDef"
+    }
 }
 
 // MARK: - Polygon

GoInfoGame/GoInfoGame/UI/InitialView/InitialViewModel.swift

@@ -74,12 +74,17 @@ class InitialViewModel: ObservableObject {
 
         isLoading = true
 
-        ApiManager.shared.performRequest(to: .fetchLongQuests(workspaceId), setupType: .workspace, modelType: LongFormResponse.self) { [weak self] result in
+        ApiManager.shared.performRequest(to: .fetchWorkspaceDetails(workspaceId), setupType: .workspace, modelType: Workspace.self) { [weak self] result in
             guard let self = self else { return completion(false, "Object memory released.") }
             DispatchQueue.main.async { [unowned self] in
                 switch result {
-                case .success(let longQuestsResponse):
+                case .success(let workspaces):
 
+                    guard let longQuestsResponse = workspaces.longFormQuest else {
+                        self.isLoading = false
+                        completion(false, "Please configure longform." )
+                        return
+                    }
                     // Validate quest query
                     do {
                         for item in longQuestsResponse.elements {
@@ -114,14 +119,9 @@ class InitialViewModel: ObservableObject {
                     self.isLoading = false
                     completion(true, "")
                 case .failure(let error):
-                    print("ERROR FOR LONG FORM JSON IS ----?>>>>>>\(error.localizedDescription)")
+                    print("ERROR from workspace details api ----?>>>>>>\(error.localizedDescription)")
                     self.isLoading = false
-                    if error.localizedDescription.contains("empty") {
-                        completion(false, "Please configure longform." )
-                    } else {
-                        completion(false, "Unable to load quests.(invalid JSON)")
-                    }
-                    
+                    completion(false, "Not able to load the workspace details. Please try again later." )
                 }
             }
         }