215 feat 제휴업체 기능 개발

src/main/java/inu/codin/codin/common/dto/Department.java

@@ -1,10 +1,14 @@
 package inu.codin.codin.common.dto;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 @Getter
 @RequiredArgsConstructor
+@Slf4j
 public enum Department {
 
     IT_COLLEGE("정보기술대학"),
@@ -17,13 +21,20 @@ public enum Department {
 
     private final String description;
 
+    @JsonCreator
     public static Department fromDescription(String description) {
         for (Department department : Department.values()) {
-            if (department.getDescription().equals(description)) {
+            if (department.name().equals(description) || department.getDescription().equals(description)) {
                 return department;
             }
         }
+
+        log.warn("정보대 내의 학과가 아닙니다. description : " + description);
         return OTHERS;
     }
 
+    @JsonValue
+    public String toValue(){
+        return this.name();
+    }
 }

src/main/java/inu/codin/codin/common/exception/GlobalErrorCode.java

@@ -0,0 +1,8 @@
+package inu.codin.codin.common.exception;
+
+import org.springframework.http.HttpStatus;
+
+public interface GlobalErrorCode {
+    HttpStatus httpStatus();
+    String message();
+}

src/main/java/inu/codin/codin/common/exception/GlobalException.java

@@ -0,0 +1,13 @@
+package inu.codin.codin.common.exception;
+
+import lombok.Getter;
+
+@Getter
+public class GlobalException extends RuntimeException {
+
+    private final GlobalErrorCode errorCode;
+    public GlobalException(GlobalErrorCode errorCode){
+        super(errorCode.message());
+        this.errorCode = errorCode;
+    }
+}

src/main/java/inu/codin/codin/common/exception/GlobalExceptionHandler.java

@@ -3,6 +3,9 @@
 import inu.codin.codin.common.response.ExceptionResponse;
 import inu.codin.codin.common.security.exception.JwtException;
 import inu.codin.codin.domain.chat.chatroom.exception.ChatRoomExistedException;
+import inu.codin.codin.domain.chat.exception.*;
+import inu.codin.codin.domain.info.exception.InfoErrorCode;
+import inu.codin.codin.domain.info.exception.InfoException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.RedisSystemException;
 import org.springframework.http.HttpStatus;
@@ -22,6 +25,37 @@ protected ResponseEntity<ExceptionResponse> handleException(Exception e) {
                 .body(new ExceptionResponse(e.getMessage(), HttpStatus.NOT_FOUND.value()));
     }
 
+    @ExceptionHandler(GlobalException.class)
+    protected ResponseEntity<ExceptionResponse> handleGlobalException(GlobalException e) {
+        GlobalErrorCode code = e.getErrorCode();
+        return ResponseEntity.status(code.httpStatus())
+                .body(new ExceptionResponse(code.message(), code.httpStatus().value()));
+    }
+
+    @ExceptionHandler(ChatRoomException.class)
+    protected ResponseEntity<ExceptionResponse> handleChatRoomException(ChatRoomException e) {
+        ChatRoomErrorCode code = e.getErrorCode();
+        String message = code.message();
+        if (e instanceof ChatRoomExistedException existedException) //client 측에서 303 상태 코드 확인 후 message의 chatRoomId로 리다이렉션
+            message = message + "/" + existedException.getChatRoomId();
+        return ResponseEntity.status(code.httpStatus())
+                .body(new ExceptionResponse(message, code.httpStatus().value()));
+    }
+
+    @ExceptionHandler(ChattingException.class)
+    protected ResponseEntity<ExceptionResponse> handleChattingException(ChattingException e) {
+        ChattingErrorCode code = e.getErrorCode();
+        return ResponseEntity.status(code.httpStatus())
+                .body(new ExceptionResponse(code.message(), code.httpStatus().value()));
+    }
+
+    @ExceptionHandler(InfoException.class)
+    protected ResponseEntity<ExceptionResponse> handleInfoException(InfoException e) {
+        InfoErrorCode code = e.getErrorCode();
+        return ResponseEntity.status(code.httpStatus())
+                .body(new ExceptionResponse(code.message(), code.httpStatus().value()));
+    }
+
     @ExceptionHandler(NotFoundException.class)
     protected ResponseEntity<ExceptionResponse> handleNotFoundException(NotFoundException e) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND)
@@ -43,11 +77,7 @@ protected ResponseEntity<ExceptionResponse> handleValidationExceptions(MethodArg
         return ResponseEntity.status(HttpStatus.BAD_REQUEST)
                 .body(new ExceptionResponse(e.getBindingResult().getFieldErrors().get(0).getDefaultMessage(), HttpStatus.BAD_REQUEST.value()));    }
 
-    @ExceptionHandler(ChatRoomExistedException.class)
-    protected ResponseEntity<ExceptionResponse> handleChatRoomExistedException(ChatRoomExistedException e) {
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                .body(new ExceptionResponse(e.getMessage() +"/"+ e.getChatRoomId(), e.getErrorCode()));
-    }
+
 
     @ExceptionHandler(RedisSystemException.class)
     public ResponseEntity<ExceptionResponse> handleRedisSystemException(RedisSystemException e){

src/main/java/inu/codin/codin/domain/block/controller/BlockController.java

@@ -12,7 +12,6 @@
 @RestController
 @RequestMapping("/block")
 @RequiredArgsConstructor
-
 @Tag(name = "Block API", description = "사용자 차단 기능")
 public class BlockController {
     private final BlockService blockService;

src/main/java/inu/codin/codin/domain/chat/exception/ChatRoomErrorCode.java

@@ -0,0 +1,26 @@
+package inu.codin.codin.domain.chat.exception;
+
+import inu.codin.codin.common.exception.GlobalErrorCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+
+@RequiredArgsConstructor
+public enum ChatRoomErrorCode implements GlobalErrorCode {
+    CHATROOM_CREATE_MYSELF(HttpStatus.BAD_REQUEST, "자기 자신과는 채팅방을 생성할 수 없습니다."),
+    CHATROOM_EXISTED(HttpStatus.valueOf(303), "해당 reference에서 시작된 채팅방이 존재합니다."),
+    CHATROOM_NOT_FOUND(HttpStatus.NOT_FOUND, "채팅방을 찾을 수 없습니다."),
+    PARTICIPANTS_NOT_FOUND(HttpStatus.NOT_FOUND, "채팅방 내의 참여자를 찾을 수 없습니다.");
+
+    private final HttpStatus httpStatus;
+    private final String message;
+
+    @Override
+    public HttpStatus httpStatus() {
+        return httpStatus;
+    }
+
+    @Override
+    public String message() {
+        return message;
+    }
+}

src/main/java/inu/codin/codin/domain/chat/exception/ChatRoomException.java

@@ -0,0 +1,14 @@
+package inu.codin.codin.domain.chat.exception;
+
+import inu.codin.codin.common.exception.GlobalException;
+import lombok.Getter;
+
+@Getter
+public class ChatRoomException extends GlobalException {
+
+    private final ChatRoomErrorCode errorCode;
+    public ChatRoomException(ChatRoomErrorCode errorCode) {
+        super(errorCode);
+        this.errorCode = errorCode;
+    }
+}

src/main/java/inu/codin/codin/domain/chat/exception/ChattingErrorCode.java

@@ -0,0 +1,26 @@
+package inu.codin.codin.domain.chat.exception;
+
+import inu.codin.codin.common.exception.GlobalErrorCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+
+@RequiredArgsConstructor
+public enum ChattingErrorCode implements GlobalErrorCode {
+
+    CHATTING_USER_NOT_FOUND(HttpStatus.UNAUTHORIZED, "헤더에서 유저(email)을 찾을 수 없습니다."),
+    CHATTING_ID_NOT_FOUND(HttpStatus.NOT_FOUND, "헤더에서 채팅방 _id를 찾을 수 없습니다.");
+
+    private final HttpStatus httpStatus;
+
+    private final String message;
+
+    @Override
+    public HttpStatus httpStatus() {
+        return httpStatus;
+    }
+
+    @Override
+    public String message() {
+        return message;
+    }
+}

src/main/java/inu/codin/codin/domain/chat/exception/ChattingException.java

@@ -0,0 +1,16 @@
+package inu.codin.codin.domain.chat.exception;
+
+import inu.codin.codin.common.exception.GlobalException;
+import lombok.Getter;
+
+@Getter
+public class ChattingException extends GlobalException {
+
+    private final ChattingErrorCode errorCode;
+    private final String sessionId;
+    public ChattingException(ChattingErrorCode errorCode, String sessionId) {
+        super(errorCode);
+        this.errorCode = errorCode;
+        this.sessionId = sessionId;
+    }
+}

src/main/java/inu/codin/codin/domain/email/controller/EmailController.java

@@ -3,7 +3,8 @@
 import inu.codin.codin.common.response.SingleResponse;
 import inu.codin.codin.domain.email.dto.JoinEmailCheckRequestDto;
 import inu.codin.codin.domain.email.dto.JoinEmailSendRequestDto;
-import inu.codin.codin.domain.email.service.EmailAuthService;
+import inu.codin.codin.domain.email.service.JoinEmailAuthService;
+import inu.codin.codin.domain.email.service.PasswordResetEmailService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -19,15 +20,15 @@
 @Tag(name = "User Auth API", description = "유저 회원가입, 로그인, 로그아웃, 리이슈 API")
 @RequiredArgsConstructor
 public class EmailController {
-
-    private final EmailAuthService emailAuthService;
+    private final JoinEmailAuthService joinEmailAuthService;
+    private final PasswordResetEmailService passwordResetEmailService;
 
     @Operation(summary = "이메일 인증 코드 전송 - 학교인증 X")
     @PostMapping("/auth/send")
     public ResponseEntity<SingleResponse<?>> sendJoinAuthEmail(
             @RequestBody @Valid JoinEmailSendRequestDto emailAuthRequestDto
     ) {
-        emailAuthService.sendAuthEmail(emailAuthRequestDto);
+        joinEmailAuthService.sendJoinAuthEmail(emailAuthRequestDto);
         return ResponseEntity.ok()
                 .body(new SingleResponse<>(200, "이메일 인증 코드 전송 성공", null));
     }
@@ -37,7 +38,7 @@ public ResponseEntity<SingleResponse<?>> sendJoinAuthEmail(
     public ResponseEntity<SingleResponse<?>> checkAuthNum(
             @RequestBody @Valid JoinEmailCheckRequestDto joinEmailCheckRequestDto
     ) {
-        emailAuthService.checkAuthNum(joinEmailCheckRequestDto);
+        joinEmailAuthService.checkJoinAuthEmail(joinEmailCheckRequestDto);
         return ResponseEntity.ok()
                 .body(new SingleResponse<>(200, "이메일 인증 성공", null));
     }
@@ -49,7 +50,7 @@ public ResponseEntity<SingleResponse<?>> checkAuthNum(
     public ResponseEntity<SingleResponse<?>> sendPasswordEmail(
             @RequestBody @Valid JoinEmailSendRequestDto emailAuthRequestDto
     ) {
-        emailAuthService.sendPasswordEmail(emailAuthRequestDto);
+        passwordResetEmailService.sendPasswordResetEmail(emailAuthRequestDto);
         return ResponseEntity.ok()
                 .body(new SingleResponse<>(200, "이메일 비밀번호 재설정 링크 전송 성공", null));
     }

src/main/java/inu/codin/codin/domain/email/dto/JoinEmailCheckRequestDto.java

@@ -3,13 +3,15 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
+import lombok.Builder;
 import lombok.Getter;
 
 /**
  * 이메일 인증 코드 확인 요청 DTO
  * 해당 이메일로 전송된 인증 코드를 확인한다.
  */
 @Getter
+@Builder
 public class JoinEmailCheckRequestDto {
 
     @Schema(description = "이메일 주소", example = "example@inu.ac.kr")

src/main/java/inu/codin/codin/domain/email/dto/JoinEmailSendRequestDto.java

@@ -3,13 +3,15 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
+import lombok.Builder;
 import lombok.Getter;
 
 /**
  * 이메일 인증 코드 전송 요청 DTO
  * 해당 이메일로 인증 코드를 전송한다.
  */
 @Getter
+@Builder
 public class JoinEmailSendRequestDto {
 
     @Schema(description = "이메일 주소", example = "example@inu.ac.kr")

src/main/java/inu/codin/codin/domain/email/entity/EmailAuthEntity.java

@@ -6,6 +6,7 @@
 import lombok.Getter;
 import org.bson.types.ObjectId;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.time.LocalDateTime;
@@ -17,6 +18,7 @@ public class EmailAuthEntity extends BaseTimeEntity {
     @Id @NotBlank
     private ObjectId _id;
 
+    @Indexed
     @NotBlank
     private String email;
 
@@ -31,22 +33,26 @@ public EmailAuthEntity(String email, String authNum) {
         this.authNum = authNum;
     }
 
-    public void changeAuthNum(String authNum) {
-        this.authNum = authNum;
+    public void renewAuthNum(String newAuthNum) {
+        this.authNum = newAuthNum;
+        this.setUpdatedAt();
     }
 
     public void verifyEmail() {
         this.isVerified = true;
     }
 
     public void unVerifyEmail(){
-        this.isVerified=false;
+        this.isVerified = false;
     }
 
     /**
-     * 10분 이상이면 만료됌
+     * 10분의 만료 시간을 가짐
+     * @return 인증 번호가 만료되었는지 여부 false면 만료되지 않음, true면 만료됨
      */
     public boolean isExpired() {
-        return getUpdatedAt().plusMinutes(10).isBefore(LocalDateTime.now());
+        return getUpdatedAt()
+                .plusMinutes(10)
+                .isBefore(LocalDateTime.now());
     }
 }

src/main/java/inu/codin/codin/domain/email/exception/EmailPasswordResetFailException.java

@@ -0,0 +1,7 @@
+package inu.codin.codin.domain.email.exception;
+
+public class EmailPasswordResetFailException extends RuntimeException {
+    public EmailPasswordResetFailException(String message) {
+        super(message);
+    }
+}

src/main/java/inu/codin/codin/domain/email/exception/EmailTemplateFailException.java

@@ -0,0 +1,7 @@
+package inu.codin.codin.domain.email.exception;
+
+public class EmailTemplateFailException extends RuntimeException {
+    public EmailTemplateFailException(String message) {
+        super(message);
+    }
+}

src/main/java/inu/codin/codin/domain/email/repository/EmailAuthRepository.java

@@ -9,11 +9,6 @@
 
 @Repository
 public interface EmailAuthRepository extends MongoRepository<EmailAuthEntity, ObjectId> {
-
     Optional<EmailAuthEntity> findByEmail(String email);
-
     Optional<EmailAuthEntity> findByEmailAndAuthNum(String email, String authNum);
-
-    Optional<EmailAuthEntity> findByAuthNum(String authNum);
-
 }