Allow the name to remain unchanged when the template is modified

oceanbase · May 30, 2024 · 61d04dc · 61d04dc
1 parent 8d40fce
commit 61d04dc
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.../com/oceanbase/odc/service/databasechange/DatabaseChangeChangingOrderTemplateService.java b/.../com/oceanbase/odc/service/databasechange/DatabaseChangeChangingOrderTemplateService.java
@@ -191,13 +191,13 @@ public DatabaseChangeChangingOrderTemplateResp update(Long id,
  () -> projectRepository.existsById(req.getProjectId()));
  projectPermissionValidator.checkProjectRole(req.getProjectId(), ResourceRoleName.all());
  DatabaseChangeChangingOrderTemplateEntity originEntity =
- templateRepository.findById(id).orElseThrow(
+ templateRepository.findByIdAndProjectId(id, req.getProjectId()).orElseThrow(
  () -> new NotFoundException(ResourceType.ODC_DATABASE_CHANGE_ORDER_TEMPLATE, "id", id));
- Optional<DatabaseChangeChangingOrderTemplateEntity> byNameAndProjectId
- = templateRepository.findByNameAndProjectId(req.getName(), req.getProjectId());
- if(byNameAndProjectId.isPresent()){
+ Optional<DatabaseChangeChangingOrderTemplateEntity> byNameAndProjectId =
+   templateRepository.findByNameAndProjectId(req.getName(), req.getProjectId());
+ if (byNameAndProjectId.isPresent()) {
  PreConditions.validNoDuplicated(ResourceType.ODC_DATABASE_CHANGE_ORDER_TEMPLATE, "name", req.getName(),
- () -> !Objects.equals(byNameAndProjectId.get().getId(), originEntity.getId()));
+  () -> !Objects.equals(byNameAndProjectId.get().getId(), originEntity.getId()));
  }
  List<List<Long>> orders = req.getOrders();
  List<Long> databaseIds = orders.stream().flatMap(List::stream).collect(Collectors.toList());