diff --git a/src/main/java/kr/re/etri/autoflow/controllers/DataGroupController.java b/src/main/java/kr/re/etri/autoflow/controllers/DataGroupController.java index 0abf12e..32e3f04 100644 --- a/src/main/java/kr/re/etri/autoflow/controllers/DataGroupController.java +++ b/src/main/java/kr/re/etri/autoflow/controllers/DataGroupController.java @@ -67,7 +67,7 @@ public class DataGroupController { public ResponseEntity updateProject( @Parameter(description = "수정할 데이터 그룹 ID", required = true, in = ParameterIn.PATH) @PathVariable("id") Long id, - @RequestBody ProjectRequest dto) { + @RequestBody DataGroupEntity dto) { return dataGroupService.update(id, dto) .map(ResponseEntity::ok) diff --git a/src/main/java/kr/re/etri/autoflow/service/DataGroupService.java b/src/main/java/kr/re/etri/autoflow/service/DataGroupService.java index 98e4191..ae2c53d 100644 --- a/src/main/java/kr/re/etri/autoflow/service/DataGroupService.java +++ b/src/main/java/kr/re/etri/autoflow/service/DataGroupService.java @@ -105,12 +105,21 @@ public class DataGroupService { return dataGroupRepository.save(project); } - @Transactional(readOnly = false) - public Optional update(Long id, ProjectRequest dto) { + @Transactional + public Optional update(Long id, DataGroupEntity dto) { return dataGroupRepository.findById(id) - .map(project -> { - BeanUtils.copyProperties(dto, project); - return dataGroupRepository.save(project); + .map(entity -> { + if (dto.getRefType() != null) entity.setRefType(dto.getRefType()); + if (dto.getDsNm() != null) entity.setDsNm(dto.getDsNm()); + if (dto.getDsDesc() != null) entity.setDsDesc(dto.getDsDesc()); + if (dto.getDelYn() != null) entity.setDelYn(dto.getDelYn()); + if (dto.getRegUserId() != null) entity.setRegUserId(dto.getRegUserId()); + if (dto.getRegUserNm() != null) entity.setRegUserNm(dto.getRegUserNm()); + if (dto.getModUserId() != null) entity.setModUserId(dto.getModUserId()); + if (dto.getModUserNm() != null) entity.setModUserNm(dto.getModUserNm()); + if (dto.getProjectId() != null) entity.setProjectId(dto.getProjectId()); + + return dataGroupRepository.save(entity); }); }