Fix #599 Policy

decentralised-dataexchange · Dec 14, 2023 · c2568ef · c2568ef
1 parent 4f4fa0d
commit c2568ef
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/internal/handler/v2/config/policy/config_create_policy.go b/internal/handler/v2/config/policy/config_create_policy.go
@@ -144,13 +144,21 @@ func ConfigCreatePolicy(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// updates organisation policy url
-	err = updateOrganisationPolicyUrl(savedPolicy.Url, organisationId)
+	count, err := prepo.GetPolicyCountByOrganisation()
 	if err != nil {
-		m := fmt.Sprintf("Failed to update organisation policy url: %v", organisationId)
+		m := "Failed to count policies"
 		common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
 		return
 	}
+	if count == 1 {
+		// updates organisation policy url
+		err = updateOrganisationPolicyUrl(savedPolicy.Url, organisationId)
+		if err != nil {
+			m := fmt.Sprintf("Failed to update organisation policy url: %v", organisationId)
+			common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
+			return
+		}
+	}
 
 	// Constructing the response
 	var resp addPolicyResp

diff --git a/internal/handler/v2/config/policy/config_update_policy.go b/internal/handler/v2/config/policy/config_update_policy.go
@@ -126,13 +126,22 @@ func ConfigUpdatePolicy(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// updates organisation policy url
-	err = updateOrganisationPolicyUrl(savedPolicy.Url, organisationId)
+	policyRepo.Init(organisationId)
+	first_policy, err := policyRepo.GetFirstPolicy()
 	if err != nil {
-		m := fmt.Sprintf("Failed to update organisation policy url: %v", organisationId)
+		m := "Failed to fetch first policy"
 		common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
 		return
 	}
+	if first_policy.Id == toBeUpdatedPolicy.Id {
+		// updates organisation policy url
+		err = updateOrganisationPolicyUrl(savedPolicy.Url, organisationId)
+		if err != nil {
+			m := fmt.Sprintf("Failed to update organisation policy url: %v", organisationId)
+			common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
+			return
+		}
+	}
 
 	// Constructing the response
 	var resp updatePolicyResp

diff --git a/internal/tenant/single.go b/internal/tenant/single.go
@@ -237,7 +237,7 @@ func SingleTenantConfiguration(config *config.Configuration) {
 	createOrganisation(config, orgType, organisationAdminId)
 
 	// delete all policies
-	deleteAllPolicies()
+	// deleteAllPolicies()
 
 	// Load image assets for organisation
 	err := fixture.LoadImageAssetsForSingleTenantConfiguration()