From 5e4a25ad698f695272eb139fdc581409bebaf9f6 Mon Sep 17 00:00:00 2001
From: Albin Antony <albin.pa3@gmail.com>
Date: Wed, 25 Oct 2023 18:39:36 +0530
Subject: [PATCH] Add #364 Data agreement update should not increment version
 if it is draft i.e draft should not have revision

---
 .../config_update_dataagreement.go            | 69 ++++++++++---------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/v2/handler/dataagreement/config_update_dataagreement.go b/src/v2/handler/dataagreement/config_update_dataagreement.go
index f231f4e..46b855a 100644
--- a/src/v2/handler/dataagreement/config_update_dataagreement.go
+++ b/src/v2/handler/dataagreement/config_update_dataagreement.go
@@ -108,8 +108,10 @@ func ConfigUpdateDataAgreement(w http.ResponseWriter, r *http.Request) {
 		common.HandleErrorV2(w, http.StatusInternalServerError, err.Error(), err)
 		return
 	}
+	var currentRevision revision.Revision
+
 	// Get revision from db
-	currentRevision, err := revision.GetLatestByDataAgreementId(dataAgreementId)
+	currentRevision, err = revision.GetLatestByDataAgreementId(dataAgreementId)
 	if err != nil {
 		common.HandleErrorV2(w, http.StatusInternalServerError, err.Error(), err)
 		return
@@ -121,24 +123,43 @@ func ConfigUpdateDataAgreement(w http.ResponseWriter, r *http.Request) {
 	// Update life cycle based on active field
 	lifecycle := setDataAgreementLifecycle(dataAgreementReq.DataAgreement.Active)
 
-	// Bump major version for policy
-	updatedVersion, err := common.BumpMajorVersion(toBeUpdatedDataAgreement.Version)
-	if err != nil {
-		m := fmt.Sprintf("Failed to bump major version for data agreement: %v", dataAgreementId)
-		common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
-		return
-	}
-	toBeUpdatedDataAgreement.Version = updatedVersion
 	toBeUpdatedDataAgreement.ControllerName = o.Name
 	toBeUpdatedDataAgreement.ControllerUrl = o.EulaURL
 	toBeUpdatedDataAgreement.Lifecycle = lifecycle
 
-	// Update revision
-	newRevision, err := revision.UpdateRevisionForDataAgreement(toBeUpdatedDataAgreement, &currentRevision, orgAdminId)
-	if err != nil {
-		m := fmt.Sprintf("Failed to update revision for data agreement: %v", dataAgreementId)
-		common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
-		return
+	if lifecycle == config.Complete {
+		// Bump major version for policy
+		updatedVersion, err := common.BumpMajorVersion(toBeUpdatedDataAgreement.Version)
+		if err != nil {
+			m := fmt.Sprintf("Failed to bump major version for data agreement: %v", dataAgreementId)
+			common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
+			return
+		}
+		toBeUpdatedDataAgreement.Version = updatedVersion
+
+		// Update revision
+		newRevision, err := revision.UpdateRevisionForDataAgreement(toBeUpdatedDataAgreement, &currentRevision, orgAdminId)
+		if err != nil {
+			m := fmt.Sprintf("Failed to update revision for data agreement: %v", dataAgreementId)
+			common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
+			return
+		}
+
+		// Save the previous revision to db
+		updatedRevision, err := revision.Update(currentRevision)
+		if err != nil {
+			m := fmt.Sprintf("Failed to update revision: %v", updatedRevision.Id)
+			common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
+			return
+		}
+
+		// Save the revision to db
+		currentRevision, err = revision.Add(newRevision)
+		if err != nil {
+			m := fmt.Sprintf("Failed to create new data agreement: %v", newRevision.Id)
+			common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
+			return
+		}
 	}
 
 	// Save the data agreement to db
@@ -149,28 +170,12 @@ func ConfigUpdateDataAgreement(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Save the previous revision to db
-	updatedRevision, err := revision.Update(currentRevision)
-	if err != nil {
-		m := fmt.Sprintf("Failed to update revision: %v", updatedRevision.Id)
-		common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
-		return
-	}
-
-	// Save the revision to db
-	savedRevision, err := revision.Add(newRevision)
-	if err != nil {
-		m := fmt.Sprintf("Failed to create new data agreement: %v", newRevision.Id)
-		common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
-		return
-	}
-
 	// Constructing the response
 	var resp updateDataAgreementResp
 	resp.DataAgreement = savedDataAgreement
 
 	var revisionForHTTPResponse revision.RevisionForHTTPResponse
-	revisionForHTTPResponse.Init(savedRevision)
+	revisionForHTTPResponse.Init(currentRevision)
 	resp.Revision = revisionForHTTPResponse
 
 	response, _ := json.Marshal(resp)