From a4c2a38dd2920b5a03e13485bcdaddacd474f86c Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Thu, 29 May 2025 15:27:37 +0900 Subject: [PATCH] =?UTF-8?q?front=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=20=EC=A4=91=20(2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/component/AuditCommand.java | 36 +++++++++ .../persistence/entity/Household.java | 24 +++--- .../application/annotation/CreateCommand.java | 12 +++ .../application/annotation/DeleteCommand.java | 10 +++ .../application/annotation/UpdateCommand.java | 10 +++ .../application/aop/AuditCommandAspect.java | 38 +++++++++ .../persistence/GetHouseholdMapper.java | 1 - .../application/domain/GetHousehold.java | 1 - .../persistence/UpdateFrontHouseholdDao.java | 17 ++++ .../UpdateFrontHouseholdMapper.java | 9 +++ .../ports/UpdateFrontHouseholdPortIn.java | 7 ++ .../ports/UpdateFrontHouseholdPortOut.java | 7 ++ .../UpdateFrontHouseholdService.java | 18 +++++ .../domain/UpdateFrontHouseholdCmd.java | 24 ++++++ .../mappers/household/GetHouseholdMapper.xml | 3 +- .../household/UpdateFrontHouseholdMapper.xml | 21 +++++ .../security/FrontDetailService.java | 25 ++---- .../security/FrontHouseholdUser.java | 32 ++++++++ .../security/FrontSecurityConfig.java | 5 +- .../web/UpdateFrontHouseholdController.java | 42 ++++++++++ .../web/model/UpdateFrontHouseholdReqVO.java | 22 ++++++ .../web/model/UpdateFrontHouseholdResVO.java | 13 ++++ .../adapters/web/UpdateUserUIController.java | 6 +- .../templates/common/components.html | 2 +- .../main/resources/templates/user/info.html | 78 ++++++++----------- 25 files changed, 378 insertions(+), 85 deletions(-) create mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/component/AuditCommand.java create mode 100644 core/src/main/java/app/module/core/config/application/annotation/CreateCommand.java create mode 100644 core/src/main/java/app/module/core/config/application/annotation/DeleteCommand.java create mode 100644 core/src/main/java/app/module/core/config/application/annotation/UpdateCommand.java create mode 100644 core/src/main/java/app/module/core/config/application/aop/AuditCommandAspect.java create mode 100644 core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/adapters/persistence/UpdateFrontHouseholdDao.java create mode 100644 core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/adapters/persistence/UpdateFrontHouseholdMapper.java create mode 100644 core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/UpdateFrontHouseholdPortIn.java create mode 100644 core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/UpdateFrontHouseholdPortOut.java create mode 100644 core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/UpdateFrontHouseholdService.java create mode 100644 core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java create mode 100644 core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml create mode 100644 front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java create mode 100644 front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/UpdateFrontHouseholdController.java create mode 100644 front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdReqVO.java create mode 100644 front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdResVO.java 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 @@ + + + + + + UPDATE household + SET + owner_name = #{ownerName}, + owner_age = #{ownerAge}, + tel = #{tel}, + phone = #{phone}, + region = #{region}, + city = #{city}, + address_detail = #{addressDetail}, + + WHERE id = ${id} + + + \ No newline at end of file diff --git a/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java b/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java index 6490ce5d..0d6b906e 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java @@ -27,7 +27,6 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class FrontDetailService implements UserDetailsService { - private final FindUserPortIn findUserPortIn; private final GetHouseholdPortIn getHouseholdPortIn; @Value("${app.front.password.validity.period.days}") private long passwordValidPeriodDays; @@ -40,24 +39,16 @@ public class FrontDetailService implements UserDetailsService { .operate(new GetHouseholdCmd(username)) .orElseThrow(() -> new UsernameNotFoundException("Invalid username or password.")); - FindUser findUser = - findUserPortIn - .operate(new FindUserCmd(username)) - .orElseThrow(() -> new UsernameNotFoundException("Invalid username or password.")); - - boolean accountLocked = Optional.ofNullable(findUser.getAccountLocked()).orElse(false); - boolean accountDisabled = Optional.ofNullable(findUser.getAccountDisabled()).orElse(false); - - return new FrontUser( - findUser.getId(), - findUser.getPassword(), - !accountDisabled, + return new FrontHouseholdUser( + getHousehold.getHouseholdNum(), + getHousehold.getPassword(), true, true, - !accountLocked, - getAuthorities(findUser.getRoles()), - findUser.getNickname(), - passwordValidPeriodDays - getDaysPassedFrom(findUser.getPasswordUpdatedAt())); + true, + true, + getAuthorities(getHousehold.getRoles()), + getHousehold.getOwnerName() + ); } /** diff --git a/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java b/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java new file mode 100644 index 00000000..4937504d --- /dev/null +++ b/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java @@ -0,0 +1,32 @@ +package app.module.front.config.application.security; + +import java.util.Collection; +import lombok.Getter; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.User; + +@Getter +public class FrontHouseholdUser extends User { + + private String ownerName; + + public FrontHouseholdUser( + String householdNum, + String password, + boolean enabled, + boolean accountNonExpired, + boolean credentialsNonExpired, + boolean accountNonLocked, + Collection authorities, + String ownerName) { + super( + householdNum, + password, + enabled, + accountNonExpired, + credentialsNonExpired, + accountNonLocked, + authorities); + this.ownerName = ownerName; + } +} diff --git a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java index 3100bc83..a02af3a6 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java @@ -91,7 +91,10 @@ public class FrontSecurityConfig { .rememberMe( remMe -> remMe - .tokenValiditySeconds(1209600) + // 자동 로그인 영구 유지 (로그아웃 시까지 유지) + // Integer.MAX_VALUE ≒ 68년 유효 + // 단, 쿠키 삭제되면 무효됨 + .tokenValiditySeconds(Integer.MAX_VALUE) .userDetailsService(frontDetailService) .tokenRepository(persistentTokenRepository())) .logout( diff --git a/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/UpdateFrontHouseholdController.java b/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/UpdateFrontHouseholdController.java new file mode 100644 index 00000000..4bac7493 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/UpdateFrontHouseholdController.java @@ -0,0 +1,42 @@ +package app.module.front.usecase.household.updateFrontHousehold.adapters.web; + +import app.module.core.usecase.household.updateFrontHousehold.ports.UpdateFrontHouseholdPortIn; +import app.module.core.usecase.household.updateFrontHousehold.ports.application.domain.UpdateFrontHouseholdCmd; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.BindingResult; +import app.module.front.usecase.household.updateFrontHousehold.adapters.web.model.UpdateFrontHouseholdReqVO; +import app.module.front.usecase.household.updateFrontHousehold.adapters.web.model.UpdateFrontHouseholdResVO; + +@RestController +@RequiredArgsConstructor +class UpdateFrontHouseholdController { + private final UpdateFrontHouseholdPortIn updateFrontHouseholdPortIn; + + @PatchMapping(path = "/api/front/household/update") + ResponseEntity operate( + @Valid UpdateFrontHouseholdReqVO reqVO, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult); + } + + updateFrontHouseholdPortIn.operate(new UpdateFrontHouseholdCmd( + reqVO.getId(), + reqVO.getHouseholdNum(), + reqVO.getOwnerName(), + reqVO.getOwnerAge(), + reqVO.getTel(), + reqVO.getPhone(), + reqVO.getRegion(), + reqVO.getCity(), + reqVO.getAddressDetail() + )); + + return ResponseEntity.status(HttpStatus.OK).body(reqVO); + } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdReqVO.java b/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdReqVO.java new file mode 100644 index 00000000..356ab06d --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdReqVO.java @@ -0,0 +1,22 @@ +package app.module.front.usecase.household.updateFrontHousehold.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class UpdateFrontHouseholdReqVO { + 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/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdResVO.java b/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdResVO.java new file mode 100644 index 00000000..55335f9f --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdResVO.java @@ -0,0 +1,13 @@ +package app.module.front.usecase.household.updateFrontHousehold.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class UpdateFrontHouseholdResVO { +} diff --git a/front/src/main/java/app/module/front/usecase/user/updateUserUI/adapters/web/UpdateUserUIController.java b/front/src/main/java/app/module/front/usecase/user/updateUserUI/adapters/web/UpdateUserUIController.java index de96fa3d..ab0a8009 100644 --- a/front/src/main/java/app/module/front/usecase/user/updateUserUI/adapters/web/UpdateUserUIController.java +++ b/front/src/main/java/app/module/front/usecase/user/updateUserUI/adapters/web/UpdateUserUIController.java @@ -1,6 +1,8 @@ package app.module.front.usecase.user.updateUserUI.adapters.web; import app.module.core.config.application.util.CommonUtil; +import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; +import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; import app.module.core.usecase.user.findUser.ports.FindUserPortIn; import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; import app.module.front.usecase.user.updateUserUI.adapters.web.model.UpdateUserUIReqVO; @@ -14,13 +16,13 @@ import org.springframework.web.bind.annotation.ModelAttribute; @RequiredArgsConstructor class UpdateUserUIController { - private final FindUserPortIn findUserPortIn; + private final GetHouseholdPortIn getHouseholdPortIn; @GetMapping(path = "/user/info") String operate(Model model, @ModelAttribute("reqVO") UpdateUserUIReqVO reqVO) { model.addAttribute("userInfo", - findUserPortIn.operate(new FindUserCmd(CommonUtil.getLoginUsername())).orElseThrow()); + getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow()); return "user/info"; } diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html index 1d64bed8..8ad940b4 100644 --- a/front/src/main/resources/templates/common/components.html +++ b/front/src/main/resources/templates/common/components.html @@ -88,7 +88,7 @@ [로그인]

- 로그인 사용자명 + 로그인 사용자명 [로그아웃] [정보수정]

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}"> +
- -
- -
- 에러 메세지 -
-
-
-
-
- - 임가번호 +
- - + +
- - -
+ + +
- - -
+ + +
- - -
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
@@ -94,7 +93,7 @@ $.ajax({ method: 'PATCH', - url: '/api/front/user/update', + url: '/api/front/household/update', data: obj, beforeSend: function (xhr) { xhr.setRequestHeader( @@ -102,7 +101,7 @@ $("meta[name='_csrf']").attr("content")); }, success(res) { - if (confirm(`'${res.id}' 정보가 수정되었습니다.`)) { + if (confirm(`'${res.ownerName} 님의' 정보가 수정되었습니다.`)) { location.reload(); } }, @@ -121,21 +120,6 @@ } - \ No newline at end of file