Add #387 Update audit list data agreement records to use id field as …

…query param
decentralised-dataexchange · Oct 27, 2023 · b9e21fe · b9e21fe
1 parent ec7f7ec
commit b9e21fe
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 504 deletions.
diff --git a/src/config/constants.go b/src/config/constants.go
@@ -30,6 +30,7 @@ const (
 	IndividualHeaderKey   = "X-ConsentBB-IndividualId"
 	RevisionId            = "revisionId"
 	LawfulBasis           = "lawfulBasis"
+	Id                    = "id"
 )
 
 // Schemas

diff --git a/src/database/db.go b/src/database/db.go
@@ -157,7 +157,7 @@ func Init(config *config.Configuration) error {
 		return err
 	}
 
-	err = initCollection("dataAgreementRecords", []string{"id"}, true)
+	err = initCollection("dataAgreementRecords", []string{"id", "dataagreementid", "individualid"}, true)
 	if err != nil {
 		return err
 	}

diff --git a/src/v2/dataagreement_record/dataagreement_record.go b/src/v2/dataagreement_record/dataagreement_record.go
@@ -47,7 +47,7 @@ type DataAgreementRecordForAuditList struct {
 	OptIn                     bool                                    `json:"optIn"`
 	State                     string                                  `json:"state" valid:"required"`
 	SignatureId               string                                  `json:"signatureId"`
-	AgreementData             DataAgreementForListDataAgreementRecord `json:"dataAgreement"`
+	DataAgreements            DataAgreementForListDataAgreementRecord `json:"dataAgreement"`
 	Timestamp                 string                                  `json:"timestamp"`
 }
 
@@ -61,6 +61,7 @@ const (
 	RevisionIdIsMissingError
 	DataAgreementRecordIdIsMissingError
 	LawfulBasisIsMissingError
+	IdIsMissingError
 )
 
 // Error returns the string representation of the error.
@@ -76,6 +77,8 @@ func (e DataAgreementRecordError) Error() string {
 		return "Query param dataAgreementRecordId is missing!"
 	case LawfulBasisIsMissingError:
 		return "Query param lawfulbasis is missing!"
+	case IdIsMissingError:
+		return "Query param id is missing!"
 	default:
 		return "Unknown error!"
 	}