Skip to content

Fixes getUpdateFields for boolean type #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2024
Merged

Fixes getUpdateFields for boolean type #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/controller/account_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,12 @@ func TestUpdateAccountHandler(t *testing.T) {
accountController.accountRepository.Create(&account1)

// Update the account
accountV2.Domain.ID = "123-controller-update-account"
accountV2.Environment = "default"
accountV2.Domain.Message = "Updated successfully"
account1.Domain.Message = "Updated successfully"
account1.Settings.Window = "5m"
account1.Settings.Active = false

// Test
payload, _ := json.Marshal(accountV2)
payload, _ := json.Marshal(account1)
req, _ := http.NewRequest(http.MethodPut, accountController.routeAccountPath, bytes.NewBuffer(payload))
response := executeRequest(req, r, token)

Expand All @@ -174,6 +174,7 @@ func TestUpdateAccountHandler(t *testing.T) {
assert.Equal(t, model.StatusSynced, accountResponse.Domain.Status)
assert.Equal(t, "Updated successfully", accountResponse.Domain.Message)
assert.Equal(t, "5m", accountResponse.Settings.Window)
assert.False(t, accountResponse.Settings.Active)
})

t.Run("Should update account token only", func(t *testing.T) {
Expand Down
15 changes: 0 additions & 15 deletions src/controller/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,3 @@ var accountV1 = model.Account{
ForcePrune: false,
},
}

var accountV2 = model.Account{
Repository: "switcherapi/switcher-gitops",
Branch: "main",
Environment: "default",
Domain: model.DomainDetails{
ID: "123-controller-test",
Name: "Switcher GitOps",
},
Settings: model.Settings{
Active: false,
Window: "5m",
ForcePrune: true,
},
}
5 changes: 3 additions & 2 deletions src/repository/account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,9 @@ func getUpdateFields(account *model.Account) bson.M {
setIfNotEmpty(setMap, "domain.message", account.Domain.Message)

setIfNotEmpty(setMap, "settings.window", account.Settings.Window)
setIfNotEmpty(setMap, "settings.forcePrune", account.Settings.ForcePrune)
setIfNotEmpty(setMap, "settings.active", account.Settings.Active)

setMap["settings.active"] = account.Settings.Active
setMap["settings.forcePrune"] = account.Settings.ForcePrune

update := bson.M{"$set": setMap}
return update
Expand Down
Loading