Skip to content
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

Jump to bottom

Do Not Update An Existing Project With A New Group (AST-70718) #933

Merged
merged 8 commits into from
Nov 13, 2024
Merged

Do Not Update An Existing Project With A New Group (AST-70718) #933

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7bf1230
do not update existing project with new group (AST-70718)
miryamfoiferCX Nov 11, 2024
b856e48
CR fix
miryamfoiferCX Nov 12, 2024
e241b46
Merge branch 'main' into bug/miryamFoifer/ignoreGroupsWhenProjectExists
miryamfoiferCX Nov 12, 2024
df137a0
add tests
miryamfoiferCX Nov 13, 2024
1a152c3
fix issues from conflict
miryamfoiferCX Nov 13, 2024
275f146
fix for lint
miryamfoiferCX Nov 13, 2024
1837f22
add integration test
miryamfoiferCX Nov 13, 2024
27a5be5
change test name
miryamfoiferCX Nov 13, 2024
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
17 changes: 0 additions & 17 deletions internal/services/projects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,26 +245,9 @@ func updateProject(
}
}

if projectGroups != "" {
err = UpsertProjectGroupsByUpdateFlow(groupsWrapper, &projModel, projectsWrapper, accessManagementWrapper, projModelResp, projectGroups, projectID, projectName, featureFlagsWrapper)
if err != nil {
return projectID, err
}
}
return projectID, nil
}

func UpsertProjectGroupsByUpdateFlow(groupsWrapper wrappers.GroupsWrapper, projModel *wrappers.Project, projectsWrapper wrappers.ProjectsWrapper,
OrShamirCM marked this conversation as resolved.
Show resolved Hide resolved
accessManagementWrapper wrappers.AccessManagementWrapper, projModelResp *wrappers.ProjectResponseModel,
projectGroups string, projectID string, projectName string, featureFlagsWrapper wrappers.FeatureFlagsWrapper) error {
groupsMap, groups, groupErr := GetGroupMap(groupsWrapper, projectGroups, projModelResp, featureFlagsWrapper)
if groupErr != nil {
return groupErr
}
projModel.Groups = groups
return UpsertProjectGroups(projModel, projectsWrapper, accessManagementWrapper, projectID, projectName, featureFlagsWrapper, groupsMap)
OrShamirCM marked this conversation as resolved.
Show resolved Hide resolved
}

func UpsertProjectGroups(projModel *wrappers.Project, projectsWrapper wrappers.ProjectsWrapper,
accessManagementWrapper wrappers.AccessManagementWrapper, projectID string, projectName string,
featureFlagsWrapper wrappers.FeatureFlagsWrapper, groupsMap []*wrappers.Group) error {
Expand Down
Loading