Skip to content

fix(collaboration): can not modify the description of project #2642

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
yhilmare merged 2 commits into from
Jun 5, 2024
Merged

fix(collaboration): can not modify the description of project #2642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61961d5
fix
smallsheeeep Jun 4, 2024
ba99074
fix ut
smallsheeeep Jun 4, 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
7 changes: 0 additions & 7 deletions ...ration-test/src/test/java/com/oceanbase/odc/service/collaboration/ProjectServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,6 @@ public void testUpdateProject_Success() {
Assert.assertEquals("another_name", updated.getName());
}

@Test(expected = BadRequestException.class)
public void testUpdateProject_DuplicatedName_Fail() {
Mockito.when(resourceRoleService.saveAll(Mockito.any())).thenReturn(listUserResourceRole(1L));
Project saved = projectService.create(getProject());
projectService.update(saved.getId(), saved);
}

@Test
public void testArchiveProject_Archived() throws InterruptedException {
Project saved = projectService.create(getProject());
Expand Down
20 changes: 6 additions & 14 deletions ...service/src/main/java/com/oceanbase/odc/service/collaboration/project/ProjectService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import com.oceanbase.odc.core.shared.constant.ResourceType;
import com.oceanbase.odc.core.shared.exception.BadRequestException;
import com.oceanbase.odc.core.shared.exception.NotFoundException;
import com.oceanbase.odc.core.shared.exception.UnsupportedException;
import com.oceanbase.odc.metadb.collaboration.ProjectEntity;
import com.oceanbase.odc.metadb.collaboration.ProjectRepository;
import com.oceanbase.odc.metadb.collaboration.ProjectSpecs;
Expand Down Expand Up @@ -242,27 +243,18 @@ public Project getByIdentifier(@NotNull String uniqueIdentifier) {
@PreAuthenticate(hasAnyResourceRole = {"OWNER"}, resourceType = "ODC_PROJECT", indexOfIdParam = 0)
@Transactional(rollbackFor = Exception.class)
public Project update(@NotNull Long id, @NotNull Project project) {

ProjectEntity previous = repository.findByIdAndOrganizationId(id, currentOrganizationId())
.orElseThrow(() -> new NotFoundException(ResourceType.ODC_PROJECT, "id", id));
/**
* not allowed to update a built-in project or an archived project
*/
if (previous.getBuiltin() || previous.getArchived()) {
return entityToModel(previous,
resourceRoleService.listByResourceTypeAndId(ResourceType.ODC_PROJECT, previous.getId()));
throw new UnsupportedException(ErrorCodes.IllegalOperation, new Object[] {"builtin or archived project"},
"Operation on builtin or archived project is not allowed");
}
if (!Objects.equals(previous.getName(), project.getName())) {
checkNoDuplicateProject(project);
}

checkNoDuplicateProject(project);

previous.setLastModifierId(authenticationFacade.currentUserId());
previous.setDescription(project.getDescription());
previous.setName(project.getName());


/**
* save project
*/
ProjectEntity saved = repository.save(previous);
return entityToModel(saved,
resourceRoleService.listByResourceTypeAndId(ResourceType.ODC_PROJECT, saved.getId()));
Expand Down