Fixed account update and other minor issues with syncing (#34)

* Fixed account update and other minor issues with syncing * Added missing test for comparator
switcherapi · Sep 14, 2024 · 5bd2fed · 5bd2fed
1 parent c1bc173
commit 5bd2fed
Show file tree

Hide file tree

Showing 9 changed files with 284 additions and 153 deletions.
diff --git a/.env.test b/.env.test
@@ -1,5 +1,5 @@
 PORT=8000
-LOG_LEVEL=INFO
+LOG_LEVEL=DEBUG
 MONGO_URI=mongodb://localhost:27017
 MONGO_DB=switcher-gitops-test
 GIT_TOKEN_PRIVATE_KEY=SecretSecretSecretSecretSecretSe

diff --git a/src/controller/account.go b/src/controller/account.go
@@ -5,6 +5,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
+	"github.com/switcherapi/switcher-gitops/src/config"
 	"github.com/switcherapi/switcher-gitops/src/core"
 	"github.com/switcherapi/switcher-gitops/src/model"
 	"github.com/switcherapi/switcher-gitops/src/repository"
@@ -48,6 +49,12 @@ func (controller *AccountController) CreateAccountHandler(w http.ResponseWriter,
 		return
 	}
 
+	// Encrypt token before saving
+	if accountRequest.Token != "" {
+		println("Encrypting token", accountRequest.Token)
+		accountRequest.Token = utils.Encrypt(accountRequest.Token, config.GetEnv("GIT_TOKEN_PRIVATE_KEY"))
+	}
+
 	accountCreated, err := controller.AccountRepository.Create(&accountRequest)
 	if err != nil {
 		utils.Log(utils.LogLevelError, "Error creating account: %s", err.Error())
@@ -83,6 +90,11 @@ func (controller *AccountController) UpdateAccountHandler(w http.ResponseWriter,
 		return
 	}
 
+	// Encrypt token before saving
+	if accountRequest.Token != "" {
+		accountRequest.Token = utils.Encrypt(accountRequest.Token, config.GetEnv("GIT_TOKEN_PRIVATE_KEY"))
+	}
+
 	accountUpdated, err := controller.AccountRepository.Update(&accountRequest)
 	if err != nil {
 		utils.Log(utils.LogLevelError, "Error updating account: %s", err.Error())

diff --git a/src/controller/account_test.go b/src/controller/account_test.go
@@ -98,8 +98,10 @@ func TestUpdateAccountHandler(t *testing.T) {
 		accountController.CreateAccountHandler(givenAccountRequest(accountV1))
 
 		// Test
-		payload, _ := json.Marshal(accountV2)
-		req, _ := http.NewRequest(http.MethodPut, accountController.RouteAccountPath+"/"+accountV2.Domain.ID, bytes.NewBuffer(payload))
+		accountV2Copy := accountV2
+		accountV2Copy.Domain.Message = "Updated successfully"
+		payload, _ := json.Marshal(accountV2Copy)
+		req, _ := http.NewRequest(http.MethodPut, accountController.RouteAccountPath+"/"+accountV2Copy.Domain.ID, bytes.NewBuffer(payload))
 		response := executeRequest(req)
 
 		// Assert
@@ -108,11 +110,11 @@ func TestUpdateAccountHandler(t *testing.T) {
 
 		assert.Equal(t, http.StatusOK, response.Code)
 		assert.Nil(t, err)
-		assert.Equal(t, accountV1.Repository, accountResponse.Repository)
 		assert.NotEmpty(t, accountResponse.Token)
-		assert.NotEqual(t, accountV1.Branch, accountResponse.Branch)
-		assert.NotEqual(t, accountV1.Settings.Window, accountResponse.Settings.Window)
-		assert.NotEqual(t, accountV1.Settings.Active, accountResponse.Settings.Active)
+		assert.Equal(t, accountV1.Repository, accountResponse.Repository)
+		assert.Equal(t, model.StatusSynced, accountResponse.Domain.Status)
+		assert.Equal(t, "Updated successfully", accountResponse.Domain.Message)
+		assert.Equal(t, "5m", accountResponse.Settings.Window)
 	})
 
 	t.Run("Should update account token only", func(t *testing.T) {
@@ -137,6 +139,9 @@ func TestUpdateAccountHandler(t *testing.T) {
 
 		encryptedToken := utils.Encrypt(accountV1.Token, config.GetEnv("GIT_TOKEN_PRIVATE_KEY"))
 		assert.NotEqual(t, encryptedToken, accountResponse.Token)
+
+		decryptedToken, _ := utils.Decrypt(accountResponse.Token, config.GetEnv("GIT_TOKEN_PRIVATE_KEY"))
+		assert.Equal(t, "new-token", decryptedToken)
 	})
 
 	t.Run("Should not update an account - invalid request", func(t *testing.T) {

diff --git a/src/controller/controller_test.go b/src/controller/controller_test.go
@@ -68,6 +68,7 @@ var accountV1 = model.Account{
 		Name:       "Switcher GitOps",
 		Version:    123,
 		LastCommit: "123",
+		LastDate:   "2021-01-01",
 		Status:     model.StatusSynced,
 		Message:    "Synced successfully",
 	},
@@ -82,11 +83,8 @@ var accountV2 = model.Account{
 	Repository: "switcherapi/switcher-gitops",
 	Branch:     "main",
 	Domain: model.DomainDetails{
-		ID:         "123-controller-test",
-		Name:       "Switcher GitOps",
-		Version:    123,
-		LastCommit: "123",
-		Status:     model.StatusSynced,
+		ID:   "123-controller-test",
+		Name: "Switcher GitOps",
 	},
 	Settings: model.Settings{
 		Active:     false,

diff --git a/src/core/comparator.go b/src/core/comparator.go
@@ -14,6 +14,7 @@ type IComparatorService interface {
 	CheckSnapshotDiff(left model.Snapshot, right model.Snapshot, diffType DiffType) model.DiffResult
 	MergeResults(diffResults []model.DiffResult) model.DiffResult
 	NewSnapshotFromJson(jsonData []byte) model.Snapshot
+	RemoveDeleted(diffResult model.DiffResult) model.DiffResult
 }
 
 type ComparatorService struct{}
@@ -55,6 +56,17 @@ func (c *ComparatorService) MergeResults(diffResults []model.DiffResult) model.D
 	return result
 }
 
+func (c *ComparatorService) RemoveDeleted(diffResult model.DiffResult) model.DiffResult {
+	diff := model.DiffResult{Changes: []model.DiffDetails{}}
+	for _, change := range diffResult.Changes {
+		if change.Action != string(DELETED) {
+			diff.Changes = append(diff.Changes, change)
+		}
+	}
+
+	return diff
+}
+
 func checkGroupDiff(left model.Snapshot, right model.Snapshot, diffType DiffType, diffResult model.DiffResult) model.DiffResult {
 	for _, leftGroup := range left.Domain.Group {
 		if !slices.Contains(model.GroupNames(right.Domain.Group), leftGroup.Name) {