[FEAT] 회원 부서 관리 기능을 추가합니다.

eeos/src/main/java/com/blackcompany/eeos/auth/application/exception/NotFoundAuthorityException.java

@@ -0,0 +1,18 @@
+package com.blackcompany.eeos.auth.application.exception;
+
+import com.blackcompany.eeos.common.exception.BusinessException;
+import org.springframework.http.HttpStatus;
+
+public class NotFoundAuthorityException extends BusinessException {
+
+	private static final String FAIL_CODE = "4013";
+
+	public NotFoundAuthorityException() {
+		super(FAIL_CODE, HttpStatus.NOT_FOUND);
+	}
+
+	@Override
+	public String getMessage() {
+		return "회원의 권한을 찾을 수 없습니다.";
+	}
+}

eeos/src/main/java/com/blackcompany/eeos/auth/application/model/AuthorityModel.java

@@ -3,16 +3,24 @@
 import com.blackcompany.eeos.common.support.AbstractModel;
 import lombok.Builder;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 
-@RequiredArgsConstructor
 @Getter
 @Builder
 public class AuthorityModel implements AbstractModel {
 
 	private final Long id;
 	private final Long memberId;
-	private final Role role;
+	private Role role;
+
+	public AuthorityModel(Long id, Long memberId, Role role) {
+		this.id = id;
+		this.memberId = memberId;
+		this.role = role;
+	}
+
+	public void updateRole(Role role) {
+		this.role = role;
+	}
 
 	public static AuthorityModel create(Long memberId, Role role) {
 		return AuthorityModel.builder().role(role).memberId(memberId).build();

eeos/src/main/java/com/blackcompany/eeos/auth/application/model/Role.java

@@ -1,15 +1,41 @@
 package com.blackcompany.eeos.auth.application.model;
 
+import java.util.Arrays;
+import java.util.List;
 import lombok.Getter;
 
 @Getter
 public enum Role {
-	ROLE_ADMIN("ADMIN"),
-	ROLE_USER("USER");
+	ROLE_ADMIN(1L, "ADMIN"),
+	ROLE_USER(2L, "USER");
 
-	private String role;
+	private final Long id;
+	private final String role; // 시스템 내에 존재하는 role을 찾을 때, 이 문자열을 기준으로 찾습니다.
 
-	Role(String role) {
+	Role(Long id, String role) {
+		this.id = id;
 		this.role = role;
 	}
+
+	public static boolean isExist(String role) {
+		return Arrays.stream(Role.values()).anyMatch(obj -> obj.getRole().equals(role.toUpperCase()));
+	}
+
+	public static Role findRole(String role) {
+		return Arrays.stream(Role.values())
+				.filter(obj -> obj.getRole().equals(role.toUpperCase()))
+				.findFirst()
+				.orElseThrow(IllegalArgumentException::new);
+	}
+
+	public static Role findById(Long id) {
+		return Arrays.stream(Role.values())
+				.filter(obj -> obj.getId().equals(id))
+				.findFirst()
+				.orElseThrow(IllegalArgumentException::new);
+	}
+
+	public static List<Role> getAllRoles() {
+		return Arrays.asList(Role.values());
+	}
 }

eeos/src/main/java/com/blackcompany/eeos/auth/application/repository/AuthorityRepository.java

@@ -1,11 +1,14 @@
 package com.blackcompany.eeos.auth.application.repository;
 
 import com.blackcompany.eeos.auth.application.model.AuthorityModel;
+import com.blackcompany.eeos.auth.application.model.Role;
 import java.util.Set;
 
 public interface AuthorityRepository {
 
 	Set<AuthorityModel> findByMemberId(Long memberId);
 
+	AuthorityModel findByIdAndRole(Long memberId, Role role);
+
 	Long save(AuthorityModel authorityModel);
 }

eeos/src/main/java/com/blackcompany/eeos/auth/application/service/AuthService.java

@@ -59,7 +59,7 @@ private OauthMemberModel signUpMember(final OauthMemberModel model) {
 						.build();
 		MemberModel savedMember = memberRepository.save(member);
 
-		authorityRepository.save(AuthorityModel.create(savedMember.getMemberId(), Role.ROLE_USER));
+		createDefaultRole(savedMember.getMemberId());
 
 		OauthMemberModel updatedModel = model.toBuilder().memberId(savedMember.getId()).build();
 		return oAuthMemberRepository.save(updatedModel);
@@ -68,4 +68,8 @@ private OauthMemberModel signUpMember(final OauthMemberModel model) {
 	private void checkPassword(String password, String encryptedPassword) {
 		if (!encryptHelper.isMatch(password, encryptedPassword)) throw new NotFoundAccountException();
 	}
+
+	private void createDefaultRole(Long memberId) {
+		authorityRepository.save(AuthorityModel.create(memberId, Role.ROLE_USER));
+	}
 }

eeos/src/main/java/com/blackcompany/eeos/auth/persistence/authority/AuthorityJpaRepository.java

@@ -1,5 +1,7 @@
 package com.blackcompany.eeos.auth.persistence.authority;
 
+import com.blackcompany.eeos.auth.application.model.Role;
+import java.util.Optional;
 import java.util.Set;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -9,4 +11,8 @@ public interface AuthorityJpaRepository extends JpaRepository<AuthorityEntity, L
 
 	@Query("SELECT DISTINCT a FROM AuthorityEntity a WHERE a.memberId = :memberId")
 	Set<AuthorityEntity> findByMemberId(@Param("memberId") Long memberId);
+
+	@Query("SELECT a FROM AuthorityEntity a WHERE a.memberId=:memberId AND a.role=:role")
+	Optional<AuthorityEntity> findByIdAndRole(
+			@Param("memberId") Long memberId, @Param("role") Role role);
 }

eeos/src/main/java/com/blackcompany/eeos/auth/persistence/authority/AuthorityRepositoryImpl.java

@@ -1,6 +1,8 @@
 package com.blackcompany.eeos.auth.persistence.authority;
 
+import com.blackcompany.eeos.auth.application.exception.NotFoundAuthorityException;
 import com.blackcompany.eeos.auth.application.model.AuthorityModel;
+import com.blackcompany.eeos.auth.application.model.Role;
 import com.blackcompany.eeos.auth.application.repository.AuthorityRepository;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -20,6 +22,14 @@ public Set<AuthorityModel> findByMemberId(Long memberId) {
 				.collect(Collectors.toSet());
 	}
 
+	@Override
+	public AuthorityModel findByIdAndRole(Long memberId, Role role) {
+		return repository
+				.findByIdAndRole(memberId, role)
+				.map(this::toModel)
+				.orElseThrow(NotFoundAuthorityException::new);
+	}
+
 	@Override
 	public Long save(AuthorityModel authorityModel) {
 		return repository.save(toEntity(authorityModel)).getId();

eeos/src/main/java/com/blackcompany/eeos/config/security/SecurityFilterChainConfig.java

@@ -104,6 +104,7 @@ SecurityFilterChain authenticated(HttpSecurity httpSecurity) throws Exception {
 					requests
 							.requestMatchers(HttpMethod.PUT, "/api/members/activeStatus/{memberId}")
 							.hasAnyRole(ADMIN);
+					requests.requestMatchers(HttpMethod.PUT, "/api/members/department").hasAnyRole(ADMIN);
 					requests.anyRequest().authenticated();
 				});
 

eeos/src/main/java/com/blackcompany/eeos/member/application/dto/DepartmentResponse.java

@@ -0,0 +1,13 @@
+package com.blackcompany.eeos.member.application.dto;
+
+import com.blackcompany.eeos.common.support.dto.AbstractResponseDto;
+import com.blackcompany.eeos.member.application.model.Department;
+
+public record DepartmentResponse(Long departmentId, String enName, String koName)
+		implements AbstractResponseDto {
+
+	public static DepartmentResponse from(Department department) {
+		return new DepartmentResponse(
+				department.getId(), department.getEnName(), department.getKoName());
+	}
+}

eeos/src/main/java/com/blackcompany/eeos/member/application/dto/QueryMemberResponse.java

@@ -14,4 +14,5 @@ public class QueryMemberResponse implements AbstractResponseDto {
 	private Long memberId;
 	private String name;
 	private String activeStatus;
+	private String department;
 }

eeos/src/main/java/com/blackcompany/eeos/member/application/dto/converter/QueryMemberResponseConverter.java

@@ -14,6 +14,7 @@ public QueryMemberResponse from(MemberModel source) {
 				.memberId(source.getId())
 				.name(source.getName())
 				.activeStatus(source.getActiveStatus())
+				.department(source.getDepartment().getKoName())
 				.build();
 	}
 

eeos/src/main/java/com/blackcompany/eeos/member/application/exception/NotFoundDepartmentException.java

@@ -0,0 +1,18 @@
+package com.blackcompany.eeos.member.application.exception;
+
+import com.blackcompany.eeos.common.exception.BusinessException;
+import org.springframework.http.HttpStatus;
+
+public class NotFoundDepartmentException extends BusinessException {
+
+	private static final String FAIL_CODE = "3003";
+
+	public NotFoundDepartmentException() {
+		super(FAIL_CODE, HttpStatus.NOT_FOUND);
+	}
+
+	@Override
+	public String getMessage() {
+		return "해당 부서를 찾을 수 없습니다.";
+	}
+}

eeos/src/main/java/com/blackcompany/eeos/member/application/model/Department.java

@@ -0,0 +1,52 @@
+package com.blackcompany.eeos.member.application.model;
+
+import com.blackcompany.eeos.member.application.exception.NotFoundDepartmentException;
+import java.util.Arrays;
+import java.util.List;
+import lombok.Getter;
+
+@Getter
+public enum Department {
+	PRESIDENT(101L, "PRESIDENT", "회장단"),
+	MARKETING(102L, "MARKETING", "홍보부"),
+	MANAGEMENT(103L, "MANAGEMENT", "관리부"),
+	EVENT(104L, "EVENT", "행사부"),
+	NONE(105L, "NONE", "해당없음");
+
+	private final Long id;
+	private final String enName;
+	private final String koName;
+
+	Department(Long id, String enName, String koName) {
+		this.id = id;
+		this.enName = enName;
+		this.koName = koName;
+	}
+
+	public static boolean isExistById(Long id) {
+		return Arrays.stream(Department.values()).anyMatch(obj -> obj.getId().equals(id));
+	}
+
+	public static boolean isExistByEnName(String enName) {
+		return Arrays.stream(Department.values())
+				.anyMatch(obj -> obj.getEnName().equals(enName.toUpperCase()));
+	}
+
+	public static Department findDepartmentByEnName(String enName) {
+		return Arrays.stream(Department.values())
+				.filter(obj -> obj.getEnName().equals(enName.toUpperCase()))
+				.findFirst()
+				.orElseThrow(NotFoundDepartmentException::new);
+	}
+
+	public static Department findById(Long id) {
+		return Arrays.stream(Department.values())
+				.filter(obj -> obj.getId().equals(id))
+				.findFirst()
+				.orElseThrow(NotFoundDepartmentException::new);
+	}
+
+	public static List<Department> getAllDepartments() {
+		return Arrays.asList(Department.values());
+	}
+}

eeos/src/main/java/com/blackcompany/eeos/member/application/model/MemberModel.java

@@ -22,6 +22,7 @@ public class MemberModel implements AbstractModel, MemberIdModel {
 	@Builder.Default private ActiveStatus activeStatus = ActiveStatus.AM;
 	@Builder.Default private boolean isAdmin = false;
 	private OauthServerType oauthServerType;
+	@Builder.Default private Department department = Department.NONE;
 
 	public MemberModel updateActiveStatus(String status) {
 		ActiveStatus requestStatus = ActiveStatus.find(status);
@@ -30,6 +31,11 @@ public MemberModel updateActiveStatus(String status) {
 		return this;
 	}
 
+	public MemberModel updateDepartment(Department department) {
+		this.department = department;
+		return this;
+	}
+
 	// TODO : Equals 재정의로 고민
 	public boolean validateSame(Long memberId) {
 		return id.equals(memberId);

eeos/src/main/java/com/blackcompany/eeos/member/application/model/converter/MemberEntityConverter.java

@@ -18,6 +18,7 @@ public MemberModel from(MemberEntity source) {
 				.activeStatus(source.getActiveStatus())
 				.isAdmin(source.isAdmin())
 				.oauthServerType(source.getOauthServerType())
+				.department(source.getDepartment())
 				.build();
 	}
 
@@ -29,6 +30,7 @@ public MemberEntity toEntity(MemberModel source) {
 				.isAdmin(source.isAdmin())
 				.activeStatus(ActiveStatus.find(source.getActiveStatus()))
 				.oauthServerType(source.getOauthServerType())
+				.department(source.getDepartment())
 				.build();
 	}
 

eeos/src/main/java/com/blackcompany/eeos/member/application/service/DepartmentService.java

@@ -0,0 +1,36 @@
+package com.blackcompany.eeos.member.application.service;
+
+import com.blackcompany.eeos.member.application.model.Department;
+import com.blackcompany.eeos.member.application.model.MemberModel;
+import com.blackcompany.eeos.member.application.repository.MemberRepository;
+import com.blackcompany.eeos.member.application.usecase.DepartmentUsecase;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class DepartmentService implements DepartmentUsecase {
+
+	private final MemberRepository memberRepository;
+
+	@Override
+	public void changeDepartment(Long memberId, String to) {
+		MemberModel member = memberRepository.findById(memberId);
+		Department depart = Department.findDepartmentByEnName(to);
+		member.updateDepartment(depart);
+		memberRepository.save(member);
+	}
+
+	public List<Department> getAllDepartments() {
+		return Department.getAllDepartments();
+	}
+
+	public Department getDepartment(String name) {
+		return Department.findDepartmentByEnName(name);
+	}
+
+	public Department getDepartmentById(Long id) {
+		return Department.findById(id);
+	}
+}

eeos/src/main/java/com/blackcompany/eeos/member/application/usecase/DepartmentUsecase.java

@@ -0,0 +1,11 @@
+package com.blackcompany.eeos.member.application.usecase;
+
+import com.blackcompany.eeos.member.application.model.Department;
+import java.util.List;
+
+public interface DepartmentUsecase {
+
+	void changeDepartment(Long memberId, String to);
+
+	List<Department> getAllDepartments();
+}

eeos/src/main/java/com/blackcompany/eeos/member/persistence/MemberEntity.java

@@ -3,6 +3,7 @@
 import com.blackcompany.eeos.auth.application.domain.OauthServerType;
 import com.blackcompany.eeos.common.persistence.BaseEntity;
 import com.blackcompany.eeos.member.application.model.ActiveStatus;
+import com.blackcompany.eeos.member.application.model.Department;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -56,4 +57,9 @@ public class MemberEntity extends BaseEntity {
 	@Column(name = ENTITY_PREFIX + "_is_admin", nullable = false)
 	@Builder.Default
 	private boolean isAdmin = false; // TODO : 여러 ROEL 커버 가능하도록
+
+	@Column(name = ENTITY_PREFIX + "_department", nullable = false)
+	@Enumerated(EnumType.STRING)
+	@Builder.Default
+	private Department department = Department.NONE;
 }