Fix #571 Normalise the usage purpose before checking if it exists to …

…avoid duplication
decentralised-dataexchange · Nov 15, 2023 · d8e742d · d8e742d
1 parent fbc0aae
commit d8e742d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/internal/handler/v2/config/dataagreement/config_create_dataagreement.go b/internal/handler/v2/config/dataagreement/config_create_dataagreement.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strings"
 
 	"github.com/bb-consent/api/internal/common"
 	"github.com/bb-consent/api/internal/config"
@@ -274,7 +275,7 @@ func ConfigCreateDataAgreement(w http.ResponseWriter, r *http.Request) {
 	darepo := dataagreement.DataAgreementRepository{}
 	darepo.Init(organisationId)
 
-	count, err := darepo.CountDocumentsByPurpose(dataAgreementReq.DataAgreement.Purpose)
+	count, err := darepo.CountDocumentsByPurpose(strings.TrimSpace(dataAgreementReq.DataAgreement.Purpose))
 	if err != nil {
 		m := "Failed to count data agreement by purpose"
 		common.HandleErrorV2(w, http.StatusNotFound, m, err)

diff --git a/internal/handler/v2/config/dataagreement/config_update_dataagreement.go b/internal/handler/v2/config/dataagreement/config_update_dataagreement.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strings"
 
 	"github.com/bb-consent/api/internal/common"
 	"github.com/bb-consent/api/internal/config"
@@ -167,7 +168,7 @@ func ConfigUpdateDataAgreement(w http.ResponseWriter, r *http.Request) {
 	daRepo := dataagreement.DataAgreementRepository{}
 	daRepo.Init(organisationId)
 
-	count, err := daRepo.CountDocumentsByPurposeExeptOneDataAgreement(dataAgreementReq.DataAgreement.Purpose, dataAgreementId)
+	count, err := daRepo.CountDocumentsByPurposeExeptOneDataAgreement(strings.TrimSpace(dataAgreementReq.DataAgreement.Purpose), dataAgreementId)
 	if err != nil {
 		m := "Failed to count data agreements by purpose"
 		common.HandleErrorV2(w, http.StatusNotFound, m, err)