readme 업데이트, AuditCommand 상속 받도록 수정 작업 중 ..
This commit is contained in:
89
README.md
89
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 작성 시 공통필드의 반복 작성을 피하기 위해 `<sql>` 태그로 분리하여 `<include>` 방식으로 재사용합니다.
|
||||
자세한 정의는 `CommonFieldsMapper.xml` 파일에서 확인할 수 있습니다.
|
||||
|
||||
| SQL ID | 설명 | 사용 예시 |
|
||||
| ---------------------------- | -------------------------------------- | -------------------------------------------------------------- |
|
||||
| `CreateUpdateBaseColumns` | `INSERT` 시 공통 컬럼 정의 | `<include refid="common.fields.CreateUpdateBaseColumns" />` |
|
||||
| `CreateUpdateBaseValues` | `INSERT` 시 공통 컬럼의 값 정의 | `<include refid="common.fields.CreateUpdateBaseValues" />` |
|
||||
| `CreateUpdateListBaseValues` | `다건 INSERT` 시 공통 값 정의 (e.g. `foreach`) | `<include refid="common.fields.CreateUpdateListBaseValues" />` |
|
||||
| `UpdateBaseSet` | `UPDATE` 시 공통 `SET` 구문 | `<include refid="common.fields.UpdateBaseSet" />` |
|
||||
| `DeleteBaseSet` | `삭제 처리용 UPDATE` 시 공통 `SET` 구문 | `<include refid="common.fields.DeleteBaseSet" />` |
|
||||
|
||||
#### include 사용 예시
|
||||
```xml
|
||||
UPDATE household
|
||||
SET
|
||||
owner_name = #{ownerName},
|
||||
owner_age = #{ownerAge},
|
||||
tel = #{tel},
|
||||
phone = #{phone},
|
||||
region = #{region},
|
||||
city = #{city},
|
||||
address_detail = #{addressDetail},
|
||||
<include refid="common.fields.UpdateBaseSet" /> <!-- 공통 필드 include -->
|
||||
WHERE seq = ${seq}
|
||||
```
|
||||
|
||||
|
||||
## PACKAGING
|
||||
|
||||
배포방식 설정을 위해 두가지 maven 프로파일을 제공한다.
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
th:action="${'/settings/admins/update/' + bindingVO.id}"
|
||||
th:object="${bindingVO}">
|
||||
|
||||
<input type="hidden" name="seq" th:field="*{seq}"/>
|
||||
|
||||
<div class="row mb-3">
|
||||
<label class="col-sm-2 col-form-label" for="id">ID *</label>
|
||||
<div class="col-sm-4">
|
||||
@@ -20,7 +22,8 @@
|
||||
<div class="row mb-3">
|
||||
<label class="col-sm-2 col-form-label" for="password">Password *</label>
|
||||
<div class="col-sm-4">
|
||||
<input class="form-control" placeholder="암호를 변경하고 싶다면 입력하세요" th:classappend="${#fields.hasErrors('updatePassword')} ? 'is-invalid'"
|
||||
<input class="form-control" id="password" placeholder="암호를 변경하고 싶다면 입력하세요"
|
||||
th:classappend="${#fields.hasErrors('updatePassword')} ? 'is-invalid'"
|
||||
th:field="*{updatePassword}"
|
||||
type="password"/>
|
||||
<div class="invalid-feedback fw-bold" th:errors="*{updatePassword}"
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
package app.module.core.usecase.admin.removeAdmin.adapters.persistence;
|
||||
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.config.application.util.AuditUtil;
|
||||
import app.module.core.usecase.admin.removeAdmin.adapters.persistence.model.RemoveAdminParam;
|
||||
import app.module.core.usecase.admin.removeAdmin.ports.RemoveAdminPortOut;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
@@ -16,10 +15,7 @@ class RemoveAdminDao implements RemoveAdminPortOut {
|
||||
|
||||
@Override
|
||||
public void connect(List<String> 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);
|
||||
|
||||
@@ -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<String> ids;
|
||||
private LocalDateTime updatedAt;
|
||||
private String updatedBy;
|
||||
private LocalDateTime deletedAt;
|
||||
private String deletedBy;
|
||||
}
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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); }
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
package app.module.core.usecase.privilege.remove.ports;
|
||||
|
||||
public interface PrivilegeRemovePortIn {
|
||||
|
||||
void connect(String id);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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<PrivilegeSortCmd> sortReqs);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ public class PrivilegeSortService implements PrivilegeSortPortIn {
|
||||
@Transactional
|
||||
public void connect(List<PrivilegeSortCmd> sortReqs) {
|
||||
for (PrivilegeSortCmd sortInput : sortReqs) {
|
||||
portOut.connect(sortInput.getId(), sortInput.getOrderNo());
|
||||
portOut.connect(new PrivilegeSortCmd(sortInput.getId(), sortInput.getOrderNo()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
package app.module.core.usecase.role.remove.ports;
|
||||
|
||||
public interface RoleRemovePortIn {
|
||||
|
||||
void connect(String role);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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<RoleSortCommand> sortReqs);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ public class RoleSortService implements RoleSortPortIn {
|
||||
@Transactional
|
||||
public void connect(List<RoleSortCommand> sortReqs) {
|
||||
for (RoleSortCommand sortReq : sortReqs) {
|
||||
roleSortPortOut.connect(sortReq.getId(), sortReq.getOrderNo());
|
||||
roleSortPortOut.connect(new RoleSortCommand(sortReq.getId(), sortReq.getOrderNo()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -8,7 +8,6 @@ import lombok.Setter;
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class UICodeSaveCommand {
|
||||
|
||||
private String id;
|
||||
private String parentId;
|
||||
private Integer orderNo;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -21,6 +21,6 @@ class UICodeSortService implements UICodeSortPortIn {
|
||||
allEntries = true)
|
||||
@Override
|
||||
public void connect(List<UICodeSortCommand> sortCommands) {
|
||||
sortCommands.forEach(item -> uiCodeSortPortOut.connect(item.getId(), item.getOrderNo()));
|
||||
sortCommands.forEach(item -> uiCodeSortPortOut.connect(new UICodeSortCommand(item.getId(), item.getOrderNo())));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
package app.module.core.usecase.userPrivilege.sortUserPrivilege.ports;
|
||||
|
||||
public interface SortUserPrivilegePortOut {
|
||||
|
||||
void operate(String id, Integer orderNo);
|
||||
}
|
||||
@@ -11,6 +11,5 @@ import lombok.Setter;
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class SortUserPrivilegeCmd {
|
||||
|
||||
private List<SortUserPrivilegeDTO> sortPrivileges;
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@ import lombok.Setter;
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class SortUserPrivilegeDTO {
|
||||
|
||||
private String id;
|
||||
private Integer orderNo;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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<SaveUserRole> operate(SaveUserRoleCmd cmd) {
|
||||
String loginUser = CommonUtil.getLoginUsername();
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
|
||||
Optional<RoleViewDto> 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(
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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<String> privilegeIds;
|
||||
private LocalDateTime createdAt;
|
||||
private String createdBy;
|
||||
private LocalDateTime updatedAt;
|
||||
private String updatedBy;
|
||||
}
|
||||
|
||||
@@ -10,6 +10,5 @@ import lombok.Setter;
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class SaveUserRole {
|
||||
|
||||
private String id;
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@ import lombok.Setter;
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class SaveUserRoleCmd {
|
||||
|
||||
private String id;
|
||||
private String description;
|
||||
private Integer orderNo;
|
||||
|
||||
@@ -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)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user