Fix #214: Opt-in/out not working for newly created data agreement

decentralised-dataexchange · Feb 22, 2024 · aa3b7a4 · aa3b7a4
1 parent 13be232
commit aa3b7a4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/PrivacyDashboardiOS/Classes/Model/Organisation/RecordsModel.swift b/PrivacyDashboardiOS/Classes/Model/Organisation/RecordsModel.swift
@@ -9,7 +9,7 @@ import Foundation
 
 // MARK: - Records
 class RecordsModel: Codable {
-    let consentRecords: [ConsentRecordModel]
+    var consentRecords: [ConsentRecordModel]
     let pagination: RecordsPagination
 }
 

diff --git a/...Classes/ViewControllers/DashBoardViewController/BBConsentOrganisationViewController.swift b/...Classes/ViewControllers/DashBoardViewController/BBConsentOrganisationViewController.swift
@@ -111,11 +111,18 @@ class BBConsentOrganisationViewController: BBConsentBaseViewController {
         }
     }
 
-    func callCreateDataAgreementApi(dataAgreementId: String) {
+    func callCreateDataAgreementApi(dataAgreementId: String, completion: @escaping(ConsentRecordModel?)-> Void) {
         let url = baseUrl + "/service/individual/record/data-agreement/" + dataAgreementId
         self.api.makeAPICall(urlString: url, method:.post) { status, result in
-            debugPrint(status)
-            self.orgTableView.reloadData()
+            if status {
+                let jsonDecoder = JSONDecoder()
+                debugPrint(result["consentRecord"] ?? [:])
+                if let data = try? JSONSerialization.data(withJSONObject: result["consentRecord"] ?? [:], options: .prettyPrinted) {
+                    let model = try? jsonDecoder.decode(ConsentRecordModel.self, from: data)
+                    debugPrint("### ConsentRecordModel:\(String(describing: model))")
+                    completion(model)
+                }
+            }
         }
     }
 
@@ -137,7 +144,7 @@ class BBConsentOrganisationViewController: BBConsentBaseViewController {
             // If item doesnt have record already
             if !idsWithAttributeRecords.contains(item) {
                 // Create add record api call
-                callCreateDataAgreementApi(dataAgreementId: item)
+                callCreateDataAgreementApi(dataAgreementId: item) { _ in }
             }
         }
     }
@@ -412,7 +419,12 @@ extension BBConsentOrganisationViewController: ExpandableLabelDelegate ,PurposeC
                         }
                     })
                 } else {
-                    serviceManager.createDataAgreementRecord(dataAgreementId: self.dataAgreementsObj?.dataAgreements[cell.tag].id ?? "")
+                    self.callCreateDataAgreementApi(dataAgreementId: self.dataAgreementsObj?.dataAgreements[cell.tag].id ?? "") { model in
+                        if let consentRecordModel = model {
+                            self.consentRecordsObj?.consentRecords.append(consentRecordModel)
+                            self.orgTableView.reloadData()
+                        }
+                    }
                 }
             }));
         }