Release/0.6.0

src/main/java/com/waruru/areyouhere/active/service/ActiveSessionServiceImpl.java

@@ -31,6 +31,7 @@ public String activate(Long sessionId, Long courseId) {
         Course course = courseService.get(courseId);
         Session session = sessionQueryService.get(sessionId);
         LocalDateTime currentTime = LocalDateTime.now(ZoneId.of("Asia/Seoul"));
+        sessionCommandService.setAuthCodeDate(session, currentTime);
         return activeAttendanceService.activate(course, session, currentTime);
     }
 

src/main/java/com/waruru/areyouhere/auth/interceptor/LoginInterceptor.java

@@ -33,7 +33,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
                 // TODO: 인증과 인가는 별개이다. 인가 중에서도 각 user가 어디 record에 접근권한을 가질 지 제어하는 공통된 로직을 고민해 봐야 한다.
                 // TODO
             } catch (UnAuthenticatedException e) {
-                request.getRequestDispatcher("/api/manager/unauthorized").forward(request, response);
+                request.getRequestDispatcher("/api/auth/unauthorized").forward(request, response);
                 return false;
             }
         }

src/main/java/com/waruru/areyouhere/auth/session/SessionManager.java

@@ -17,17 +17,10 @@
 public class SessionManager {
 
     private final HttpSession httpSession;
-    private final CourseRepository courseRepository;
 
     private static final String LOG_ID = "logId";
 
     public void createSession(Long managerId){
-        List<Course> courses = courseRepository.findAllByManagerId(managerId);
-
-        List<Long> courseIds = courses == null || courses.isEmpty() ?
-                Collections.emptyList()
-                : courses.stream().map(course -> course.getManager().getId()).toList();
-
         LoginUser loginUser = new LoginUser(managerId);
         httpSession.setAttribute(LOG_ID, loginUser);
     }

src/main/java/com/waruru/areyouhere/common/error/GlobalExceptionHandler.java

@@ -1,23 +1,28 @@
 package com.waruru.areyouhere.common.error;
 
+import static com.waruru.areyouhere.common.utils.HttpStatusResponseEntity.RESPONSE_NOT_FOUND;
+
 import com.waruru.areyouhere.common.annotation.SlackNotification;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-import net.gpedro.integrations.slack.SlackApi;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
 
 @Slf4j
 @RestControllerAdvice
 public class GlobalExceptionHandler {
 
+
+  @ExceptionHandler(NoResourceFoundException.class)
+  public ResponseEntity<HttpStatus> handle404Exception(HttpServletRequest request, Exception e){
+    return RESPONSE_NOT_FOUND;
+  }
+
   @SlackNotification
   @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
   @ExceptionHandler(Exception.class)

src/main/java/com/waruru/areyouhere/common/utils/HttpStatusResponseEntity.java

@@ -13,4 +13,5 @@ public class HttpStatusResponseEntity {
     public static final ResponseEntity<HttpStatus> RESPONSE_UNAUTHORIZED = ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
 
     public static final ResponseEntity<HttpStatus> RESPONSE_FORBIDDEN = ResponseEntity.status(HttpStatus.FORBIDDEN).build();
+    public static final ResponseEntity<HttpStatus> RESPONSE_INTERNAL_ERROR = ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
 }

src/main/java/com/waruru/areyouhere/course/domain/repository/CourseRepository.java

@@ -4,8 +4,12 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface CourseRepository extends JpaRepository<Course, Long> {
-    List<Course> findAllByManagerId(Long managerId);
+
+    @Query("SELECT c FROM course c WHERE c.manager.id = :managerId")
+    List<Course> findAllByManagerId(@Param("managerId")Long managerId);
 
 }

src/main/java/com/waruru/areyouhere/course/service/CourseServiceImpl.java

@@ -11,6 +11,8 @@
 import com.waruru.areyouhere.course.domain.repository.CourseRepository;
 import com.waruru.areyouhere.attendee.exception.AttendeesNotUniqueException;
 import com.waruru.areyouhere.course.dto.CourseData;
+import com.waruru.areyouhere.course.exception.CourseNotFoundException;
+import com.waruru.areyouhere.course.exception.UnauthorizedManagerException;
 import com.waruru.areyouhere.manager.domain.entity.Manager;
 import com.waruru.areyouhere.manager.domain.repository.ManagerRepository;
 import com.waruru.areyouhere.session.domain.entity.Session;
@@ -45,7 +47,7 @@ public class CourseServiceImpl implements CourseService {
     public void create(Long managerId, String name, String description, List<AttendeeData> attendees,
                        boolean onlyListNameAllowed) {
         Manager manager = managerRepository.findManagerById(managerId)
-                .orElseThrow(() -> new IllegalArgumentException("Manager not found"));
+                .orElseThrow(() -> new UnauthorizedManagerException("Manager not found"));
 
         Course course = Course.builder()
                 .manager(manager)
@@ -97,10 +99,10 @@ public List<CourseData> getAll(Long managerId) {
     @Override
     public void update(Long managerId, Long courseId, String name, String description, boolean onlyListNameAllowed) {
         Course course = courseRepository.findById(courseId).
-                orElseThrow(() -> new IllegalArgumentException("Course not found"));
+                orElseThrow(() -> new CourseNotFoundException("Course not found"));
 
         if (!course.getManager().getId().equals(managerId)) {
-            throw new IllegalArgumentException("Manager not authorized");
+            throw new UnauthorizedManagerException("Manager not authorized");
         }
 
         course.update(name, description, onlyListNameAllowed);
@@ -115,10 +117,10 @@ public void delete(Long managerId, Long courseId) {
         }
 
         Course course = courseRepository.findById(courseId).
-                orElseThrow(() -> new IllegalArgumentException("Course not found"));
+                orElseThrow(() -> new CourseNotFoundException("Course not found"));
 
         if (!course.getManager().getId().equals(managerId)) {
-            throw new IllegalArgumentException("Manager not authorized");
+            throw new UnauthorizedManagerException("Manager not authorized");
         }
         List<Session> sessions = sessionRepository.findAllByCourseId(courseId);
         attendanceRepository.deleteAllBySessionIds(sessions.stream().map(Session::getId).toList());
@@ -127,11 +129,13 @@ public void delete(Long managerId, Long courseId) {
         courseRepository.delete(course);
     }
 
+
+
     @Override
     @Transactional(readOnly = true)
     public Course get(Long courseId) {
         return courseRepository.findById(courseId).
-                orElseThrow(() -> new IllegalArgumentException("Course not found"));
+                orElseThrow(() -> new CourseNotFoundException("Course not found"));
     }
 
     private boolean isAttendeesUnique(List<String> attendees) {

src/main/java/com/waruru/areyouhere/email/advice/EmailExceptionAdvice.java

@@ -0,0 +1,29 @@
+package com.waruru.areyouhere.email.advice;
+
+
+import com.waruru.areyouhere.common.annotation.SlackNotification;
+import com.waruru.areyouhere.common.error.ErrorResponse;
+import com.waruru.areyouhere.email.exception.EmailSendException;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+// 이메일 전송이 안되는 것은 이메일 서버에 이상이 있으므로 slack에서 처리될 수 있도록 한다.
+@RestControllerAdvice("com.waruru.areyouhere.email")
+@Slf4j
+public class EmailExceptionAdvice {
+
+    @ExceptionHandler(EmailSendException.class)
+    @SlackNotification
+    public ErrorResponse emailSendException(HttpServletRequest request, Exception e){
+        log.error("Internal Server Error", e);
+        StringBuilder sb = new StringBuilder();
+        sb.append(request.getMethod());
+        sb.append(request.getRemoteAddr());
+        sb.append(request.getRequestURL());
+        sb.append(e.getMessage());
+
+        return ErrorResponse.of("INTERNAL SERVER ERROR", sb.toString());
+    }
+}

src/main/java/com/waruru/areyouhere/email/domain/MessageHolder.java

@@ -10,6 +10,6 @@ public class MessageHolder {
 
     public MessageHolder(String title, MessageTemplate messageTemplate, Object... values){
         this.title = title;
-        this.contents = String.format(messageTemplate.getTemplate(), (Object) values);
+        this.contents = String.format(messageTemplate.getTemplate(), values);
     }
 }

src/main/java/com/waruru/areyouhere/email/domain/MessageTemplate.java

@@ -1,8 +1,8 @@
 package com.waruru.areyouhere.email.domain;
 
 public enum MessageTemplate {
-    PASSWORD_RESET("You can reset password by this link: %s"),
-    SIGN_UP("You can verify your email by this link: %s");
+    PASSWORD_RESET("You can reset password by this code: %s"),
+    SIGN_UP("You can verify your email by this code: %s");
 
     private final String template;
 

src/main/java/com/waruru/areyouhere/email/exception/EmailSendException.java

@@ -0,0 +1,23 @@
+package com.waruru.areyouhere.email.exception;
+
+public class EmailSendException extends RuntimeException{
+
+    public EmailSendException() {
+    }
+
+    public EmailSendException(String message) {
+        super(message);
+    }
+
+    public EmailSendException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public EmailSendException(Throwable cause) {
+        super(cause);
+    }
+
+    public EmailSendException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}

src/main/java/com/waruru/areyouhere/email/service/JavaEmailServiceImpl.java

@@ -2,39 +2,92 @@
 
 import com.waruru.areyouhere.email.domain.MessageHolder;
 import com.waruru.areyouhere.email.domain.MessageTemplate;
+import com.waruru.areyouhere.email.exception.EmailSendException;
+import jakarta.mail.Message.RecipientType;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
+import java.io.UnsupportedEncodingException;
+import java.util.Properties;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.stereotype.Service;
 
 @RequiredArgsConstructor
 @Service
 @Slf4j
 public class JavaEmailServiceImpl implements EmailService {
-    private final JavaMailSender emailSender;
 
     @Value("${spring.mail.from}")
     private String from;
+    @Value("${spring.mail.username}")
+    private String username;
+    @Value("${spring.mail.password}")
+    private String password;
+    @Value("${spring.mail.host}")
+    private String host;
+    @Value("${spring.mail.port}")
+    private int port;
+
 
 
     public void sendVerifyEmail(String to, String title, String verificationLink, MessageTemplate messageTemplate) {
         MessageHolder messageHolder = new MessageHolder(title, messageTemplate, verificationLink);
         sendSimpleMessage(to, messageHolder.getTitle(), messageHolder.getContents());
     }
 
-    private void sendSimpleMessage(String to, String title, String content) {
+    private void sendSimpleMessage(String to, String title, String content)  {
         if (from == null || from.isEmpty()) {
             log.info("Email text Test: " + content);
             return;
         }
-        SimpleMailMessage message = new SimpleMailMessage();
-        message.setFrom(from);
-        message.setTo(to);
-        message.setSubject(title);
-        message.setText(content);
-        emailSender.send(message);
+
+        Session session = getSession();
+        try {
+            MimeMessage msg = setMessage(to, from, content, session);
+            doSend(session, msg);
+
+        } catch (MessagingException | UnsupportedEncodingException e) {
+            throw new EmailSendException();
+        }
+
+
+    }
+
+    private void doSend(Session session, MimeMessage msg) throws MessagingException {
+        Transport transport = session.getTransport();
+        transport.connect(host, username, password);
+        transport.sendMessage(msg, msg.getAllRecipients());
+        transport.close();
+    }
+
+    private MimeMessage setMessage(String to, String title, String content, Session session)
+            throws MessagingException, UnsupportedEncodingException {
+        MimeMessage msg = new MimeMessage(session);
+        msg.setFrom(new InternetAddress(from, from));
+        InternetAddress internetAddress = new InternetAddress(to);
+        internetAddress.validate();
+        msg.setRecipient(RecipientType.TO, internetAddress);
+        msg.setSubject(title);
+        msg.setContent(content, "text/html");
+        msg.setHeader("X-SES-CONFIGURATION-SET", "ConfigSet");
+        return msg;
+    }
+
+    private Session getSession(){
+        Properties emailProps = System.getProperties();
+        emailProps.put("mail.transport.protocol", "smtp");
+        emailProps.put("mail.smtp.port", port);
+        emailProps.put("mail.smtp.starttls.required", "true");
+        emailProps.put("mail.smtp.auth.login.disable", "true");
+        emailProps.put("mail.smtp.starttls.enable", "true");
+        emailProps.put("mail.smtp.auth", "true");
+
+        return Session.getDefaultInstance(emailProps);
+
     }
 
 }

src/main/java/com/waruru/areyouhere/manager/controller/ManagerController.java

@@ -101,13 +101,13 @@ public ResponseEntity<HttpStatus> delete(@Login Manager manager) {
     @GetMapping("/email")
     public ResponseEntity<HttpStatus> sendSignUpEmail(@RequestParam String email) {
         managerService.sendEmailForSignUp(email);
-        return RESPONSE_BAD_REQUEST;
+        return RESPONSE_OK;
     }
 
     @GetMapping("/password")
     public ResponseEntity<HttpStatus> sendPasswordEmail(@RequestParam String email) {
         managerService.sendEmailForPasswordReset(email);
-        return RESPONSE_BAD_REQUEST;
+        return RESPONSE_OK;
     }
 
     @PostMapping("/verification")