front 로그인 작업 중 (1)

This commit is contained in:
kangsunlee
2025-05-28 17:57:31 +09:00
parent d36689e02e
commit 00f1a136bf
11 changed files with 262 additions and 14 deletions

View File

@@ -106,20 +106,12 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요.
-Dserver.forward-headers-strategy=native
-Dlogging.level.org.springframework.security=DEBUG
-Dspring.datasource.driver-class-name=org.postgresql.Driver
-Dspring.datasource.url=jdbc:postgresql://15.165.180.203:5432/recycle2_mybatis
-Dspring.datasource.username=recycle2
-Dspring.datasource.password=recycle1@#4
-Dspring.datasource.url=jdbc:postgresql://15.165.180.203:5432/korea_research
-Dspring.datasource.username=ko_research
-Dspring.datasource.password=koresearch1@#4
```
## JDBC 및 데이터 핸들링 구성 옵션
이 프로젝트는 PostgreSQL을 사용하며,
JDBC 연결은 위 VM Options에 포함된 아래 설정을 기준으로 동작합니다.
```
-Dspring.datasource.driver-class-name=org.postgresql.Driver
-Dspring.datasource.url=jdbc:postgresql://15.165.180.203:5432/recycle2_mybatis
-Dspring.datasource.username=recycle2
-Dspring.datasource.password=recycle1@#4
```
### app.initData.core
@@ -226,9 +218,9 @@ PASSWORD: koresearch1@#4
### 🚀 ADMIN DEPLOY
#### `deploy_dev_admin` 브렌치로 merge! pipeline 실행 후 아래 URL 에서 확인가능.
* http://ko-research-admin.etribe.co.kr
* https://ko-research-admin.etribe.co.kr
### 🚀 FRONT DEPLOY
#### `deploy_dev_front` 브렌치로 merge! pipeline 실행 후 아래 URL 에서 확인가능.
* http://ko-research-front.etribe.co.kr
* https://ko-research-front.etribe.co.kr

View File

@@ -0,0 +1,53 @@
package app.module.core.config.adapters.persistence.entity;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class Household extends AuditEntity {
private Long id;
private String household_num;
private String owner_name;
private Integer owner_age;
private String tel;
private String phone;
private String password;
private String zipcode;
private String region;
private String city;
private String address_detail;
private Integer industry_large_code;
private Integer industry_middle_code;
private Integer industry_small_code;
private Integer scale_code;
private Integer employment_code;
private Boolean is_panel;
private String memo;
private String drop_reason;
}

View File

@@ -0,0 +1,24 @@
package app.module.core.usecase.household.getHousehold.adapters.persistence;
import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortOut;
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold;
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetHouseholdDao implements GetHouseholdPortOut {
private final GetHouseholdMapper mapper;
@Override
public Optional<GetHousehold> operate(GetHouseholdCmd cmd) {
return mapper.findByHouseholdNum(cmd.getHouseholdNum())
.map(household -> {
household.setRoles(mapper.findRolesHasPrivilegesById(household.getId()));
return household;
});
}
}

View File

@@ -0,0 +1,14 @@
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;
@Mapper
public interface GetHouseholdMapper {
Optional<GetHousehold> findByHouseholdNum(String householdNum);
Set<CoreRole> findRolesHasPrivilegesById(Long id);
}

View File

@@ -0,0 +1,9 @@
package app.module.core.usecase.household.getHousehold.ports;
import java.util.Optional;
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold;
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd;
public interface GetHouseholdPortIn {
Optional<GetHousehold> operate(GetHouseholdCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.core.usecase.household.getHousehold.ports;
import java.util.Optional;
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold;
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd;
public interface GetHouseholdPortOut {
Optional<GetHousehold> operate(GetHouseholdCmd cmd);
}

View File

@@ -0,0 +1,20 @@
package app.module.core.usecase.household.getHousehold.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold;
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd;
import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn;
import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortOut;
import java.util.Optional;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetHouseholdService implements GetHouseholdPortIn {
private final GetHouseholdPortOut portOut;
@Override
public Optional<GetHousehold> operate(GetHouseholdCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,42 @@
package app.module.core.usecase.household.getHousehold.ports.application.domain;
import app.module.core.config.adapters.web.security.domain.CoreRole;
import app.module.core.config.application.enums.SignUpType;
import java.time.LocalDateTime;
import java.util.Set;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@EqualsAndHashCode
public class GetHousehold {
private Long id;
private String householdNum;
private String ownerName;
private Integer ownerAge;
private String tel;
private String phone;
private String password;
private String zipcode;
private String region;
private String city;
private String addressDetail;
private Integer industryLargeCode;
private Integer industryMiddleCode;
private Integer industrySmallCode;
private Integer scaleCode;
private Integer employmentCode;
private Boolean isPanel;
private String memo;
private String dropReason;
private LocalDateTime createdAt;
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private Set<CoreRole> roles;
}

View File

@@ -0,0 +1,14 @@
package app.module.core.usecase.household.getHousehold.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetHouseholdCmd {
private String householdNum;
}

View File

@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.core.usecase.household.getHousehold.adapters.persistence.GetHouseholdMapper">
<select id="findByHouseholdNum"
resultType="app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold">
SELECT
id,
household_num,
owner_name,
owner_age,
tel,
phone,
password,
zipcode,
region,
city,
address_detail,
industry_large_code,
industry_middle_code,
industry_small_code,
scale_code,
employment_code,
is_panel,
memo,
drop_reason,
created_at,
created_by,
updated_at,
updated_by
FROM household
WHERE household_num = #{householdNum}
AND is_deleted = false
</select>
<resultMap id="HouseholdRoleHasPrivilegesMap" type="app.module.core.config.adapters.web.security.domain.CoreRole">
<id property="id" column="role_id"/>
<result property="description" column="role_description"/>
<collection property="privileges" ofType="app.module.core.config.adapters.web.security.domain.CorePrivilege">
<id property="id" column="privilege_id"/>
</collection>
</resultMap>
<select id="findRolesHasPrivilegesById" resultMap="HouseholdRoleHasPrivilegesMap">
/* findRolesHasPrivilegesById : 임가 권한, 역할 조회 */
SELECT
r.id AS role_id,
r.description AS role_description,
p.id AS privilege_id
FROM household_has_role hhr
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}
AND hhr.is_deleted = false
</select>
</mapper>

View File

@@ -2,6 +2,10 @@ package app.module.front.config.application.security;
import app.module.core.config.adapters.web.security.domain.CorePrivilege;
import app.module.core.config.adapters.web.security.domain.CoreRole;
import app.module.core.usecase.household.getHousehold.adapters.persistence.GetHouseholdMapper;
import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn;
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold;
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.FindUser;
import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd;
@@ -24,11 +28,18 @@ import org.springframework.stereotype.Service;
public class FrontDetailService implements UserDetailsService {
private final FindUserPortIn findUserPortIn;
private final GetHouseholdPortIn getHouseholdPortIn;
@Value("${app.front.password.validity.period.days}")
private long passwordValidPeriodDays;
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
GetHousehold getHousehold =
getHouseholdPortIn
.operate(new GetHouseholdCmd(username))
.orElseThrow(() -> new UsernameNotFoundException("Invalid username or password."));
FindUser findUser =
findUserPortIn
.operate(new FindUserCmd(username))
@@ -42,7 +53,7 @@ public class FrontDetailService implements UserDetailsService {
findUser.getPassword(),
!accountDisabled,
true,
isCredentialsNonExpired(findUser.getPasswordUpdatedAt()),
true,
!accountLocked,
getAuthorities(findUser.getRoles()),
findUser.getNickname(),