[FEAT] 기존 이메일 도메인 수정 및 팀원 초대 로직 추가

src/main/java/com/tiki/server/TikiServerApplication.java

@@ -2,12 +2,14 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableScheduling
 @SpringBootApplication
 public class TikiServerApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(TikiServerApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(TikiServerApplication.class, args);
+    }
 
 }

src/main/java/com/tiki/server/auth/config/SecurityConfig.java

@@ -24,7 +24,7 @@ public class SecurityConfig {
             "/api/v1/auth/reissue",
             "/api/v1/members/password",
             "/api/v1/members",
-            "/api/v1/email-verification/**",
+            "/api/v1/email/verification/**",
             "/actuator/health"
     };
 

src/main/java/com/tiki/server/auth/jwt/JwtProvider.java

@@ -1,6 +1,6 @@
 package com.tiki.server.auth.jwt;
 
-import com.tiki.server.common.Constants;
+import com.tiki.server.common.constants.Constants;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/tiki/server/auth/service/AuthService.java

@@ -8,7 +8,7 @@
 import com.tiki.server.auth.token.adapter.TokenFinder;
 import com.tiki.server.auth.token.adapter.TokenSaver;
 import com.tiki.server.auth.token.entity.Token;
-import com.tiki.server.common.entity.Email;
+import com.tiki.server.email.Email;
 import com.tiki.server.member.adapter.MemberFinder;
 import com.tiki.server.member.entity.Member;
 import com.tiki.server.member.exception.MemberException;

src/main/java/com/tiki/server/common/Constants.java → src/main/java/com/tiki/server/common/constants/Constants.java

@@ -1,4 +1,4 @@
-package com.tiki.server.common;
+package com.tiki.server.common.constants;
 
 public class Constants {
     public static final String AUTHORIZATION = "Authorization";

src/main/java/com/tiki/server/common/handler/ErrorHandler.java

@@ -2,10 +2,11 @@
 
 import com.tiki.server.auth.exception.AuthException;
 import com.tiki.server.common.dto.ErrorCodeResponse;
-import com.tiki.server.emailverification.exception.EmailVerificationException;
+import com.tiki.server.email.emailsender.exception.EmailSenderException;
+import com.tiki.server.email.teaminvitation.exception.TeamInvitationException;
+import com.tiki.server.email.verification.exception.EmailVerificationException;
 import com.tiki.server.folder.exception.FolderException;
 import com.tiki.server.note.exception.NoteException;
-
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageNotReadableException;
@@ -25,95 +26,108 @@
 import lombok.val;
 
 import static com.tiki.server.auth.message.ErrorCode.UNCAUGHT_SERVER_EXCEPTION;
-import static com.tiki.server.common.Constants.WRONG_INPUT;
+import static com.tiki.server.common.constants.Constants.WRONG_INPUT;
 
 @Slf4j
 @RestControllerAdvice
 public class ErrorHandler {
 
-	@ExceptionHandler(MemberException.class)
-	public ResponseEntity<BaseResponse> memberException(final MemberException exception) {
-		log.error(exception.getMessage());
-		val errorCode = exception.getErrorCode();
-		return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
-	}
-
-	@ExceptionHandler(TeamException.class)
-	public ResponseEntity<BaseResponse> teamException(final TeamException exception) {
-		log.error(exception.getMessage());
-		val errorCode = exception.getErrorCode();
-		return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
-	}
-
-	@ExceptionHandler(MemberTeamManagerException.class)
-	public ResponseEntity<BaseResponse> memberTeamManagerException(final MemberTeamManagerException exception) {
-		log.error(exception.getMessage());
-		val errorCode = exception.getErrorCode();
-		return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
-	}
-
-	@ExceptionHandler(TimeBlockException.class)
-	public ResponseEntity<BaseResponse> timeBlockException(final TimeBlockException exception) {
-		log.error(exception.getMessage());
-		val errorCode = exception.getErrorCode();
-		return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
-	}
-
-	@ExceptionHandler(DocumentException.class)
-	public ResponseEntity<BaseResponse> documentException(final DocumentException exception) {
-		log.error(exception.getMessage());
-		val errorCode = exception.getErrorCode();
-		return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
-	}
-
-	@ExceptionHandler(NoteException.class)
-	public ResponseEntity<BaseResponse> noteException(final NoteException exception) {
-		log.error(exception.getMessage());
-		val errorCode = exception.getErrorCode();
-		return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
-	}
-
-	@ExceptionHandler(ExternalException.class)
-	public ResponseEntity<BaseResponse> externalException(final ExternalException exception) {
-		log.error(exception.getMessage());
-		val errorCode = exception.getErrorCode();
-		return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
-	}
-
-	@ExceptionHandler(EmailVerificationException.class)
-	public ResponseEntity<BaseResponse> mailException(final EmailVerificationException exception) {
-		log.error(exception.getMessage());
-		val errorCode = exception.getErrorCode();
-		return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
-	}
-
-	@ExceptionHandler(FolderException.class)
-	public ResponseEntity<BaseResponse> folderException(final FolderException exception) {
-		log.error(exception.getMessage());
-		val errorCode = exception.getErrorCode();
-		return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
-	}
-
-	@ExceptionHandler(AuthException.class)
-	public ResponseEntity<BaseResponse> authException(final AuthException exception) {
-		log.error(exception.getMessage());
-		val errorCode = exception.getErrorCode();
-		return ResponseEntity.status(errorCode.getHttpStatus()).body(
-			ErrorCodeResponse.of(errorCode.getCode(), errorCode.getMessage()));
-	}
-
-	@ExceptionHandler(HttpMessageNotReadableException.class)
-	public ResponseEntity<BaseResponse> httpMessageNotReadableException(
-		final HttpMessageNotReadableException exception) {
-		log.error(exception.getMessage());
-		return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(
-			ErrorResponse.of(WRONG_INPUT));
-	}
-
-	@ExceptionHandler(Exception.class)
-	public ResponseEntity<BaseResponse> exception(final Exception exception) {
-		log.error(exception.getMessage());
-		val errorCode = UNCAUGHT_SERVER_EXCEPTION;
-		return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
-	}
+    @ExceptionHandler(MemberException.class)
+    public ResponseEntity<BaseResponse> memberException(MemberException exception) {
+        log.error(exception.getMessage());
+        val errorCode = exception.getErrorCode();
+        return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
+    }
+
+    @ExceptionHandler(TeamException.class)
+    public ResponseEntity<BaseResponse> teamException(TeamException exception) {
+        log.error(exception.getMessage());
+        val errorCode = exception.getErrorCode();
+        return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
+    }
+
+    @ExceptionHandler(MemberTeamManagerException.class)
+    public ResponseEntity<BaseResponse> memberTeamManagerException(MemberTeamManagerException exception) {
+        log.error(exception.getMessage());
+        val errorCode = exception.getErrorCode();
+        return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
+    }
+
+    @ExceptionHandler(TimeBlockException.class)
+    public ResponseEntity<BaseResponse> timeBlockException(TimeBlockException exception) {
+        log.error(exception.getMessage());
+        val errorCode = exception.getErrorCode();
+        return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
+    }
+
+    @ExceptionHandler(DocumentException.class)
+    public ResponseEntity<BaseResponse> documentException(DocumentException exception) {
+        log.error(exception.getMessage());
+        val errorCode = exception.getErrorCode();
+        return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
+    }
+
+    @ExceptionHandler(NoteException.class)
+    public ResponseEntity<BaseResponse> noteException(NoteException exception) {
+        log.error(exception.getMessage());
+        val errorCode = exception.getErrorCode();
+        return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
+    }
+
+    @ExceptionHandler(ExternalException.class)
+    public ResponseEntity<BaseResponse> externalException(ExternalException exception) {
+        log.error(exception.getMessage());
+        val errorCode = exception.getErrorCode();
+        return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
+    }
+
+    @ExceptionHandler(EmailVerificationException.class)
+    public ResponseEntity<BaseResponse> mailVerificationException(EmailVerificationException exception) {
+        log.error(exception.getMessage());
+        val errorCode = exception.getErrorCode();
+        return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
+    }
+
+    @ExceptionHandler(EmailSenderException.class)
+    public ResponseEntity<BaseResponse> mailSenderException(EmailSenderException exception) {
+        log.error(exception.getMessage());
+        val errorCode = exception.getErrorCode();
+        return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
+    }
+
+    @ExceptionHandler(TeamInvitationException.class)
+    public ResponseEntity<BaseResponse> teamInvitationException(TeamInvitationException exception) {
+        log.error(exception.getMessage());
+        val errorCode = exception.getErrorCode();
+        return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
+    }
+
+    @ExceptionHandler(FolderException.class)
+    public ResponseEntity<BaseResponse> folderException(FolderException exception) {
+        log.error(exception.getMessage());
+        val errorCode = exception.getErrorCode();
+        return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
+    }
+
+    @ExceptionHandler(AuthException.class)
+    public ResponseEntity<BaseResponse> authException(AuthException exception) {
+        log.error(exception.getMessage());
+        val errorCode = exception.getErrorCode();
+        return ResponseEntity.status(errorCode.getHttpStatus()).body(
+                ErrorCodeResponse.of(errorCode.getCode(), errorCode.getMessage()));
+    }
+
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    public ResponseEntity<BaseResponse> httpMessageNotReadableException(HttpMessageNotReadableException exception) {
+        log.error(exception.getMessage());
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(
+                ErrorResponse.of(WRONG_INPUT));
+    }
+
+    @ExceptionHandler(Exception.class)
+    public ResponseEntity<BaseResponse> exception(Exception exception) {
+        log.error(exception.getMessage());
+        val errorCode = UNCAUGHT_SERVER_EXCEPTION;
+        return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.of(errorCode.getMessage()));
+    }
 }

src/main/java/com/tiki/server/email/Constants.java

@@ -0,0 +1,6 @@
+package com.tiki.server.email;
+
+public class Constants {
+    public static final String MAIL_FORMAT_EDU = ".edu";
+    public static final String MAIL_FORMAT_AC_KR = ".ac.kr";
+}

src/main/java/com/tiki/server/common/entity/Email.java → src/main/java/com/tiki/server/email/Email.java

@@ -1,4 +1,4 @@
-package com.tiki.server.common.entity;
+package com.tiki.server.email;
 
 import com.tiki.server.member.exception.MemberException;
 
@@ -7,8 +7,8 @@
 import lombok.*;
 import org.apache.commons.validator.routines.EmailValidator;
 
-import static com.tiki.server.emailverification.constants.EmailConstants.MAIL_FORMAT_AC_KR;
-import static com.tiki.server.emailverification.constants.EmailConstants.MAIL_FORMAT_EDU;
+import static com.tiki.server.email.Constants.MAIL_FORMAT_AC_KR;
+import static com.tiki.server.email.Constants.MAIL_FORMAT_EDU;
 import static com.tiki.server.member.message.ErrorCode.INVALID_EMAIL;
 
 @Getter
@@ -31,4 +31,12 @@ private static void checkMailFormat(final String email) {
             throw new MemberException(INVALID_EMAIL);
         }
     }
+
+    @Override
+    public boolean equals(Object target) {
+        if (this == target) return true;
+        if (target == null || getClass() != target.getClass()) return false;
+        Email targetEmail = (Email) target;
+        return email.equals(targetEmail.email);
+    }
 }

src/main/java/com/tiki/server/emailverification/config/EmailConfig.java → src/main/java/com/tiki/server/email/emailsender/config/EmailConfig.java

@@ -1,4 +1,4 @@
-package com.tiki.server.emailverification.config;
+package com.tiki.server.email.emailsender.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -8,7 +8,7 @@
 
 import java.util.Properties;
 
-import static com.tiki.server.emailverification.constants.EmailConstants.TIKI_EMAIL;
+import static com.tiki.server.email.emailsender.constants.Constants.TIKI_EMAIL;
 
 @Configuration
 public class EmailConfig {

src/main/java/com/tiki/server/email/emailsender/constants/Constants.java

@@ -0,0 +1,19 @@
+package com.tiki.server.email.emailsender.constants;
+
+public class Constants {
+
+    /* 공통 상수 */
+    public static final String TIKI_EMAIL = "[email protected]";
+    public static final String IMG_PATH = "images/mail_logo.png";
+
+    /* 이메일 인증 관련 상수 */
+    public static final String MAIL_VERIFICATION_CODE = "[Ti.Ki] 회원가입: 이메일 인증번호 안내";
+    public static final String MAIL_PASSWORD_CHANGING_CODE = "[Ti.Ki] 비밀번호 재설정: 이메일 인증번호 안내";
+    public static final String MAIL_INVITE_TEAM_MEMBER = "[Ti.Ki] 워크스페이스 초대 안내";
+    public static final String VERIFICATION_TEMPLATE_NAME = "signup";
+    public static final String CHANGE_PASSWORD_TEMPLATE_NAME = "changePassword";
+    public static final String INVITE_TEAM_MEMBER_TEMPLATE_NAME = "invitation";
+    public static final String PAGE_LOGO_IMAGE_VAR = "image";
+
+    /* 이메일 초대 관련 상수 */
+}

src/main/java/com/tiki/server/email/emailsender/controller/EmailSenderController.java

@@ -0,0 +1,49 @@
+package com.tiki.server.email.emailsender.controller;
+
+import com.tiki.server.common.dto.SuccessResponse;
+import com.tiki.server.email.emailsender.controller.docs.EmailSenderControllerDocs;
+import com.tiki.server.email.emailsender.controller.dto.request.EmailRequest;
+import com.tiki.server.email.emailsender.message.SuccessMessage;
+import com.tiki.server.email.emailsender.service.EmailSenderService;
+import com.tiki.server.email.emailsender.service.dto.EmailServiceRequest;
+import com.tiki.server.email.emailsender.service.dto.TeamInvitationCreateServiceRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import java.security.Principal;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/email")
+public class EmailSenderController implements EmailSenderControllerDocs {
+
+    private final EmailSenderService emailSenderService;
+
+    @ResponseStatus(HttpStatus.OK)
+    @PostMapping("/verification/signup")
+    public SuccessResponse<?> sendSignUpMail(@RequestBody final EmailRequest mailRequest) {
+        emailSenderService.sendSignUp(EmailServiceRequest.from(mailRequest.email()));
+        return SuccessResponse.success(SuccessMessage.SUCCESS_SEND_EMAIL.getMessage());
+    }
+
+    @ResponseStatus(HttpStatus.OK)
+    @PostMapping("/verification/password")
+    public SuccessResponse<?> sendChangingPasswordMail(@RequestBody final EmailRequest mailRequest) {
+        emailSenderService.sendPasswordChanging(EmailServiceRequest.from(mailRequest.email()));
+        return SuccessResponse.success(SuccessMessage.SUCCESS_SEND_EMAIL.getMessage());
+    }
+
+    @ResponseStatus(HttpStatus.CREATED)
+    @PostMapping("/invitation/team/{teamId}")
+    public SuccessResponse<?> sendInvitationMail(
+            final Principal principal,
+            @PathVariable final long teamId,
+            @RequestBody final EmailRequest targetEmailRequest
+    ) {
+        long memberId = Long.parseLong(principal.getName());
+        emailSenderService.createTeamInvitation(
+                TeamInvitationCreateServiceRequest.of(targetEmailRequest.email(), teamId, memberId));
+        return SuccessResponse.success(SuccessMessage.SUCCESS_SEND_EMAIL.getMessage());
+    }
+}