diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditCommand.java b/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditCommand.java
new file mode 100644
index 00000000..1b15c25f
--- /dev/null
+++ b/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditCommand.java
@@ -0,0 +1,36 @@
+package app.module.core.config.adapters.persistence.component;
+
+import app.module.core.config.application.util.CommonUtil;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AuditCommand {
+ private LocalDateTime createdAt;
+ private String createdBy;
+ private LocalDateTime updatedAt;
+ private String updatedBy;
+ private LocalDateTime deletedAt;
+ private String deletedBy;
+
+ public void create() {
+ this.createdAt = LocalDateTime.now();
+ this.createdBy = CommonUtil.getLoginUsername();
+ this.updatedAt = LocalDateTime.now();
+ this.updatedBy = CommonUtil.getLoginUsername();
+ }
+
+ public void update() {
+ this.updatedAt = LocalDateTime.now();
+ this.updatedBy = CommonUtil.getLoginUsername();
+ }
+
+ public void delete() {
+ this.updatedAt = LocalDateTime.now();
+ this.updatedBy = CommonUtil.getLoginUsername();
+ this.deletedAt = LocalDateTime.now();
+ this.deletedBy = CommonUtil.getLoginUsername();
+ }
+}
diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java
index 5298d340..451785bb 100644
--- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java
+++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java
@@ -15,11 +15,11 @@ public class Household extends AuditEntity {
private Long id;
- private String household_num;
+ private String householdNum;
- private String owner_name;
+ private String ownerName;
- private Integer owner_age;
+ private Integer ownerAge;
private String tel;
@@ -27,27 +27,25 @@ public class Household extends AuditEntity {
private String password;
- private String zipcode;
-
private String region;
private String city;
- private String address_detail;
+ private String addressDetail;
- private Integer industry_large_code;
+ private Integer industryLargeCode;
- private Integer industry_middle_code;
+ private Integer industryMiddleCode;
- private Integer industry_small_code;
+ private Integer industrySmallCode;
- private Integer scale_code;
+ private Integer scaleCode;
- private Integer employment_code;
+ private Integer employmentCode;
- private Boolean is_panel;
+ private Boolean isPanel;
private String memo;
- private String drop_reason;
+ private String dropReason;
}
diff --git a/core/src/main/java/app/module/core/config/application/annotation/CreateCommand.java b/core/src/main/java/app/module/core/config/application/annotation/CreateCommand.java
new file mode 100644
index 00000000..418ccd92
--- /dev/null
+++ b/core/src/main/java/app/module/core/config/application/annotation/CreateCommand.java
@@ -0,0 +1,12 @@
+package app.module.core.config.application.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface CreateCommand {
+
+}
diff --git a/core/src/main/java/app/module/core/config/application/annotation/DeleteCommand.java b/core/src/main/java/app/module/core/config/application/annotation/DeleteCommand.java
new file mode 100644
index 00000000..a226a613
--- /dev/null
+++ b/core/src/main/java/app/module/core/config/application/annotation/DeleteCommand.java
@@ -0,0 +1,10 @@
+package app.module.core.config.application.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DeleteCommand {}
diff --git a/core/src/main/java/app/module/core/config/application/annotation/UpdateCommand.java b/core/src/main/java/app/module/core/config/application/annotation/UpdateCommand.java
new file mode 100644
index 00000000..01018eba
--- /dev/null
+++ b/core/src/main/java/app/module/core/config/application/annotation/UpdateCommand.java
@@ -0,0 +1,10 @@
+package app.module.core.config.application.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UpdateCommand {}
diff --git a/core/src/main/java/app/module/core/config/application/aop/AuditCommandAspect.java b/core/src/main/java/app/module/core/config/application/aop/AuditCommandAspect.java
new file mode 100644
index 00000000..0e975480
--- /dev/null
+++ b/core/src/main/java/app/module/core/config/application/aop/AuditCommandAspect.java
@@ -0,0 +1,38 @@
+package app.module.core.config.application.aop;
+
+import app.module.core.config.adapters.persistence.component.AuditCommand;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
+
+@Aspect
+@Component
+public class AuditCommandAspect {
+ @Before("@annotation(app.module.core.config.application.annotation.CreateCommand)")
+ public void applyCreateAudit(JoinPoint joinPoint) {
+ inject(joinPoint, "create");
+ }
+
+ @Before("@annotation(app.module.core.config.application.annotation.UpdateCommand)")
+ public void applyUpdateAudit(JoinPoint joinPoint) {
+ inject(joinPoint, "update");
+ }
+
+ @Before("@annotation(app.module.core.config.application.annotation.DeleteCommand)")
+ public void applyDeleteAudit(JoinPoint joinPoint) {
+ inject(joinPoint, "delete");
+ }
+
+ private void inject(JoinPoint joinPoint, String type) {
+ for (Object arg : joinPoint.getArgs()) {
+ if (arg instanceof AuditCommand audit) {
+ switch (type) {
+ case "create" -> audit.create();
+ case "update" -> audit.update();
+ case "delete" -> audit.delete();
+ }
+ }
+ }
+ }
+}
diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/adapters/persistence/GetHouseholdMapper.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/adapters/persistence/GetHouseholdMapper.java
index d6756fdc..715f4237 100644
--- a/core/src/main/java/app/module/core/usecase/household/getHousehold/adapters/persistence/GetHouseholdMapper.java
+++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/adapters/persistence/GetHouseholdMapper.java
@@ -2,7 +2,6 @@ package app.module.core.usecase.household.getHousehold.adapters.persistence;
import app.module.core.config.adapters.web.security.domain.CoreRole;
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold;
-import java.util.List;
import java.util.Optional;
import java.util.Set;
import org.apache.ibatis.annotations.Mapper;
diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java
index a1127730..d850d1ad 100644
--- a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java
+++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java
@@ -22,7 +22,6 @@ public class GetHousehold {
private String tel;
private String phone;
private String password;
- private String zipcode;
private String region;
private String city;
private String addressDetail;
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
new file mode 100644
index 00000000..85297172
--- /dev/null
+++ b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/adapters/persistence/UpdateFrontHouseholdDao.java
@@ -0,0 +1,17 @@
+package app.module.core.usecase.household.updateFrontHousehold.adapters.persistence;
+
+import lombok.RequiredArgsConstructor;
+import app.module.core.usecase.household.updateFrontHousehold.ports.application.domain.UpdateFrontHouseholdCmd;
+import app.module.core.usecase.household.updateFrontHousehold.ports.UpdateFrontHouseholdPortOut;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+class UpdateFrontHouseholdDao implements UpdateFrontHouseholdPortOut {
+ private final UpdateFrontHouseholdMapper mapper;
+
+ @Override
+ public void operate(UpdateFrontHouseholdCmd cmd) {
+ mapper.update(cmd);
+ }
+}
\ No newline at end of file
diff --git a/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/adapters/persistence/UpdateFrontHouseholdMapper.java b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/adapters/persistence/UpdateFrontHouseholdMapper.java
new file mode 100644
index 00000000..6da10592
--- /dev/null
+++ b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/adapters/persistence/UpdateFrontHouseholdMapper.java
@@ -0,0 +1,9 @@
+package app.module.core.usecase.household.updateFrontHousehold.adapters.persistence;
+
+import app.module.core.usecase.household.updateFrontHousehold.ports.application.domain.UpdateFrontHouseholdCmd;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UpdateFrontHouseholdMapper {
+ void update(UpdateFrontHouseholdCmd cmd);
+}
diff --git a/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/UpdateFrontHouseholdPortIn.java b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/UpdateFrontHouseholdPortIn.java
new file mode 100644
index 00000000..021b44f6
--- /dev/null
+++ b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/UpdateFrontHouseholdPortIn.java
@@ -0,0 +1,7 @@
+package app.module.core.usecase.household.updateFrontHousehold.ports;
+
+import app.module.core.usecase.household.updateFrontHousehold.ports.application.domain.UpdateFrontHouseholdCmd;
+
+public interface UpdateFrontHouseholdPortIn {
+ void operate(UpdateFrontHouseholdCmd cmd);
+}
\ No newline at end of file
diff --git a/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/UpdateFrontHouseholdPortOut.java b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/UpdateFrontHouseholdPortOut.java
new file mode 100644
index 00000000..2998b340
--- /dev/null
+++ b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/UpdateFrontHouseholdPortOut.java
@@ -0,0 +1,7 @@
+package app.module.core.usecase.household.updateFrontHousehold.ports;
+
+import app.module.core.usecase.household.updateFrontHousehold.ports.application.domain.UpdateFrontHouseholdCmd;
+
+public interface UpdateFrontHouseholdPortOut {
+ void operate(UpdateFrontHouseholdCmd cmd);
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..2f12b79e
--- /dev/null
+++ b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/UpdateFrontHouseholdService.java
@@ -0,0 +1,18 @@
+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 org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+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/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java
new file mode 100644
index 00000000..236d7d30
--- /dev/null
+++ b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java
@@ -0,0 +1,24 @@
+package app.module.core.usecase.household.updateFrontHousehold.ports.application.domain;
+
+import app.module.core.config.adapters.persistence.component.AuditCommand;
+import app.module.core.config.application.util.CommonUtil;
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class UpdateFrontHouseholdCmd extends AuditCommand {
+ private Long id;
+ private String householdNum;
+ private String ownerName;
+ private Integer ownerAge;
+ private String tel;
+ private String phone;
+ private String region;
+ private String city;
+ private String addressDetail;
+}
diff --git a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml
index 44064b21..67554599 100644
--- a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml
+++ b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml
@@ -14,7 +14,6 @@
tel,
phone,
password,
- zipcode,
region,
city,
address_detail,
@@ -54,7 +53,7 @@
JOIN role r ON hhr.role_id = r.id AND r.is_deleted = false
LEFT JOIN role_has_privilege rhp ON r.id = rhp.role_id AND rhp.is_deleted = false
LEFT JOIN privilege p ON rhp.privilege_id = p.id AND p.is_deleted = false
- WHERE hhr.id = #{id}
+ WHERE hhr.household_id = #{id}
AND hhr.is_deleted = false
\ No newline at end of file
diff --git a/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml b/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml
new file mode 100644
index 00000000..d55225bf
--- /dev/null
+++ b/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml
@@ -0,0 +1,21 @@
+
+
+
- 로그인 사용자명 + 로그인 사용자명 [로그아웃] [정보수정]
diff --git a/front/src/main/resources/templates/user/info.html b/front/src/main/resources/templates/user/info.html index b71b44eb..9f0b8a80 100644 --- a/front/src/main/resources/templates/user/info.html +++ b/front/src/main/resources/templates/user/info.html @@ -35,48 +35,47 @@ method="get" name="reqForm" th:action="@{/user/info}" th:object="${userInfo}"> +