Add: #201 - function to Optin to Data Agreement

decentralised-dataexchange · Nov 13, 2023 · 25220b6 · 25220b6
1 parent 12ef6e1
commit 25220b6
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 4 deletions.
diff --git a/PrivacyDashboard/src/main/java/com/github/privacyDashboard/PrivacyDashboard.kt b/PrivacyDashboard/src/main/java/com/github/privacyDashboard/PrivacyDashboard.kt
@@ -3,8 +3,10 @@ package com.github.privacyDashboard
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.content.res.Resources
-import android.util.Log
+import com.github.privacyDashboard.communication.BBConsentAPIManager
+import com.github.privacyDashboard.communication.BBConsentAPIServices
+import com.github.privacyDashboard.communication.repositories.UpdateDataAgreementStatusApiRepository
+import com.github.privacyDashboard.models.v2.consent.ConsentStatusRequestV2
 import com.github.privacyDashboard.modules.home.BBConsentDashboardActivity
 import com.github.privacyDashboard.utils.BBConsentDataUtils
 import com.github.privacyDashboard.utils.BBConsentDataUtils.EXTRA_TAG_ACCESS_TOKEN
@@ -15,6 +17,8 @@ import com.github.privacyDashboard.utils.BBConsentDataUtils.EXTRA_TAG_ENABLE_USE
 import com.github.privacyDashboard.utils.BBConsentDataUtils.EXTRA_TAG_TOKEN
 import com.github.privacyDashboard.utils.BBConsentDataUtils.EXTRA_TAG_USERID
 import com.github.privacyDashboard.utils.BBConsentLocaleHelper
+import com.google.gson.Gson
+
 
 object PrivacyDashboard {
 
@@ -164,4 +168,40 @@ object PrivacyDashboard {
     fun setLocale(context: Context, languageCode: String) {
         BBConsentLocaleHelper.setLocale(context, languageCode)
     }
+
+    suspend fun optInToDataAgreement(
+        dataAgreementId: String,
+        baseUrl: String,
+        accessToken: String? = null,
+        apiKey: String? = null,
+        userId: String? = null,
+    ): String? {
+        val body = ConsentStatusRequestV2()
+        body.optIn = false
+
+        val apiService: BBConsentAPIServices = BBConsentAPIManager.getApi(
+            apiKey = apiKey,
+            accessToken = accessToken,
+            baseUrl = (if (baseUrl.last().toString() == "/")
+                baseUrl
+            else
+                "$baseUrl/")
+        )?.service!!
+
+        val updateDataAgreementStatusApiRepository =
+            UpdateDataAgreementStatusApiRepository(apiService)
+
+        val result = updateDataAgreementStatusApiRepository.updateDataAgreementStatus(
+            userId = userId,
+            dataAgreementId = dataAgreementId,
+            body = body
+        )
+
+        return if (result.isSuccess) {
+            Gson().toJson(result.getOrNull()?.dataAgreementRecord)
+        } else {
+            null
+        }
+
+    }
 }
diff --git a/...Dashboard/src/main/java/com/github/privacyDashboard/communication/BBConsentAPIServices.kt b/...Dashboard/src/main/java/com/github/privacyDashboard/communication/BBConsentAPIServices.kt
@@ -109,7 +109,7 @@ interface BBConsentAPIServices {
 
     @PUT("service/individual/record/consent-record/{dataAgreementRecordId}")
     suspend fun setOverallStatusV2(
-        @Header("X-ConsentBB-IndividualId") userID: String?,
+        @Header("X-ConsentBB-IndividualId") userID: String? = null,
         @Path("dataAgreementRecordId") dataAgreementRecordId: String?,
         @Query("dataAgreementId") dataAgreementId: String?,
         @Body body: ConsentStatusRequestV2?

diff --git a/...hub/privacyDashboard/communication/repositories/UpdateDataAgreementStatusApiRepository.kt b/...hub/privacyDashboard/communication/repositories/UpdateDataAgreementStatusApiRepository.kt
@@ -17,7 +17,7 @@ class UpdateDataAgreementStatusApiRepository(private val apiService: BBConsentAP
         return try {
             val dataAgreementRecord = apiService.getDataAgreementRecordV2(userId, dataAgreementId)
             var response: Response<DataAgreementLatestRecordResponseV2?>? = null
-            if (dataAgreementRecord?.isSuccessful != true) {
+            if (dataAgreementRecord?.isSuccessful != true || dataAgreementRecord.body()?.dataAgreementRecord == null) {
                 response = apiService.createDataAgreementRecordV2(userId, dataAgreementId)
             } else {
                 response = apiService.setOverallStatusV2(