Add #335 Data agreement record should be renamed as consent record

decentralised-dataexchange · Oct 31, 2023 · 4dacc50 · 4dacc50
1 parent da16432
commit 4dacc50
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 27 deletions.
diff --git a/src/config/constants.go b/src/config/constants.go
@@ -22,7 +22,7 @@ const (
 	WebhookId             = "webhookId"
 	WebhookDeliveryId     = "deliveryId"
 	PolicyId              = "policyId"
-	DataAgreementRecordId = "dataAgreementRecordId"
+	DataAgreementRecordId = "consentRecordId"
 	IndividualId          = "individualId"
 	DeliveryId            = "deliveryId"
 	IdpId                 = "idpId"
@@ -37,7 +37,7 @@ const (
 const (
 	DataAgreement       = "dataAgreement"
 	Policy              = "policy"
-	DataAgreementRecord = "dataAgreementRecord"
+	DataAgreementRecord = "consentRecord"
 	DataAttribute       = "dataAttribute"
 )
 

diff --git a/src/v2/handler/audit/audit_list_dataagreement_records.go b/src/v2/handler/audit/audit_list_dataagreement_records.go
@@ -19,7 +19,7 @@ type DataAgreementForListDataAgreementRecord struct {
 }
 
 type fetchDataAgreementRecordsResp struct {
-	DataAgreementRecords interface{}         `json:"dataAgreementRecords"`
+	DataAgreementRecords interface{}         `json:"consentRecords"`
 	Pagination           paginate.Pagination `json:"pagination"`
 }
 

diff --git a/src/v2/handler/audit/audit_read_dataagreement_record.go b/src/v2/handler/audit/audit_read_dataagreement_record.go
@@ -2,6 +2,7 @@ package audit
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 
 	"github.com/bb-consent/api/src/common"
@@ -11,7 +12,7 @@ import (
 )
 
 type readDataAgreementRecordResp struct {
-	DataAgreementRecord daRecord.DataAgreementRecord `json:"dataAgreementRecord"`
+	DataAgreementRecord daRecord.DataAgreementRecord `json:"consentRecord"`
 }
 
 // AuditDataAgreementRecordRead
@@ -24,6 +25,7 @@ func AuditDataAgreementRecordRead(w http.ResponseWriter, r *http.Request) {
 	// Repository
 	darRepo := daRecord.DataAgreementRecordRepository{}
 	darRepo.Init(organisationId)
+	fmt.Println(dataAgreementRecordId)
 
 	// fetch data agreement record from db
 	daRecord, err := darRepo.Get(dataAgreementRecordId)

diff --git a/src/v2/handler/service/service_create_dataagreement_record.go b/src/v2/handler/service/service_create_dataagreement_record.go
@@ -36,7 +36,7 @@ func createDataAgreementRecord(dataAgreementId string, rev revision.Revision, in
 }
 
 type createDataAgreementRecordResp struct {
-	DataAgreementRecord daRecord.DataAgreementRecord `json:"dataAgreementRecord"`
+	DataAgreementRecord daRecord.DataAgreementRecord `json:"consentRecord"`
 	Revision            revision.Revision            `json:"revision"`
 }
 

diff --git a/src/v2/handler/service/service_create_draft_consent_record.go b/src/v2/handler/service/service_create_draft_consent_record.go
@@ -28,7 +28,7 @@ func createDraftDataAgreementRecord(dataAgreementId string, rev revision.Revisio
 }
 
 type draftDataAgreementRecordResp struct {
-	DataAgreementRecord daRecord.DataAgreementRecord `json:"dataAgreementRecord"`
+	DataAgreementRecord daRecord.DataAgreementRecord `json:"consentRecord"`
 	Signature           signature.Signature          `json:"signature"`
 }
 

diff --git a/src/v2/handler/service/service_create_paired_dataagreement_record.go.go b/src/v2/handler/service/service_create_paired_dataagreement_record.go.go
@@ -20,12 +20,12 @@ import (
 )
 
 type createPairedDataAgreementRecordReq struct {
-	DataAgreementRecord daRecord.DataAgreementRecord `json:"dataAgreementRecord" valid:"required"`
+	DataAgreementRecord daRecord.DataAgreementRecord `json:"consentRecord" valid:"required"`
 	Signature           signature.Signature          `json:"signature" valid:"required"`
 }
 
 type createPairedDataAgreementRecordResp struct {
-	DataAgreementRecord daRecord.DataAgreementRecord `json:"dataAgreementRecord"`
+	DataAgreementRecord daRecord.DataAgreementRecord `json:"consentRecord"`
 	Revision            revision.Revision            `json:"revision"`
 	Signature           signature.Signature          `json:"signature"`
 }

diff --git a/src/v2/handler/service/service_fetch_data_agreement_records.go b/src/v2/handler/service/service_fetch_data_agreement_records.go
@@ -14,7 +14,7 @@ import (
 )
 
 type fetchDataAgreementRecordsResp struct {
-	DataAgreementRecords interface{}         `json:"dataAgreementRecords"`
+	DataAgreementRecords interface{}         `json:"consentRecords"`
 	Pagination           paginate.Pagination `json:"pagination"`
 }
 

diff --git a/src/v2/handler/service/service_fetch_dataagreement_records_history.go b/src/v2/handler/service/service_fetch_dataagreement_records_history.go
@@ -13,7 +13,7 @@ import (
 )
 
 type listDataAgreementRecordHistory struct {
-	DataAgreementRecordHistory interface{}         `json:"dataAgreementRecordHistory"`
+	DataAgreementRecordHistory interface{}         `json:"consentRecordHistory"`
 	Pagination                 paginate.Pagination `json:"pagination"`
 }
 

diff --git a/src/v2/handler/service/service_fetch_individual_dataagreement_records.go b/src/v2/handler/service/service_fetch_individual_dataagreement_records.go
@@ -14,7 +14,7 @@ import (
 )
 
 type vFetchIndividualDataAgreementRecordsResp struct {
-	DataAgreementRecords interface{}         `json:"dataAgreementRecords"`
+	DataAgreementRecords interface{}         `json:"consentRecords"`
 	Pagination           paginate.Pagination `json:"pagination"`
 }
 

diff --git a/src/v2/handler/service/service_fetch_records_for_data_agreement.go b/src/v2/handler/service/service_fetch_records_for_data_agreement.go
@@ -15,7 +15,7 @@ import (
 )
 
 type fetchRecordsForDataAgreementResp struct {
-	DataAgreementRecords interface{}         `json:"dataAgreementRecords"`
+	DataAgreementRecords interface{}         `json:"consentRecords"`
 	Pagination           paginate.Pagination `json:"pagination"`
 }
 

diff --git a/src/v2/handler/service/service_read_data_agreement_record.go b/src/v2/handler/service/service_read_data_agreement_record.go
@@ -11,7 +11,7 @@ import (
 )
 
 type readDataAgreementRecordResp struct {
-	DataAgreementRecord daRecord.DataAgreementRecord `json:"dataAgreementRecord"`
+	DataAgreementRecord daRecord.DataAgreementRecord `json:"consentRecord"`
 }
 
 func ServiceReadDataAgreementRecord(w http.ResponseWriter, r *http.Request) {

diff --git a/src/v2/handler/service/service_update_dataagreement_record.go b/src/v2/handler/service/service_update_dataagreement_record.go
@@ -21,7 +21,7 @@ import (
 )
 
 type updateDataAgreementRecordResp struct {
-	DataAgreementRecord daRecord.DataAgreementRecord `json:"dataAgreementRecord"`
+	DataAgreementRecord daRecord.DataAgreementRecord `json:"consentRecord"`
 	Revision            revision.Revision            `json:"revision"`
 }
 type updateDataAgreementRecordReq struct {

diff --git a/src/v2/handler/service/service_verification_fetch_dataagreement_record.go b/src/v2/handler/service/service_verification_fetch_dataagreement_record.go
@@ -12,7 +12,7 @@ import (
 )
 
 type vFetchDataAgreementRecordResp struct {
-	DataAgreementRecord daRecord.DataAgreementRecord `json:"dataAgreementRecord"`
+	DataAgreementRecord daRecord.DataAgreementRecord `json:"consentRecord"`
 	Revision            revision.Revision            `json:"revision"`
 }
 

diff --git a/src/v2/handler/service/service_verification_fetch_dataagreement_records.go b/src/v2/handler/service/service_verification_fetch_dataagreement_records.go
@@ -14,7 +14,7 @@ import (
 )
 
 type vfetchDataAgreementRecordsResp struct {
-	DataAgreementRecords interface{}         `json:"dataAgreementRecords"`
+	DataAgreementRecords interface{}         `json:"consentRecords"`
 	Pagination           paginate.Pagination `json:"pagination"`
 }
 

diff --git a/src/v2/http_path/audit_paths.go b/src/v2/http_path/audit_paths.go
@@ -1,7 +1,7 @@
 package http_path
 
-const AuditListDataAgreementRecords = "/v2/audit/data-agreement-records"
-const AuditDataAgreementRecordRead = "/v2/audit/data-agreement-record/{dataAgreementRecordId}"
+const AuditListDataAgreementRecords = "/v2/audit/consent-records"
+const AuditDataAgreementRecordRead = "/v2/audit/consent-record/{consentRecordId}"
 const AuditListDataAgreements = "/v2/audit/data-agreements"
 const AuditReadDataAgreement = "/v2/audit/data-agreement/{dataAgreementId}"
 

diff --git a/src/v2/http_path/service_paths.go b/src/v2/http_path/service_paths.go
@@ -13,23 +13,23 @@ const ServiceListDataAttributesForDataAgreement = "/v2/service/data-agreement/{d
 // Verification mechanisms
 const ServiceVerificationFetchAllDataAgreementRecords = "/v2/service/verification/data-agreements"
 const ServiceVerificationFetchDataAgreementRecord = "/v2/service/verification/data-agreement/{dataAgreementId}"
-const ServiceVerificationFetchDataAgreementRecords = "/v2/service/verification/data-agreement-records"
+const ServiceVerificationFetchDataAgreementRecords = "/v2/service/verification/consent-records"
 
 // Recording consent
-const ServiceCreateDraftConsentRecord = "/v2/service/individual/record/data-agreement-record/draft"
+const ServiceCreateDraftConsentRecord = "/v2/service/individual/record/consent-record/draft"
 const ServiceCreateDataAgreementRecord = "/v2/service/individual/record/data-agreement/{dataAgreementId}"
 const ServiceReadDataAgreementRecord = "/v2/service/individual/record/data-agreement/{dataAgreementId}"
-const ServiceUpdateDataAgreementRecord = "/v2/service/individual/record/data-agreement-record/{dataAgreementRecordId}"
-const ServiceDeleteIndividualDataAgreementRecords = "/v2/service/individual/record/data-agreement-record"
-const ServiceCreatePairedDataAgreementRecord = "/v2/service/individual/record/data-agreement-record"
+const ServiceUpdateDataAgreementRecord = "/v2/service/individual/record/consent-record/{consentRecordId}"
+const ServiceDeleteIndividualDataAgreementRecords = "/v2/service/individual/record/consent-record"
+const ServiceCreatePairedDataAgreementRecord = "/v2/service/individual/record/consent-record"
 
-const ServiceCreateBlankSignature = "/v2/service/individual/record/data-agreement-record/{dataAgreementRecordId}/signature"
-const ServiceUpdateSignatureObject = "/v2/service/individual/record/data-agreement-record/{dataAgreementRecordId}/signature"
+const ServiceCreateBlankSignature = "/v2/service/individual/record/consent-record/{consentRecordId}/signature"
+const ServiceUpdateSignatureObject = "/v2/service/individual/record/consent-record/{consentRecordId}/signature"
 
-const ServiceFetchIndividualDataAgreementRecords = "/v2/service/individual/record/data-agreement-record"
+const ServiceFetchIndividualDataAgreementRecords = "/v2/service/individual/record/consent-record"
 const ServiceFetchRecordsForDataAgreement = "/v2/service/individual/record/data-agreement/{dataAgreementId}/all"
 
-const ServiceFetchRecordsHistory = "/v2/service/individual/record/data-agreement-record/history"
+const ServiceFetchRecordsHistory = "/v2/service/individual/record/consent-record/history"
 
 // Idp
 const ServiceReadIdp = "/v2/service/idp/open-id/{idpId}"