[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,45 @@
 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) {
+		if (role == null || role.trim().isEmpty()) return false;
+		return Arrays.stream(Role.values()).anyMatch(obj -> obj.getRole().equalsIgnoreCase(role));
+	}
+
+	public static Role findRole(String role) {
+		if (role == null || role.trim().isEmpty()) {
+			throw new IllegalArgumentException("해당 role 을 찾을 수 없습니다.");
+		}
+		return Arrays.stream(Role.values())
+				.filter(obj -> obj.getRole().equalsIgnoreCase(role))
+				.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 findByMemberIdAndRole(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/application/service/SignUpService.java

@@ -46,7 +46,7 @@ public TokenModel signUp(AdditionalInfoApplicationCommand command) {
 
 		// TODO: 일반 USER 권한인지 아닌지 계산해주는 도구 추가
 
-		return tokenGenerator.execute(savedMember.getId());
+		return tokenGenerator.execute(savedMember.getMemberId());
 	}
 
 	private void saveOAuth(String oAuthId, Long memberId) {

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

@@ -11,6 +11,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Index;
 import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -25,7 +26,11 @@
 @SuperBuilder(toBuilder = true)
 @Table(
 		name = AuthorityEntity.NAME,
-		indexes = {@Index(name = "idx_member_id", columnList = AuthorityEntity.NAME + "_member_id")})
+		indexes = {@Index(name = "idx_member_id", columnList = AuthorityEntity.NAME + "_member_id")},
+		uniqueConstraints =
+				@UniqueConstraint(
+						name = "uk_authority_member_role",
+						columnNames = {AuthorityEntity.NAME + "_member_id", AuthorityEntity.NAME + "_role"}))
 @Getter
 public class AuthorityEntity extends BaseEntity {
 

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> findByMemberIdAndRole(
+			@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 findByMemberIdAndRole(Long memberId, Role role) {
+		return repository
+				.findByMemberIdAndRole(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/calendar/application/dto/CalendarCreateCommand.java

@@ -0,0 +1,6 @@
+package com.blackcompany.eeos.calendar.application.dto;
+
+import com.blackcompany.eeos.common.support.dto.AbstractRequestDto;
+
+public record CalendarCreateCommand(String title, String url, String type, Long startAt, Long endAt)
+		implements AbstractRequestDto {}

eeos/src/main/java/com/blackcompany/eeos/calendar/application/dto/CalendarQuery.java

@@ -0,0 +1,3 @@
+package com.blackcompany.eeos.calendar.application.dto;
+
+public record CalendarQuery(Integer year, Integer month, Integer date, Integer duration) {}

eeos/src/main/java/com/blackcompany/eeos/calendar/application/dto/CalendarResponse.java

@@ -0,0 +1,19 @@
+package com.blackcompany.eeos.calendar.application.dto;
+
+import com.blackcompany.eeos.calendar.application.model.CalendarModel;
+import com.blackcompany.eeos.common.support.dto.AbstractResponseDto;
+import com.blackcompany.eeos.common.utils.DateConverter;
+
+public record CalendarResponse(
+		Long id, String title, String url, String type, Long startAt, Long endAt, String writer)
+		implements AbstractResponseDto {
+
+	public static CalendarResponse toResponse(CalendarModel model, String writerName) {
+		Long startAt = DateConverter.toMillis(model.getStartAt());
+		Long endAt = DateConverter.toMillis(model.getEndAt());
+		String type = model.getType().name();
+
+		return new CalendarResponse(
+				model.getId(), model.getTitle(), model.getUrl(), type, startAt, endAt, writerName);
+	}
+}

eeos/src/main/java/com/blackcompany/eeos/calendar/application/dto/CalendarResponses.java

@@ -0,0 +1,6 @@
+package com.blackcompany.eeos.calendar.application.dto;
+
+import com.blackcompany.eeos.common.support.dto.AbstractResponseDto;
+import java.util.List;
+
+public record CalendarResponses(List<CalendarResponse> calendars) implements AbstractResponseDto {}

eeos/src/main/java/com/blackcompany/eeos/calendar/application/dto/CalendarUpdateCommand.java

@@ -0,0 +1,6 @@
+package com.blackcompany.eeos.calendar.application.dto;
+
+import com.blackcompany.eeos.common.support.dto.AbstractRequestDto;
+
+public record CalendarUpdateCommand(String title, String url, String type, Long startAt, Long endAt)
+		implements AbstractRequestDto {}

eeos/src/main/java/com/blackcompany/eeos/calendar/application/exception/DeniedCalendarTypeException.java

@@ -0,0 +1,21 @@
+package com.blackcompany.eeos.calendar.application.exception;
+
+import com.blackcompany.eeos.common.exception.BusinessException;
+import com.blackcompany.eeos.member.application.model.Department;
+import org.springframework.http.HttpStatus;
+
+public class DeniedCalendarTypeException extends BusinessException {
+
+	private static final String FAIL_CODE = "10001";
+	private final Department department;
+
+	public DeniedCalendarTypeException(Department department) {
+		super(FAIL_CODE, HttpStatus.BAD_REQUEST);
+		this.department = department;
+	}
+
+	@Override
+	public String getMessage() {
+		return String.format("%s 부서는 해당 타입의 칼렌더를 생성할 수 없습니다.", department.name());
+	}
+}

eeos/src/main/java/com/blackcompany/eeos/calendar/application/exception/DeniedCalendarUpdateException.java

@@ -0,0 +1,18 @@
+package com.blackcompany.eeos.calendar.application.exception;
+
+import com.blackcompany.eeos.common.exception.BusinessException;
+import org.springframework.http.HttpStatus;
+
+public class DeniedCalendarUpdateException extends BusinessException {
+
+	private static final String FAIL_CODE = "10002";
+
+	public DeniedCalendarUpdateException() {
+		super(FAIL_CODE, HttpStatus.UNAUTHORIZED);
+	}
+
+	@Override
+	public String getMessage() {
+		return "캘린더를 수정할 권한이 없습니다.";
+	}
+}

eeos/src/main/java/com/blackcompany/eeos/calendar/application/exception/InvalidDateException.java

@@ -0,0 +1,18 @@
+package com.blackcompany.eeos.calendar.application.exception;
+
+import com.blackcompany.eeos.common.exception.BusinessException;
+import org.springframework.http.HttpStatus;
+
+public class InvalidDateException extends BusinessException {
+
+	private static final String FAIL_CODE = "10003";
+
+	public InvalidDateException() {
+		super(FAIL_CODE, HttpStatus.BAD_REQUEST);
+	}
+
+	@Override
+	public String getMessage() {
+		return "행사 시작 날짜는 행사 종료 날짜보다 이후일 수 없습니다.";
+	}
+}

eeos/src/main/java/com/blackcompany/eeos/calendar/application/exception/NotFoundCalendarTypeException.java

@@ -0,0 +1,20 @@
+package com.blackcompany.eeos.calendar.application.exception;
+
+import com.blackcompany.eeos.common.exception.BusinessException;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+public class NotFoundCalendarTypeException extends BusinessException {
+
+	private static final String FAIL_CODE = "10000";
+
+	public NotFoundCalendarTypeException() {
+		super(FAIL_CODE, HttpStatus.BAD_REQUEST);
+	}
+
+	@Override
+	public String getMessage() {
+		return "캘린더 타입이 존재하지 않습니다.";
+	}
+}