diff --git a/README.md b/README.md index c4aee07b..e9ff9c70 100644 --- a/README.md +++ b/README.md @@ -240,6 +240,95 @@ fileUrlPortIn.getInline( `inline` 과 `attachment` 는 응답 헤더의 content-disposition 속성 값을 의미합니다. 업로드된 파일은 사용자에게 전달할 때 `inline` 과 `attachment` 두 방식 중 요건에 맞게 사용하면 됩니다. +## 공통 필드(Audit) 자동 주입 방법 (AOP기반) +createdAt, createdBy, updatedAt, updatedBy, deletedAt, deletedBy, isDeleted 와 같은 공통 이력 필드는 +매번 수동으로 설정하지 않아도 되도록, AOP를 활용해 자동으로 주입되도록 구성했습니다. + +### 1. 기본 구조 +create, update, delete 시 Command 객체에 AuditCommand를 상속합니다. +#### AuditCommand 사용 예시 +``` java +// 필수: AuditCommand 상속 +public class UpdateCmd extends AuditCommand { + private Long seq; + ... +} +``` +AuditCommand는 아래 메서드를 제공하며, 각각 생성/수정/삭제 작업에 필요한 필드를 자동으로 설정합니다. +``` java +public class AuditCommand { + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; + private LocalDateTime deletedAt; + private String deletedBy; + + public void create() { ... } + public void update() { ... } + public void delete() { ... } +} +``` + +### 2. AOP 기반 어노테이션 자동 주입 +service 또는 dao 내에 +@CreateCommand, @UpdateCommand, @DeleteCommand 어노테이션을 통해 +AOP가 자동으로 해당 메서드의 파라미터(AuditCommand 상속 객체)에 공통 필드를 주입합니다. + +| 어노테이션 | 자동 설정되는 필드 | +| ---------------- | -------------------------------------------------- | +| `@CreateCommand` | `createdAt`, `createdBy`, `updatedAt`, `updatedBy` | +| `@UpdateCommand` | `updatedAt`, `updatedBy` | +| `@DeleteCommand` | `updatedAt`, `updatedBy`, `deletedAt`, `deletedBy` | + +#### 어노테이션 사용 예시 +```java +@UpdateCommand +public void operate(UpdateCmd cmd) { + mapper.update(cmd); +} +``` +### 3. AOP 외 수동 적용이 필요한 경우: AuditUtil 사용 +AOP 외에도, 하나의 DAO 메서드 내에서 여러 Insert/Delete 처리가 필요한 경우에는 아래처럼 직접 AuditUtil을 사용할 수 있습니다. +#### AuditUtil 사용 예시 +```java +// 관리자 등록 +mapper.insertAdmin(AuditUtil.create(cmd)); + +// 관리자의 역할 매핑 +mapper.insertAdminHasRoles( + AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleIds())) +); +``` + +### 4. XML에서 공통 필드 include로 재사용 +SQL 작성 시 공통필드의 반복 작성을 피하기 위해 `` 태그로 분리하여 `` 방식으로 재사용합니다. +자세한 정의는 `CommonFieldsMapper.xml` 파일에서 확인할 수 있습니다. + +| SQL ID | 설명 | 사용 예시 | +| ---------------------------- | -------------------------------------- | -------------------------------------------------------------- | +| `CreateUpdateBaseColumns` | `INSERT` 시 공통 컬럼 정의 | `` | +| `CreateUpdateBaseValues` | `INSERT` 시 공통 컬럼의 값 정의 | `` | +| `CreateUpdateListBaseValues` | `다건 INSERT` 시 공통 값 정의 (e.g. `foreach`) | `` | +| `UpdateBaseSet` | `UPDATE` 시 공통 `SET` 구문 | `` | +| `DeleteBaseSet` | `삭제 처리용 UPDATE` 시 공통 `SET` 구문 | `` | + +#### include 사용 예시 +```xml +UPDATE household +SET + owner_name = #{ownerName}, + owner_age = #{ownerAge}, + tel = #{tel}, + phone = #{phone}, + region = #{region}, + city = #{city}, + address_detail = #{addressDetail}, + +WHERE seq = ${seq} +``` + + ## PACKAGING 배포방식 설정을 위해 두가지 maven 프로파일을 제공한다. diff --git a/admin/src/main/resources/templates/admin/adminUpdateForm.html b/admin/src/main/resources/templates/admin/adminUpdateForm.html index 5dcc1711..7023808f 100644 --- a/admin/src/main/resources/templates/admin/adminUpdateForm.html +++ b/admin/src/main/resources/templates/admin/adminUpdateForm.html @@ -9,6 +9,8 @@ th:action="${'/settings/admins/update/' + bindingVO.id}" th:object="${bindingVO}"> + +
@@ -20,7 +22,8 @@
-
checkedIds) { - String loginUser = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - RemoveAdminParam param = - new RemoveAdminParam(checkedIds, now, loginUser, now, loginUser); + RemoveAdminParam param = AuditUtil.delete(new RemoveAdminParam(checkedIds)); // 매핑된 역할 먼저 삭제 mapper.deleteAdminHasRoleByAdminId(param); diff --git a/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/model/RemoveAdminParam.java b/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/model/RemoveAdminParam.java index 52c621e0..a24fe354 100644 --- a/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/model/RemoveAdminParam.java +++ b/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/model/RemoveAdminParam.java @@ -1,5 +1,6 @@ package app.module.core.usecase.admin.removeAdmin.adapters.persistence.model; +import app.module.core.config.adapters.persistence.component.AuditCommand; import java.time.LocalDateTime; import java.util.List; import lombok.AllArgsConstructor; @@ -9,10 +10,6 @@ import lombok.Setter; @Getter @Setter @AllArgsConstructor -public class RemoveAdminParam { +public class RemoveAdminParam extends AuditCommand { private List ids; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java index 63e0201a..8dabfdfe 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java @@ -1,15 +1,11 @@ package app.module.core.usecase.admin.saveAdmin.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Admin; -import app.module.core.config.application.annotation.CreateCommand; import app.module.core.config.application.util.AuditUtil; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut; import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.DeleteAdminHasRoleParam; -import app.module.core.usecase.admin.saveAdmin.ports.application.domain.SaveAdminCmd; import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.SaveAdminHasRoleParam; +import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut; +import app.module.core.usecase.admin.saveAdmin.ports.application.domain.SaveAdminCmd; import app.module.core.usecase.admin.view.adapters.persistence.AdminViewMapper; -import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; @@ -24,12 +20,11 @@ class SaveAdminDao implements SaveAdminPortOut { @Override @Transactional - @CreateCommand public String connect(SaveAdminCmd cmd) { if (viewMapper.findById(cmd.getId()).isPresent()) { // update - mapper.updateAdmin(cmd); + mapper.updateAdmin(AuditUtil.update(cmd)); mapper.deleteAdminRolesByAdminId( AuditUtil.delete(new DeleteAdminHasRoleParam(cmd.getSeq()))); @@ -39,7 +34,7 @@ class SaveAdminDao implements SaveAdminPortOut { } } else { // create - mapper.insertAdmin(cmd); + mapper.insertAdmin(AuditUtil.create(cmd)); if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) { mapper.insertAdminHasRoles( diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java index e848d0f5..d0f171c3 100644 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java @@ -1,6 +1,5 @@ package app.module.core.usecase.household.createHousehold.ports; -import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; public interface CreateHouseholdPortOut { diff --git a/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/adapters/persistence/UpdateFrontHouseholdDao.java b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/adapters/persistence/UpdateFrontHouseholdDao.java index 85297172..64f31534 100644 --- a/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/adapters/persistence/UpdateFrontHouseholdDao.java +++ b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/adapters/persistence/UpdateFrontHouseholdDao.java @@ -1,5 +1,6 @@ package app.module.core.usecase.household.updateFrontHousehold.adapters.persistence; +import app.module.core.config.application.annotation.UpdateCommand; import lombok.RequiredArgsConstructor; import app.module.core.usecase.household.updateFrontHousehold.ports.application.domain.UpdateFrontHouseholdCmd; import app.module.core.usecase.household.updateFrontHousehold.ports.UpdateFrontHouseholdPortOut; @@ -11,6 +12,7 @@ class UpdateFrontHouseholdDao implements UpdateFrontHouseholdPortOut { private final UpdateFrontHouseholdMapper mapper; @Override + @UpdateCommand public void operate(UpdateFrontHouseholdCmd cmd) { mapper.update(cmd); } diff --git a/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/UpdateFrontHouseholdService.java b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/UpdateFrontHouseholdService.java index 2f12b79e..72291b9e 100644 --- a/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/UpdateFrontHouseholdService.java +++ b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/UpdateFrontHouseholdService.java @@ -1,10 +1,9 @@ package app.module.core.usecase.household.updateFrontHousehold.ports.application; -import app.module.core.config.application.annotation.UpdateCommand; -import lombok.RequiredArgsConstructor; -import app.module.core.usecase.household.updateFrontHousehold.ports.application.domain.UpdateFrontHouseholdCmd; import app.module.core.usecase.household.updateFrontHousehold.ports.UpdateFrontHouseholdPortIn; import app.module.core.usecase.household.updateFrontHousehold.ports.UpdateFrontHouseholdPortOut; +import app.module.core.usecase.household.updateFrontHousehold.ports.application.domain.UpdateFrontHouseholdCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service @@ -13,6 +12,5 @@ class UpdateFrontHouseholdService implements UpdateFrontHouseholdPortIn { private final UpdateFrontHouseholdPortOut portOut; @Override - @UpdateCommand public void operate(UpdateFrontHouseholdCmd cmd) { portOut.operate(cmd); } } \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/PrivilegeRemoveDao.java b/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/PrivilegeRemoveDao.java index cda29fe5..24a99b1b 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/PrivilegeRemoveDao.java +++ b/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/PrivilegeRemoveDao.java @@ -1,9 +1,8 @@ package app.module.core.usecase.privilege.remove.adapters.persistence; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.privilege.remove.adapters.persistence.model.PrivilegeRemoveParam; +import app.module.core.config.application.annotation.DeleteCommand; import app.module.core.usecase.privilege.remove.ports.PrivilegeRemovePortOut; -import java.time.LocalDateTime; +import app.module.core.usecase.privilege.remove.ports.application.domain.PrivilegeRemoveOutCmd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -14,12 +13,9 @@ public class PrivilegeRemoveDao implements PrivilegeRemovePortOut { private final PrivilegeRemoveMapper mapper; @Override - public void connect(String id) { - String userId = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - PrivilegeRemoveParam param = new PrivilegeRemoveParam(id, now, userId, now, userId); - - mapper.deleteRoleHasPrivilegesByPrivilegeId(param); - mapper.deleteById(param); + @DeleteCommand + public void connect(PrivilegeRemoveOutCmd outCmd) { + mapper.deleteRoleHasPrivilegesByPrivilegeId(outCmd); + mapper.deleteById(outCmd); } } diff --git a/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/PrivilegeRemoveMapper.java b/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/PrivilegeRemoveMapper.java index 1bd40d70..1b709f19 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/PrivilegeRemoveMapper.java +++ b/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/PrivilegeRemoveMapper.java @@ -1,10 +1,10 @@ package app.module.core.usecase.privilege.remove.adapters.persistence; -import app.module.core.usecase.privilege.remove.adapters.persistence.model.PrivilegeRemoveParam; +import app.module.core.usecase.privilege.remove.ports.application.domain.PrivilegeRemoveOutCmd; import org.apache.ibatis.annotations.Mapper; @Mapper public interface PrivilegeRemoveMapper { - void deleteById(PrivilegeRemoveParam param); - void deleteRoleHasPrivilegesByPrivilegeId(PrivilegeRemoveParam param); + void deleteById(PrivilegeRemoveOutCmd outCmd); + void deleteRoleHasPrivilegesByPrivilegeId(PrivilegeRemoveOutCmd outCmd); } diff --git a/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/model/PrivilegeRemoveParam.java b/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/model/PrivilegeRemoveParam.java deleted file mode 100644 index f5fdbb01..00000000 --- a/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/model/PrivilegeRemoveParam.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.core.usecase.privilege.remove.adapters.persistence.model; - -import java.time.LocalDateTime; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@AllArgsConstructor -@Getter -@Setter -public class PrivilegeRemoveParam { - private String id; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/privilege/remove/ports/PrivilegeRemovePortIn.java b/core/src/main/java/app/module/core/usecase/privilege/remove/ports/PrivilegeRemovePortIn.java index ff5991a1..bded797d 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/remove/ports/PrivilegeRemovePortIn.java +++ b/core/src/main/java/app/module/core/usecase/privilege/remove/ports/PrivilegeRemovePortIn.java @@ -1,6 +1,5 @@ package app.module.core.usecase.privilege.remove.ports; public interface PrivilegeRemovePortIn { - void connect(String id); } diff --git a/core/src/main/java/app/module/core/usecase/privilege/remove/ports/PrivilegeRemovePortOut.java b/core/src/main/java/app/module/core/usecase/privilege/remove/ports/PrivilegeRemovePortOut.java index ca3610f1..61d82b55 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/remove/ports/PrivilegeRemovePortOut.java +++ b/core/src/main/java/app/module/core/usecase/privilege/remove/ports/PrivilegeRemovePortOut.java @@ -1,6 +1,7 @@ package app.module.core.usecase.privilege.remove.ports; -public interface PrivilegeRemovePortOut { +import app.module.core.usecase.privilege.remove.ports.application.domain.PrivilegeRemoveOutCmd; - void connect(String id); +public interface PrivilegeRemovePortOut { + void connect(PrivilegeRemoveOutCmd outCmd); } diff --git a/core/src/main/java/app/module/core/usecase/privilege/remove/ports/application/PrivilegeRemoveService.java b/core/src/main/java/app/module/core/usecase/privilege/remove/ports/application/PrivilegeRemoveService.java index be125a22..590c3c7e 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/remove/ports/application/PrivilegeRemoveService.java +++ b/core/src/main/java/app/module/core/usecase/privilege/remove/ports/application/PrivilegeRemoveService.java @@ -2,6 +2,7 @@ package app.module.core.usecase.privilege.remove.ports.application; import app.module.core.usecase.privilege.remove.ports.PrivilegeRemovePortIn; import app.module.core.usecase.privilege.remove.ports.PrivilegeRemovePortOut; +import app.module.core.usecase.privilege.remove.ports.application.domain.PrivilegeRemoveOutCmd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -13,6 +14,6 @@ public class PrivilegeRemoveService implements PrivilegeRemovePortIn { @Override public void connect(String id) { - portOut.connect(id); + portOut.connect(new PrivilegeRemoveOutCmd(id)); } } diff --git a/core/src/main/java/app/module/core/usecase/privilege/remove/ports/application/domain/PrivilegeRemoveOutCmd.java b/core/src/main/java/app/module/core/usecase/privilege/remove/ports/application/domain/PrivilegeRemoveOutCmd.java new file mode 100644 index 00000000..fd51e4f3 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/privilege/remove/ports/application/domain/PrivilegeRemoveOutCmd.java @@ -0,0 +1,14 @@ +package app.module.core.usecase.privilege.remove.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@AllArgsConstructor +@Getter +@Setter +public class PrivilegeRemoveOutCmd extends AuditCommand { + private String id; +} diff --git a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveDao.java b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveDao.java index e39abebf..4c8d4833 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveDao.java +++ b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveDao.java @@ -20,7 +20,7 @@ public class PrivilegeSaveDao implements PrivilegeSavePortOut { if (viewMapper.findById(saveInput.getId()).isPresent()) { mapper.updatePrivilege(AuditUtil.update(saveInput)); } else { - mapper.insertPrivilege(AuditUtil.create(saveInput)); + mapper.createPrivilege(AuditUtil.create(saveInput)); } return saveInput.getId(); diff --git a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveMapper.java b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveMapper.java index 3e4f1ca1..8abc7bd8 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveMapper.java +++ b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveMapper.java @@ -6,6 +6,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface PrivilegeSaveMapper { - void insertPrivilege(PrivilegeSaveCommand cmd); + void createPrivilege(PrivilegeSaveCommand cmd); void updatePrivilege(PrivilegeSaveCommand cmd); } diff --git a/core/src/main/java/app/module/core/usecase/privilege/sort/adapters/persistence/PrivilegeSortDao.java b/core/src/main/java/app/module/core/usecase/privilege/sort/adapters/persistence/PrivilegeSortDao.java index 3e21e450..f99730cf 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/sort/adapters/persistence/PrivilegeSortDao.java +++ b/core/src/main/java/app/module/core/usecase/privilege/sort/adapters/persistence/PrivilegeSortDao.java @@ -1,9 +1,8 @@ package app.module.core.usecase.privilege.sort.adapters.persistence; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.privilege.sort.adapters.persistence.model.PrivilegeSortParam; +import app.module.core.config.application.annotation.UpdateCommand; import app.module.core.usecase.privilege.sort.ports.PrivilegeSortPortOut; -import java.time.LocalDateTime; +import app.module.core.usecase.privilege.sort.ports.application.domain.PrivilegeSortCmd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -14,10 +13,8 @@ public class PrivilegeSortDao implements PrivilegeSortPortOut { private final PrivilegeSortMapper mapper; @Override - public void connect(String id, Integer orderNo) { - String userId = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - - mapper.updateOrderNo(new PrivilegeSortParam(id, orderNo, now, userId)); + @UpdateCommand + public void connect(PrivilegeSortCmd outCmd) { + mapper.updateOrderNo(outCmd); } } diff --git a/core/src/main/java/app/module/core/usecase/privilege/sort/adapters/persistence/PrivilegeSortMapper.java b/core/src/main/java/app/module/core/usecase/privilege/sort/adapters/persistence/PrivilegeSortMapper.java index c336a2ef..3018a49b 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/sort/adapters/persistence/PrivilegeSortMapper.java +++ b/core/src/main/java/app/module/core/usecase/privilege/sort/adapters/persistence/PrivilegeSortMapper.java @@ -1,9 +1,9 @@ package app.module.core.usecase.privilege.sort.adapters.persistence; -import app.module.core.usecase.privilege.sort.adapters.persistence.model.PrivilegeSortParam; +import app.module.core.usecase.privilege.sort.ports.application.domain.PrivilegeSortCmd; import org.apache.ibatis.annotations.Mapper; @Mapper public interface PrivilegeSortMapper { - void updateOrderNo(PrivilegeSortParam param); + void updateOrderNo(PrivilegeSortCmd outCmd); } diff --git a/core/src/main/java/app/module/core/usecase/privilege/sort/adapters/persistence/model/PrivilegeSortParam.java b/core/src/main/java/app/module/core/usecase/privilege/sort/adapters/persistence/model/PrivilegeSortParam.java deleted file mode 100644 index 9996e689..00000000 --- a/core/src/main/java/app/module/core/usecase/privilege/sort/adapters/persistence/model/PrivilegeSortParam.java +++ /dev/null @@ -1,16 +0,0 @@ -package app.module.core.usecase.privilege.sort.adapters.persistence.model; - -import java.time.LocalDateTime; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@AllArgsConstructor -@Getter -@Setter -public class PrivilegeSortParam { - private String id; - private Integer orderNo; - private LocalDateTime updatedAt; - private String updatedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/privilege/sort/ports/PrivilegeSortPortIn.java b/core/src/main/java/app/module/core/usecase/privilege/sort/ports/PrivilegeSortPortIn.java index 5901e5d7..6bcd084f 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/sort/ports/PrivilegeSortPortIn.java +++ b/core/src/main/java/app/module/core/usecase/privilege/sort/ports/PrivilegeSortPortIn.java @@ -4,6 +4,5 @@ import app.module.core.usecase.privilege.sort.ports.application.domain.Privilege import java.util.List; public interface PrivilegeSortPortIn { - void connect(List sortReqs); } diff --git a/core/src/main/java/app/module/core/usecase/privilege/sort/ports/PrivilegeSortPortOut.java b/core/src/main/java/app/module/core/usecase/privilege/sort/ports/PrivilegeSortPortOut.java index e8d8cc03..2d167d26 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/sort/ports/PrivilegeSortPortOut.java +++ b/core/src/main/java/app/module/core/usecase/privilege/sort/ports/PrivilegeSortPortOut.java @@ -1,6 +1,7 @@ package app.module.core.usecase.privilege.sort.ports; -public interface PrivilegeSortPortOut { +import app.module.core.usecase.privilege.sort.ports.application.domain.PrivilegeSortCmd; - void connect(String id, Integer orderNo); +public interface PrivilegeSortPortOut { + void connect(PrivilegeSortCmd outCmd); } diff --git a/core/src/main/java/app/module/core/usecase/privilege/sort/ports/application/PrivilegeSortService.java b/core/src/main/java/app/module/core/usecase/privilege/sort/ports/application/PrivilegeSortService.java index eca45294..eedd6d7f 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/sort/ports/application/PrivilegeSortService.java +++ b/core/src/main/java/app/module/core/usecase/privilege/sort/ports/application/PrivilegeSortService.java @@ -18,7 +18,7 @@ public class PrivilegeSortService implements PrivilegeSortPortIn { @Transactional public void connect(List sortReqs) { for (PrivilegeSortCmd sortInput : sortReqs) { - portOut.connect(sortInput.getId(), sortInput.getOrderNo()); + portOut.connect(new PrivilegeSortCmd(sortInput.getId(), sortInput.getOrderNo())); } } } diff --git a/core/src/main/java/app/module/core/usecase/privilege/sort/ports/application/domain/PrivilegeSortCmd.java b/core/src/main/java/app/module/core/usecase/privilege/sort/ports/application/domain/PrivilegeSortCmd.java index e5599554..42b58498 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/sort/ports/application/domain/PrivilegeSortCmd.java +++ b/core/src/main/java/app/module/core/usecase/privilege/sort/ports/application/domain/PrivilegeSortCmd.java @@ -1,5 +1,6 @@ package app.module.core.usecase.privilege.sort.ports.application.domain; +import app.module.core.config.adapters.persistence.component.AuditCommand; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -7,8 +8,7 @@ import lombok.Setter; @Getter @Setter @AllArgsConstructor -public class PrivilegeSortCmd { - +public class PrivilegeSortCmd extends AuditCommand { private String id; private Integer orderNo; } diff --git a/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/RoleRemoveDao.java b/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/RoleRemoveDao.java index f5200d35..7db3e401 100644 --- a/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/RoleRemoveDao.java +++ b/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/RoleRemoveDao.java @@ -1,9 +1,8 @@ package app.module.core.usecase.role.remove.adapters.persistence; -import app.module.core.config.application.util.CommonUtil; +import app.module.core.config.application.annotation.DeleteCommand; import app.module.core.usecase.role.remove.ports.RoleRemovePortOut; -import app.module.core.usecase.role.remove.adapters.persistence.model.RoleRemoveParam; -import java.time.LocalDateTime; +import app.module.core.usecase.role.remove.ports.application.domain.RoleRemoveOutCmd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -14,13 +13,10 @@ public class RoleRemoveDao implements RoleRemovePortOut { private final RoleRemoveMapper mapper; @Override - public void connect(String role) { - String userId = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - RoleRemoveParam param = new RoleRemoveParam(role, now, userId, now, userId); - - mapper.deleteRoleHasPrivilegesByRoleId(param); - mapper.deleteAdminHasRoleByRoleId(param); - mapper.deleteById(param); + @DeleteCommand + public void connect(RoleRemoveOutCmd outCmd) { + mapper.deleteRoleHasPrivilegesByRoleId(outCmd); + mapper.deleteAdminHasRoleByRoleId(outCmd); + mapper.deleteById(outCmd); } } diff --git a/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/RoleRemoveMapper.java b/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/RoleRemoveMapper.java index a2795678..ce2560db 100644 --- a/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/RoleRemoveMapper.java +++ b/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/RoleRemoveMapper.java @@ -1,11 +1,11 @@ package app.module.core.usecase.role.remove.adapters.persistence; -import app.module.core.usecase.role.remove.adapters.persistence.model.RoleRemoveParam; +import app.module.core.usecase.role.remove.ports.application.domain.RoleRemoveOutCmd; import org.apache.ibatis.annotations.Mapper; @Mapper public interface RoleRemoveMapper { - void deleteById(RoleRemoveParam param); - void deleteAdminHasRoleByRoleId(RoleRemoveParam param); - void deleteRoleHasPrivilegesByRoleId(RoleRemoveParam param); + void deleteById(RoleRemoveOutCmd outCmd); + void deleteAdminHasRoleByRoleId(RoleRemoveOutCmd outCmd); + void deleteRoleHasPrivilegesByRoleId(RoleRemoveOutCmd outCmd); } diff --git a/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/model/RoleRemoveParam.java b/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/model/RoleRemoveParam.java deleted file mode 100644 index 177567ce..00000000 --- a/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/model/RoleRemoveParam.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.core.usecase.role.remove.adapters.persistence.model; - -import java.time.LocalDateTime; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@AllArgsConstructor -@Getter -@Setter -public class RoleRemoveParam { - private String id; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/role/remove/ports/RoleRemovePortIn.java b/core/src/main/java/app/module/core/usecase/role/remove/ports/RoleRemovePortIn.java index 2bfcbd1f..06b8d9e4 100644 --- a/core/src/main/java/app/module/core/usecase/role/remove/ports/RoleRemovePortIn.java +++ b/core/src/main/java/app/module/core/usecase/role/remove/ports/RoleRemovePortIn.java @@ -1,6 +1,5 @@ package app.module.core.usecase.role.remove.ports; public interface RoleRemovePortIn { - void connect(String role); } diff --git a/core/src/main/java/app/module/core/usecase/role/remove/ports/RoleRemovePortOut.java b/core/src/main/java/app/module/core/usecase/role/remove/ports/RoleRemovePortOut.java index 08f2d8a3..5336fcbf 100644 --- a/core/src/main/java/app/module/core/usecase/role/remove/ports/RoleRemovePortOut.java +++ b/core/src/main/java/app/module/core/usecase/role/remove/ports/RoleRemovePortOut.java @@ -1,6 +1,7 @@ package app.module.core.usecase.role.remove.ports; -public interface RoleRemovePortOut { +import app.module.core.usecase.role.remove.ports.application.domain.RoleRemoveOutCmd; - void connect(String role); +public interface RoleRemovePortOut { + void connect(RoleRemoveOutCmd outCmd); } diff --git a/core/src/main/java/app/module/core/usecase/role/remove/ports/application/RoleRemoveService.java b/core/src/main/java/app/module/core/usecase/role/remove/ports/application/RoleRemoveService.java index c1585b72..6e71562f 100644 --- a/core/src/main/java/app/module/core/usecase/role/remove/ports/application/RoleRemoveService.java +++ b/core/src/main/java/app/module/core/usecase/role/remove/ports/application/RoleRemoveService.java @@ -2,6 +2,7 @@ package app.module.core.usecase.role.remove.ports.application; import app.module.core.usecase.role.remove.ports.RoleRemovePortIn; import app.module.core.usecase.role.remove.ports.RoleRemovePortOut; +import app.module.core.usecase.role.remove.ports.application.domain.RoleRemoveOutCmd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -13,6 +14,6 @@ public class RoleRemoveService implements RoleRemovePortIn { @Override public void connect(String role) { - roleRemovePortOut.connect(role); + roleRemovePortOut.connect(new RoleRemoveOutCmd(role)); } } diff --git a/core/src/main/java/app/module/core/usecase/role/remove/ports/application/domain/RoleRemoveOutCmd.java b/core/src/main/java/app/module/core/usecase/role/remove/ports/application/domain/RoleRemoveOutCmd.java new file mode 100644 index 00000000..227be737 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/role/remove/ports/application/domain/RoleRemoveOutCmd.java @@ -0,0 +1,13 @@ +package app.module.core.usecase.role.remove.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@AllArgsConstructor +@Getter +@Setter +public class RoleRemoveOutCmd extends AuditCommand { + private String id; +} diff --git a/core/src/main/java/app/module/core/usecase/role/sort/adapters/persistence/RoleSortDao.java b/core/src/main/java/app/module/core/usecase/role/sort/adapters/persistence/RoleSortDao.java index 9aad3bbe..790ee069 100644 --- a/core/src/main/java/app/module/core/usecase/role/sort/adapters/persistence/RoleSortDao.java +++ b/core/src/main/java/app/module/core/usecase/role/sort/adapters/persistence/RoleSortDao.java @@ -1,9 +1,8 @@ package app.module.core.usecase.role.sort.adapters.persistence; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.role.sort.adapters.persistence.model.RoleSortParam; +import app.module.core.config.application.annotation.UpdateCommand; import app.module.core.usecase.role.sort.ports.RoleSortPortOut; -import java.time.LocalDateTime; +import app.module.core.usecase.role.sort.ports.application.domain.RoleSortCommand; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -14,10 +13,8 @@ public class RoleSortDao implements RoleSortPortOut { private final RoleSortMapper mapper; @Override - public void connect(String role, Integer orderNo) { - String userId = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - - mapper.updateOrderNo(new RoleSortParam(role, orderNo, now, userId)); + @UpdateCommand + public void connect(RoleSortCommand outCmd) { + mapper.updateOrderNo(outCmd); } } diff --git a/core/src/main/java/app/module/core/usecase/role/sort/adapters/persistence/RoleSortMapper.java b/core/src/main/java/app/module/core/usecase/role/sort/adapters/persistence/RoleSortMapper.java index 6d6a2bde..47f5dbc4 100644 --- a/core/src/main/java/app/module/core/usecase/role/sort/adapters/persistence/RoleSortMapper.java +++ b/core/src/main/java/app/module/core/usecase/role/sort/adapters/persistence/RoleSortMapper.java @@ -1,10 +1,9 @@ package app.module.core.usecase.role.sort.adapters.persistence; -import app.module.core.usecase.role.sort.adapters.persistence.model.RoleSortParam; +import app.module.core.usecase.role.sort.ports.application.domain.RoleSortCommand; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; @Mapper public interface RoleSortMapper { - void updateOrderNo(RoleSortParam param); + void updateOrderNo(RoleSortCommand outCmd); } diff --git a/core/src/main/java/app/module/core/usecase/role/sort/adapters/persistence/model/RoleSortParam.java b/core/src/main/java/app/module/core/usecase/role/sort/adapters/persistence/model/RoleSortParam.java deleted file mode 100644 index 2ddd202a..00000000 --- a/core/src/main/java/app/module/core/usecase/role/sort/adapters/persistence/model/RoleSortParam.java +++ /dev/null @@ -1,16 +0,0 @@ -package app.module.core.usecase.role.sort.adapters.persistence.model; - -import java.time.LocalDateTime; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@AllArgsConstructor -@Getter -@Setter -public class RoleSortParam { - private String id; - private Integer orderNo; - private LocalDateTime updatedAt; - private String updatedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/role/sort/ports/RoleSortPortIn.java b/core/src/main/java/app/module/core/usecase/role/sort/ports/RoleSortPortIn.java index 0584ad9e..6ba3593e 100644 --- a/core/src/main/java/app/module/core/usecase/role/sort/ports/RoleSortPortIn.java +++ b/core/src/main/java/app/module/core/usecase/role/sort/ports/RoleSortPortIn.java @@ -4,6 +4,5 @@ import app.module.core.usecase.role.sort.ports.application.domain.RoleSortComman import java.util.List; public interface RoleSortPortIn { - void connect(List sortReqs); } diff --git a/core/src/main/java/app/module/core/usecase/role/sort/ports/RoleSortPortOut.java b/core/src/main/java/app/module/core/usecase/role/sort/ports/RoleSortPortOut.java index b4d3b3d9..947086f9 100644 --- a/core/src/main/java/app/module/core/usecase/role/sort/ports/RoleSortPortOut.java +++ b/core/src/main/java/app/module/core/usecase/role/sort/ports/RoleSortPortOut.java @@ -1,6 +1,7 @@ package app.module.core.usecase.role.sort.ports; -public interface RoleSortPortOut { +import app.module.core.usecase.role.sort.ports.application.domain.RoleSortCommand; - void connect(String role, Integer orderNo); +public interface RoleSortPortOut { + void connect(RoleSortCommand outCmd); } diff --git a/core/src/main/java/app/module/core/usecase/role/sort/ports/application/RoleSortService.java b/core/src/main/java/app/module/core/usecase/role/sort/ports/application/RoleSortService.java index 0619125a..478394fb 100644 --- a/core/src/main/java/app/module/core/usecase/role/sort/ports/application/RoleSortService.java +++ b/core/src/main/java/app/module/core/usecase/role/sort/ports/application/RoleSortService.java @@ -18,7 +18,7 @@ public class RoleSortService implements RoleSortPortIn { @Transactional public void connect(List sortReqs) { for (RoleSortCommand sortReq : sortReqs) { - roleSortPortOut.connect(sortReq.getId(), sortReq.getOrderNo()); + roleSortPortOut.connect(new RoleSortCommand(sortReq.getId(), sortReq.getOrderNo())); } } } diff --git a/core/src/main/java/app/module/core/usecase/role/sort/ports/application/domain/RoleSortCommand.java b/core/src/main/java/app/module/core/usecase/role/sort/ports/application/domain/RoleSortCommand.java index 9876db1b..5f93db27 100644 --- a/core/src/main/java/app/module/core/usecase/role/sort/ports/application/domain/RoleSortCommand.java +++ b/core/src/main/java/app/module/core/usecase/role/sort/ports/application/domain/RoleSortCommand.java @@ -1,5 +1,6 @@ package app.module.core.usecase.role.sort.ports.application.domain; +import app.module.core.config.adapters.persistence.component.AuditCommand; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -7,7 +8,7 @@ import lombok.Setter; @AllArgsConstructor @Getter @Setter -public class RoleSortCommand { +public class RoleSortCommand extends AuditCommand { private String id; private Integer orderNo; } diff --git a/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/UICodeRemoveDao.java b/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/UICodeRemoveDao.java index aab07b5b..5ef4033c 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/UICodeRemoveDao.java +++ b/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/UICodeRemoveDao.java @@ -1,9 +1,8 @@ package app.module.core.usecase.uicode.remove.adapters.persistence; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.uicode.remove.adapters.persistence.model.UICodeRemoveParam; +import app.module.core.config.application.annotation.DeleteCommand; import app.module.core.usecase.uicode.remove.ports.UICodeRemovePortOut; -import java.time.LocalDateTime; +import app.module.core.usecase.uicode.remove.ports.application.domain.UICodeRemoveOutCmd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -14,10 +13,8 @@ class UICodeRemoveDao implements UICodeRemovePortOut { private final UICodeRemoveMapper mapper; @Override - public void connect(String id) { - String userId = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - - mapper.deleteById(new UICodeRemoveParam(id, now, userId, now, userId)); + @DeleteCommand + public void connect(UICodeRemoveOutCmd outCmd) { + mapper.deleteById(outCmd); } } diff --git a/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/UICodeRemoveMapper.java b/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/UICodeRemoveMapper.java index 8561acce..c1f2363e 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/UICodeRemoveMapper.java +++ b/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/UICodeRemoveMapper.java @@ -1,9 +1,9 @@ package app.module.core.usecase.uicode.remove.adapters.persistence; -import app.module.core.usecase.uicode.remove.adapters.persistence.model.UICodeRemoveParam; +import app.module.core.usecase.uicode.remove.ports.application.domain.UICodeRemoveOutCmd; import org.apache.ibatis.annotations.Mapper; @Mapper public interface UICodeRemoveMapper { - void deleteById(UICodeRemoveParam param); + void deleteById(UICodeRemoveOutCmd outCmd); } diff --git a/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/model/UICodeRemoveParam.java b/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/model/UICodeRemoveParam.java deleted file mode 100644 index 501942b7..00000000 --- a/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/model/UICodeRemoveParam.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.core.usecase.uicode.remove.adapters.persistence.model; - -import java.time.LocalDateTime; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@AllArgsConstructor -@Getter -@Setter -public class UICodeRemoveParam { - private String id; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/uicode/remove/ports/UICodeRemovePortOut.java b/core/src/main/java/app/module/core/usecase/uicode/remove/ports/UICodeRemovePortOut.java index f02af2b5..79d30066 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/remove/ports/UICodeRemovePortOut.java +++ b/core/src/main/java/app/module/core/usecase/uicode/remove/ports/UICodeRemovePortOut.java @@ -1,6 +1,7 @@ package app.module.core.usecase.uicode.remove.ports; -public interface UICodeRemovePortOut { +import app.module.core.usecase.uicode.remove.ports.application.domain.UICodeRemoveOutCmd; - void connect(String id); +public interface UICodeRemovePortOut { + void connect(UICodeRemoveOutCmd outCmd); } diff --git a/core/src/main/java/app/module/core/usecase/uicode/remove/ports/application/UICodeRemoveService.java b/core/src/main/java/app/module/core/usecase/uicode/remove/ports/application/UICodeRemoveService.java index 13edbf9e..d8b1a2b3 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/remove/ports/application/UICodeRemoveService.java +++ b/core/src/main/java/app/module/core/usecase/uicode/remove/ports/application/UICodeRemoveService.java @@ -2,6 +2,7 @@ package app.module.core.usecase.uicode.remove.ports.application; import app.module.core.usecase.uicode.remove.ports.UICodeRemovePortIn; import app.module.core.usecase.uicode.remove.ports.UICodeRemovePortOut; +import app.module.core.usecase.uicode.remove.ports.application.domain.UICodeRemoveOutCmd; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; @@ -17,6 +18,6 @@ class UICodeRemoveService implements UICodeRemovePortIn { allEntries = true) @Override public void operate(String id) { - uiCodeRemovePortOut.connect(id); + uiCodeRemovePortOut.connect(new UICodeRemoveOutCmd(id)); } } diff --git a/core/src/main/java/app/module/core/usecase/uicode/remove/ports/application/domain/UICodeRemoveOutCmd.java b/core/src/main/java/app/module/core/usecase/uicode/remove/ports/application/domain/UICodeRemoveOutCmd.java new file mode 100644 index 00000000..d2c18522 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/uicode/remove/ports/application/domain/UICodeRemoveOutCmd.java @@ -0,0 +1,14 @@ +package app.module.core.usecase.uicode.remove.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@AllArgsConstructor +@Getter +@Setter +public class UICodeRemoveOutCmd extends AuditCommand { + private String id; +} diff --git a/core/src/main/java/app/module/core/usecase/uicode/save/ports/application/domain/UICodeSaveCommand.java b/core/src/main/java/app/module/core/usecase/uicode/save/ports/application/domain/UICodeSaveCommand.java index b1d157b4..0757649d 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/save/ports/application/domain/UICodeSaveCommand.java +++ b/core/src/main/java/app/module/core/usecase/uicode/save/ports/application/domain/UICodeSaveCommand.java @@ -8,7 +8,6 @@ import lombok.Setter; @Setter @AllArgsConstructor public class UICodeSaveCommand { - private String id; private String parentId; private Integer orderNo; diff --git a/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/persistence/UICodeSortDao.java b/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/persistence/UICodeSortDao.java index 19e8da41..2b848922 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/persistence/UICodeSortDao.java +++ b/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/persistence/UICodeSortDao.java @@ -1,9 +1,8 @@ package app.module.core.usecase.uicode.sort.adapters.persistence; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.uicode.sort.adapters.persistence.model.UICodeSortParam; +import app.module.core.config.application.annotation.UpdateCommand; import app.module.core.usecase.uicode.sort.ports.UICodeSortPortOut; -import java.time.LocalDateTime; +import app.module.core.usecase.uicode.sort.ports.application.domain.UICodeSortCommand; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -14,10 +13,8 @@ class UICodeSortDao implements UICodeSortPortOut { private final UICodeSortMapper mapper; @Override - public void connect(String id, Integer orderNo) { - String userId = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - - mapper.updateOrderNo(new UICodeSortParam(id, orderNo, now, userId)); + @UpdateCommand + public void connect(UICodeSortCommand outCmd) { + mapper.updateOrderNo(outCmd); } } diff --git a/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/persistence/UICodeSortMapper.java b/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/persistence/UICodeSortMapper.java index 8408cd7f..1a8b2df5 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/persistence/UICodeSortMapper.java +++ b/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/persistence/UICodeSortMapper.java @@ -1,9 +1,9 @@ package app.module.core.usecase.uicode.sort.adapters.persistence; -import app.module.core.usecase.uicode.sort.adapters.persistence.model.UICodeSortParam; +import app.module.core.usecase.uicode.sort.ports.application.domain.UICodeSortCommand; import org.apache.ibatis.annotations.Mapper; @Mapper public interface UICodeSortMapper { - void updateOrderNo(UICodeSortParam param); + void updateOrderNo(UICodeSortCommand outCmd); } diff --git a/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/persistence/model/UICodeSortParam.java b/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/persistence/model/UICodeSortParam.java deleted file mode 100644 index 4927e24a..00000000 --- a/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/persistence/model/UICodeSortParam.java +++ /dev/null @@ -1,16 +0,0 @@ -package app.module.core.usecase.uicode.sort.adapters.persistence.model; - -import java.time.LocalDateTime; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@AllArgsConstructor -@Getter -@Setter -public class UICodeSortParam { - private String id; - private Integer orderNo; - private LocalDateTime updatedAt; - private String updatedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/uicode/sort/ports/UICodeSortPortOut.java b/core/src/main/java/app/module/core/usecase/uicode/sort/ports/UICodeSortPortOut.java index 13916752..2988e448 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/sort/ports/UICodeSortPortOut.java +++ b/core/src/main/java/app/module/core/usecase/uicode/sort/ports/UICodeSortPortOut.java @@ -1,6 +1,8 @@ package app.module.core.usecase.uicode.sort.ports; +import app.module.core.usecase.uicode.sort.ports.application.domain.UICodeSortCommand; + public interface UICodeSortPortOut { - void connect(String id, Integer orderNo); + void connect(UICodeSortCommand outCmd); } diff --git a/core/src/main/java/app/module/core/usecase/uicode/sort/ports/application/UICodeSortService.java b/core/src/main/java/app/module/core/usecase/uicode/sort/ports/application/UICodeSortService.java index 9e92d3f8..d8cb94d1 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/sort/ports/application/UICodeSortService.java +++ b/core/src/main/java/app/module/core/usecase/uicode/sort/ports/application/UICodeSortService.java @@ -21,6 +21,6 @@ class UICodeSortService implements UICodeSortPortIn { allEntries = true) @Override public void connect(List sortCommands) { - sortCommands.forEach(item -> uiCodeSortPortOut.connect(item.getId(), item.getOrderNo())); + sortCommands.forEach(item -> uiCodeSortPortOut.connect(new UICodeSortCommand(item.getId(), item.getOrderNo()))); } } diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/RemoveUserPrivilegeDao.java b/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/RemoveUserPrivilegeDao.java index d4436429..a2a221ef 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/RemoveUserPrivilegeDao.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/RemoveUserPrivilegeDao.java @@ -1,10 +1,8 @@ package app.module.core.usecase.userPrivilege.removeUserPrivilege.adapters.persistence; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.userPrivilege.removeUserPrivilege.adapters.persistence.model.RemoveUserPrivilegeParam; +import app.module.core.config.application.annotation.DeleteCommand; import app.module.core.usecase.userPrivilege.removeUserPrivilege.ports.RemoveUserPrivilegePortOut; import app.module.core.usecase.userPrivilege.removeUserPrivilege.ports.application.domain.RemoveUserPrivilegeCmd; -import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -15,11 +13,8 @@ class RemoveUserPrivilegeDao implements RemoveUserPrivilegePortOut { private final RemoveUserPrivilegeMapper mapper; @Override + @DeleteCommand public void operate(RemoveUserPrivilegeCmd cmd) { - String loginUser = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - - mapper.deleteUserPrivilege( - new RemoveUserPrivilegeParam(cmd.getId(), now, loginUser, now, loginUser)); + mapper.deleteUserPrivilege(cmd); } } diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/RemoveUserPrivilegeMapper.java b/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/RemoveUserPrivilegeMapper.java index 7feea6ac..420d9043 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/RemoveUserPrivilegeMapper.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/RemoveUserPrivilegeMapper.java @@ -1,9 +1,9 @@ package app.module.core.usecase.userPrivilege.removeUserPrivilege.adapters.persistence; -import app.module.core.usecase.userPrivilege.removeUserPrivilege.adapters.persistence.model.RemoveUserPrivilegeParam; +import app.module.core.usecase.userPrivilege.removeUserPrivilege.ports.application.domain.RemoveUserPrivilegeCmd; import org.apache.ibatis.annotations.Mapper; @Mapper public interface RemoveUserPrivilegeMapper { - void deleteUserPrivilege(RemoveUserPrivilegeParam param); + void deleteUserPrivilege(RemoveUserPrivilegeCmd cmd); } diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/model/RemoveUserPrivilegeParam.java b/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/model/RemoveUserPrivilegeParam.java deleted file mode 100644 index 05f2d9b2..00000000 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/model/RemoveUserPrivilegeParam.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.core.usecase.userPrivilege.removeUserPrivilege.adapters.persistence.model; - -import java.time.LocalDateTime; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -public class RemoveUserPrivilegeParam { - private String id; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/ports/application/domain/RemoveUserPrivilegeCmd.java b/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/ports/application/domain/RemoveUserPrivilegeCmd.java index 471197cf..357021aa 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/ports/application/domain/RemoveUserPrivilegeCmd.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/ports/application/domain/RemoveUserPrivilegeCmd.java @@ -1,5 +1,6 @@ package app.module.core.usecase.userPrivilege.removeUserPrivilege.ports.application.domain; +import app.module.core.config.adapters.persistence.component.AuditCommand; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -8,8 +9,6 @@ import lombok.Setter; @Getter @Setter @AllArgsConstructor -@EqualsAndHashCode -public class RemoveUserPrivilegeCmd { - +public class RemoveUserPrivilegeCmd extends AuditCommand { private String id; } diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeDao.java b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeDao.java index 28aa3ff7..ec1877c0 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeDao.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeDao.java @@ -1,7 +1,8 @@ package app.module.core.usecase.userPrivilege.sortUserPrivilege.adapters.persistence; +import app.module.core.config.application.util.AuditUtil; import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.privilege.sort.adapters.persistence.model.PrivilegeSortParam; +import app.module.core.usecase.userPrivilege.sortUserPrivilege.adapters.persistence.model.SortUserPrivilegeParam; import app.module.core.usecase.userPrivilege.sortUserPrivilege.ports.SortUserPrivilegePortOut; import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; @@ -15,11 +16,6 @@ class SortUserPrivilegeDao implements SortUserPrivilegePortOut { @Override public void operate(String id, Integer orderNo) { - mapper.updateOrderNo(new PrivilegeSortParam( - id, - orderNo, - LocalDateTime.now(), - CommonUtil.getLoginUsername() - )); + mapper.updateOrderNo(AuditUtil.update(new SortUserPrivilegeParam(id, orderNo))); } } diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeMapper.java b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeMapper.java index d4f0b0a6..c2dcf80a 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeMapper.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeMapper.java @@ -1,9 +1,9 @@ package app.module.core.usecase.userPrivilege.sortUserPrivilege.adapters.persistence; -import app.module.core.usecase.privilege.sort.adapters.persistence.model.PrivilegeSortParam; +import app.module.core.usecase.userPrivilege.sortUserPrivilege.adapters.persistence.model.SortUserPrivilegeParam; import org.apache.ibatis.annotations.Mapper; @Mapper public interface SortUserPrivilegeMapper { - void updateOrderNo(PrivilegeSortParam param); + void updateOrderNo(SortUserPrivilegeParam param); } diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeRepo.java b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeRepo.java deleted file mode 100644 index 3219f137..00000000 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeRepo.java +++ /dev/null @@ -1,12 +0,0 @@ -package app.module.core.usecase.userPrivilege.sortUserPrivilege.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.Privilege; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface SortUserPrivilegeRepo { - -// @Query("update Privilege e set e.orderNo = :orderNo where e.id = :role") - void updateOrderNo(@Param("role") String role, @Param("orderNo") Integer orderNo); -} diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/model/SortUserPrivilegeParam.java b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/model/SortUserPrivilegeParam.java index abd97379..e3165214 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/model/SortUserPrivilegeParam.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/model/SortUserPrivilegeParam.java @@ -1,5 +1,6 @@ package app.module.core.usecase.userPrivilege.sortUserPrivilege.adapters.persistence.model; +import app.module.core.config.adapters.persistence.component.AuditCommand; import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; @@ -8,9 +9,7 @@ import lombok.Setter; @Getter @Setter @AllArgsConstructor -public class SortUserPrivilegeParam { +public class SortUserPrivilegeParam extends AuditCommand { private String id; private Integer orderNo; - private LocalDateTime updatedAt; - private String updatedBy; } diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/SortUserPrivilegePortIn.java b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/SortUserPrivilegePortIn.java index 2951374a..71798730 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/SortUserPrivilegePortIn.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/SortUserPrivilegePortIn.java @@ -3,6 +3,5 @@ package app.module.core.usecase.userPrivilege.sortUserPrivilege.ports; import app.module.core.usecase.userPrivilege.sortUserPrivilege.ports.application.domain.SortUserPrivilegeCmd; public interface SortUserPrivilegePortIn { - void operate(SortUserPrivilegeCmd cmd); } \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/SortUserPrivilegePortOut.java b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/SortUserPrivilegePortOut.java index a84c36ff..89683e65 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/SortUserPrivilegePortOut.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/SortUserPrivilegePortOut.java @@ -1,6 +1,5 @@ package app.module.core.usecase.userPrivilege.sortUserPrivilege.ports; public interface SortUserPrivilegePortOut { - void operate(String id, Integer orderNo); } \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/domain/SortUserPrivilegeCmd.java b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/domain/SortUserPrivilegeCmd.java index a820a75d..bc4c58b9 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/domain/SortUserPrivilegeCmd.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/domain/SortUserPrivilegeCmd.java @@ -11,6 +11,5 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class SortUserPrivilegeCmd { - private List sortPrivileges; } diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/domain/SortUserPrivilegeDTO.java b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/domain/SortUserPrivilegeDTO.java index a6c6dcff..eb46a763 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/domain/SortUserPrivilegeDTO.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/domain/SortUserPrivilegeDTO.java @@ -10,7 +10,6 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class SortUserPrivilegeDTO { - private String id; private Integer orderNo; } diff --git a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/RemoveUserRoleDao.java b/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/RemoveUserRoleDao.java index 22bd25d9..faf8bba7 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/RemoveUserRoleDao.java +++ b/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/RemoveUserRoleDao.java @@ -1,10 +1,8 @@ package app.module.core.usecase.userRole.removeUserRole.adapters.persistence; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.userRole.removeUserRole.adapters.persistence.model.RemoveUserRoleParam; +import app.module.core.config.application.annotation.DeleteCommand; import app.module.core.usecase.userRole.removeUserRole.ports.RemoveUserRolePortOut; import app.module.core.usecase.userRole.removeUserRole.ports.application.domain.RemoveUserRoleCmd; -import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -15,14 +13,10 @@ class RemoveUserRoleDao implements RemoveUserRolePortOut { private final RemoveUserRoleMapper mapper; @Override + @DeleteCommand public void operate(RemoveUserRoleCmd cmd) { - String loginUser = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - RemoveUserRoleParam param = - new RemoveUserRoleParam(cmd.getId(), now, loginUser, now, loginUser); - - mapper.deleteFrontUserHasRole(param); - mapper.deleteRoleHasPrivilege(param); - mapper.deleteRole(param); + mapper.deleteFrontUserHasRole(cmd); + mapper.deleteRoleHasPrivilege(cmd); + mapper.deleteRole(cmd); } } diff --git a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/RemoveUserRoleMapper.java b/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/RemoveUserRoleMapper.java index 7ea6a481..ea689646 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/RemoveUserRoleMapper.java +++ b/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/RemoveUserRoleMapper.java @@ -1,11 +1,11 @@ package app.module.core.usecase.userRole.removeUserRole.adapters.persistence; -import app.module.core.usecase.userRole.removeUserRole.adapters.persistence.model.RemoveUserRoleParam; +import app.module.core.usecase.userRole.removeUserRole.ports.application.domain.RemoveUserRoleCmd; import org.apache.ibatis.annotations.Mapper; @Mapper public interface RemoveUserRoleMapper { - void deleteRole(RemoveUserRoleParam param); - void deleteRoleHasPrivilege(RemoveUserRoleParam param); - void deleteFrontUserHasRole(RemoveUserRoleParam param); + void deleteRole(RemoveUserRoleCmd cmd); + void deleteRoleHasPrivilege(RemoveUserRoleCmd cmd); + void deleteFrontUserHasRole(RemoveUserRoleCmd cmd); } diff --git a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/model/RemoveUserRoleParam.java b/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/model/RemoveUserRoleParam.java deleted file mode 100644 index b80bccf9..00000000 --- a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/model/RemoveUserRoleParam.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.core.usecase.userRole.removeUserRole.adapters.persistence.model; - -import java.time.LocalDateTime; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -public class RemoveUserRoleParam { - private String id; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/ports/application/domain/RemoveUserRoleCmd.java b/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/ports/application/domain/RemoveUserRoleCmd.java index 104433dd..3d1bd918 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/ports/application/domain/RemoveUserRoleCmd.java +++ b/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/ports/application/domain/RemoveUserRoleCmd.java @@ -1,5 +1,6 @@ package app.module.core.usecase.userRole.removeUserRole.ports.application.domain; +import app.module.core.config.adapters.persistence.component.AuditCommand; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -8,8 +9,6 @@ import lombok.Setter; @Getter @Setter @AllArgsConstructor -@EqualsAndHashCode -public class RemoveUserRoleCmd { - +public class RemoveUserRoleCmd extends AuditCommand { private String id; } diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java index 264a904d..b882fce0 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java @@ -2,6 +2,7 @@ package app.module.core.usecase.userRole.saveUserRole.adapters.persistence; import app.module.core.config.adapters.persistence.entity.Role; import app.module.core.config.application.enums.AppType; +import app.module.core.config.application.util.AuditUtil; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.role.view.adapters.persistence.RoleViewMapper; import app.module.core.usecase.role.view.adapters.persistence.model.RoleViewDto; @@ -27,8 +28,6 @@ class SaveUserRoleDao implements SaveUserRolePortOut { @Override @Transactional public Optional operate(SaveUserRoleCmd cmd) { - String loginUser = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); Optional existedRole = viewMapper.findRoleById(cmd.getId()); @@ -40,9 +39,7 @@ class SaveUserRoleDao implements SaveUserRolePortOut { Role role = new Role(cmd.getId(), cmd.getDescription(), AppType.FRONT, orderNo); // 권한 삭제 - mapper.deleteAllRoleHasPrivileges( - new RoleHasPrivilegeDeleteParam(cmd.getId(), now, loginUser, now, loginUser) - ); + mapper.deleteAllRoleHasPrivileges(AuditUtil.delete(new RoleHasPrivilegeDeleteParam(cmd.getId()))); if (existedRole.isPresent()) { mapper.updateRole(role); @@ -52,9 +49,8 @@ class SaveUserRoleDao implements SaveUserRolePortOut { // 권한 insert if (CollectionUtils.isNotEmpty(cmd.getPrivilegeIds())) { - mapper.insertRoleHasPrivileges(new RoleHasPrivilegeSaveParam( - role.getId(), cmd.getPrivilegeIds(), now, loginUser, now, loginUser - )); + mapper.insertRoleHasPrivileges(AuditUtil.create( + new RoleHasPrivilegeSaveParam(role.getId(), cmd.getPrivilegeIds()))); } return Optional.of(new SaveUserRole( diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java index b795b7bb..a4f6d756 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java @@ -1,15 +1,12 @@ package app.module.core.usecase.userRole.saveUserRole.adapters.persistence.model; +import app.module.core.config.adapters.persistence.component.AuditCommand; import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor -public class RoleHasPrivilegeDeleteParam { +public class RoleHasPrivilegeDeleteParam extends AuditCommand { private String roleId; - private LocalDateTime deletedAt; - private String deletedBy; - private LocalDateTime updatedAt; - private String updatedBy; } diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeSaveParam.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeSaveParam.java index 7513529d..f8b2b522 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeSaveParam.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeSaveParam.java @@ -1,5 +1,6 @@ package app.module.core.usecase.userRole.saveUserRole.adapters.persistence.model; +import app.module.core.config.adapters.persistence.component.AuditCommand; import java.time.LocalDateTime; import java.util.List; import lombok.AllArgsConstructor; @@ -7,11 +8,7 @@ import lombok.Getter; @Getter @AllArgsConstructor -public class RoleHasPrivilegeSaveParam { +public class RoleHasPrivilegeSaveParam extends AuditCommand { private String roleId; private List privilegeIds; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; } diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/domain/SaveUserRole.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/domain/SaveUserRole.java index e8bd3a00..f763b136 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/domain/SaveUserRole.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/domain/SaveUserRole.java @@ -10,6 +10,5 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class SaveUserRole { - private String id; } diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/domain/SaveUserRoleCmd.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/domain/SaveUserRoleCmd.java index 353fe3c9..b5835e52 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/domain/SaveUserRoleCmd.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/domain/SaveUserRoleCmd.java @@ -11,7 +11,6 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class SaveUserRoleCmd { - private String id; private String description; private Integer orderNo; diff --git a/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/SortUserRoleDao.java b/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/SortUserRoleDao.java index cbd81da2..f9f6b0fc 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/SortUserRoleDao.java +++ b/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/SortUserRoleDao.java @@ -1,6 +1,7 @@ package app.module.core.usecase.userRole.sortUserRole.adapters.persistence; import app.module.core.config.application.enums.AppType; +import app.module.core.config.application.util.AuditUtil; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.userRole.sortUserRole.adapters.persistence.model.SortUserRoleParam; import app.module.core.usecase.userRole.sortUserRole.ports.SortUserRolePortOut; @@ -16,8 +17,6 @@ class SortUserRoleDao implements SortUserRolePortOut { @Override public void operate(String id, Integer orderNo) { - mapper.updateOrderNo( - new SortUserRoleParam( - id, AppType.FRONT, orderNo, LocalDateTime.now(), CommonUtil.getLoginUsername())); + mapper.updateOrderNo(AuditUtil.update(new SortUserRoleParam(id, AppType.FRONT, orderNo))); } } diff --git a/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/model/SortUserRoleParam.java b/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/model/SortUserRoleParam.java index f8c59148..bd692ef1 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/model/SortUserRoleParam.java +++ b/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/model/SortUserRoleParam.java @@ -1,7 +1,7 @@ package app.module.core.usecase.userRole.sortUserRole.adapters.persistence.model; +import app.module.core.config.adapters.persistence.component.AuditCommand; import app.module.core.config.application.enums.AppType; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -9,10 +9,8 @@ import lombok.Setter; @Getter @Setter @AllArgsConstructor -public class SortUserRoleParam { +public class SortUserRoleParam extends AuditCommand { private String id; private AppType appType; private Integer orderNo; - private LocalDateTime updatedAt; - private String updatedBy; }