Fix #579 Add individual header to service fetch consent records for d…

…ata agreement endpoint
decentralised-dataexchange · Nov 21, 2023 · 9666cbe · 9666cbe
1 parent 08f30e4
commit 9666cbe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/internal/dataagreement_record/db.go b/internal/dataagreement_record/db.go
@@ -263,12 +263,12 @@ func CreatePipelineForFilteringDataAgreementRecordsByIndividualId(organisationId
 }
 
 // CreatePipelineForFilteringDataAgreementRecordsByDataAgreementId This pipeline is used for filtering data agreement records by data agreement id
-func CreatePipelineForFilteringDataAgreementRecordsByDataAgreementId(organisationId string, dataAgreementId string) ([]primitive.M, error) {
+func CreatePipelineForFilteringDataAgreementRecordsByDataAgreementId(organisationId string, dataAgreementId string, individualId string) ([]primitive.M, error) {
 
 	var pipeline []bson.M
 
 	// Stage 1 - Match by `organisationId`, `dataagreementId` and `isDeleted=false`
-	pipeline = append(pipeline, bson.M{"$match": bson.M{"organisationid": organisationId, "isdeleted": false, "dataagreementid": dataAgreementId}})
+	pipeline = append(pipeline, bson.M{"$match": bson.M{"organisationid": organisationId, "isdeleted": false, "dataagreementid": dataAgreementId, "individualid": individualId}})
 
 	// Stage 2 - Lookup revision by `dataAgreementRecordId`
 	// This is done to obtain timestamp for the latest revision of the data agreement records.

diff --git a/internal/handler/v2/service/service_fetch_records_for_data_agreement.go b/internal/handler/v2/service/service_fetch_records_for_data_agreement.go
@@ -23,6 +23,7 @@ func ServiceFetchRecordsForDataAgreement(w http.ResponseWriter, r *http.Request)
 
 	// Headers
 	organisationId := common.Sanitize(r.Header.Get(config.OrganizationId))
+	individualId := common.Sanitize(r.Header.Get(config.IndividualHeaderKey))
 	dataAgreementId := common.Sanitize(mux.Vars(r)[config.DataAgreementId])
 
 	// Query params
@@ -33,7 +34,7 @@ func ServiceFetchRecordsForDataAgreement(w http.ResponseWriter, r *http.Request)
 	darRepo := daRecord.DataAgreementRecordRepository{}
 	darRepo.Init(organisationId)
 
-	pipeline, err := daRecord.CreatePipelineForFilteringDataAgreementRecordsByDataAgreementId(organisationId, dataAgreementId)
+	pipeline, err := daRecord.CreatePipelineForFilteringDataAgreementRecordsByDataAgreementId(organisationId, dataAgreementId, individualId)
 	if err != nil {
 		m := "Failed to create pipeline"
 		common.HandleErrorV2(w, http.StatusInternalServerError, m, err)