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

fix(controller): project update to private when pass null by api #2943

Merged
merged 1 commit into from
Nov 7, 2023
Merged

fix(controller): project update to private when pass null by api #2943

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
18 changes: 11 additions & 7 deletions server/controller/src/main/java/ai/starwhale/mlops/domain/project/ProjectService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,20 +345,24 @@ public Boolean updateProject(
}
}

var privacyEnum = Privacy.fromName(privacy);
if (privacyEnum == Privacy.PRIVATE) {
// make all the shared resource unshared
runtimeVersionMapper.unShareRuntimeVersionWithinProject(projectId);
modelVersionMapper.unShareModelVersionWithinProject(projectId);
datasetVersionMapper.unShareDatesetVersionWithinProject(projectId);
Integer privacyValue = null;
if (StrUtil.isNotEmpty(privacy)) {
var privacyEnum = Privacy.fromName(privacy);
if (privacyEnum == Privacy.PRIVATE) {
// make all the shared resource unshared
runtimeVersionMapper.unShareRuntimeVersionWithinProject(projectId);
modelVersionMapper.unShareModelVersionWithinProject(projectId);
datasetVersionMapper.unShareDatesetVersionWithinProject(projectId);
}
privacyValue = privacyEnum.getValue();
}

ProjectEntity entity = ProjectEntity.builder()
.id(projectId)
.projectName(projectName)
.projectDescription(description)
.readme(readme)
.privacy(privacyEnum.getValue())
.privacy(privacyValue)
.build();
int res = projectMapper.update(entity);
log.info("Project has been modified ID={}", entity.getId());
Expand Down
30 changes: 25 additions & 5 deletions server/controller/src/test/java/ai/starwhale/mlops/domain/project/ProjectServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import static org.mockito.BDDMockito.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

import ai.starwhale.mlops.common.IdConverter;
import ai.starwhale.mlops.common.OrderParams;
Expand Down Expand Up @@ -61,6 +63,12 @@

public class ProjectServiceTest {

private RuntimeVersionMapper runtimeVersionMapper = mock(RuntimeVersionMapper.class);

private ModelVersionMapper modelVersionMapper = mock(ModelVersionMapper.class);

private DatasetVersionMapper datasetVersionMapper = mock(DatasetVersionMapper.class);

private ProjectService service;

private ProjectMapper projectMapper;
Expand Down Expand Up @@ -139,9 +147,9 @@ public void setUp() {
memberService,
idConvertor,
userService,
mock(RuntimeVersionMapper.class),
mock(ModelVersionMapper.class),
mock(DatasetVersionMapper.class)
runtimeVersionMapper,
modelVersionMapper,
datasetVersionMapper
);
}

Expand Down Expand Up @@ -264,10 +272,22 @@ public void testModifyProject() {
.willReturn(1);
given(projectMapper.findByNameForUpdateAndOwner(same("p2"), any()))
.willReturn(ProjectEntity.builder().id(2L).projectName("p2").build());
var res = service.updateProject("1", "pro1", null, null, "PUBLIC");
var res = service.updateProject("1", "pro1", null, null, null);
verify(runtimeVersionMapper, times(0)).unShareRuntimeVersionWithinProject(any());
verify(modelVersionMapper, times(0)).unShareModelVersionWithinProject(any());
verify(datasetVersionMapper, times(0)).unShareDatesetVersionWithinProject(any());
assertThat(res, is(true));

res = service.updateProject("1", "pro1", null, null, "PUBLIC");
verify(runtimeVersionMapper, times(0)).unShareRuntimeVersionWithinProject(any());
verify(modelVersionMapper, times(0)).unShareModelVersionWithinProject(any());
verify(datasetVersionMapper, times(0)).unShareDatesetVersionWithinProject(any());
assertThat(res, is(true));

res = service.updateProject("p1", "pro1", null, null, "PUBLIC");
res = service.updateProject("p1", "pro1", null, null, "PRIVATE");
verify(runtimeVersionMapper, times(1)).unShareRuntimeVersionWithinProject(any());
verify(modelVersionMapper, times(1)).unShareModelVersionWithinProject(any());
verify(datasetVersionMapper, times(1)).unShareDatesetVersionWithinProject(any());
assertThat(res, is(true));

res = service.updateProject("2", "pro1", null, null, "PUBLIC");
Expand Down
Loading