Merge pull request #14 from Leets-Official/fix/#12/메일-발송-로직-수정

[fix] #12 메일 발송 로직 수정

Author: ay-eonii

build.gradle

@@ -29,6 +29,8 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-mail'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
 
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'

src/main/java/land/leets/domain/application/domain/Application.java

@@ -87,4 +87,8 @@ public class Application extends BaseTimeEntity {
     @Column(columnDefinition = "char(10)")
     @Enumerated(EnumType.STRING)
     private SubmitStatus submitStatus;
+
+    public void updateInfo(LocalDateTime appliedAt) {
+        this.appliedAt = appliedAt;
+    }
 }

src/main/java/land/leets/domain/application/presentation/dto/StatusRequest.java

@@ -1,11 +1,13 @@
 package land.leets.domain.application.presentation.dto;
 
+import jakarta.validation.constraints.NotNull;
 import land.leets.domain.application.type.ApplicationStatus;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
 public class StatusRequest {
+    @NotNull
     private ApplicationStatus applicationStatus;
 }

src/main/java/land/leets/domain/application/usecase/CreateApplicationImpl.java

@@ -4,7 +4,6 @@
 import land.leets.domain.application.domain.repository.ApplicationRepository;
 import land.leets.domain.application.exception.ApplicationAlreadyExistsException;
 import land.leets.domain.application.presentation.dto.ApplicationRequest;
-import land.leets.domain.application.type.SubmitStatus;
 import land.leets.domain.auth.AuthDetails;
 import land.leets.domain.user.domain.User;
 import land.leets.domain.user.domain.repository.UserRepository;
@@ -14,6 +13,8 @@
 
 import java.time.LocalDateTime;
 
+import static land.leets.domain.application.type.SubmitStatus.SUBMIT;
+
 @Service
 @RequiredArgsConstructor
 public class CreateApplicationImpl implements CreateApplication {
@@ -28,15 +29,9 @@ public Application execute(AuthDetails authDetails, ApplicationRequest request)
             throw new ApplicationAlreadyExistsException();
         }
 
-        user.setSid(request.getSid());
-        user.setPhone(request.getPhone());
+        user.updateUserInfo(request.getSid(), request.getPhone());
         userRepository.save(user);
 
-        LocalDateTime appliedAt = null;
-        if (request.getSubmitStatus() == SubmitStatus.SUBMIT) {
-            appliedAt = LocalDateTime.now();
-        }
-
         Application application = Application.builder()
                 .user(user)
                 .name(request.getName())
@@ -56,9 +51,8 @@ public Application execute(AuthDetails authDetails, ApplicationRequest request)
                 .enhancement(request.getEnhancement())
                 .goal(request.getGoal())
                 .submitStatus(request.getSubmitStatus())
-                .appliedAt(appliedAt)
+                .appliedAt(request.getSubmitStatus() == SUBMIT ? LocalDateTime.now() : null)
                 .build();
-
         return applicationRepository.save(application);
     }
 }

src/main/java/land/leets/domain/application/usecase/GetAllApplicationImpl.java

@@ -11,7 +11,6 @@
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -28,7 +27,7 @@ public List<ApplicationResponse> execute() {
                     String phone = application.getUser().getPhone();
                     return applicationMapper.mappingToDto(application, interview, phone);
                 })
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -42,7 +41,7 @@ public List<ApplicationResponse> execute(String position, String status) {
                         String phone = application.getUser().getPhone();
                         return applicationMapper.mappingToDto(application, interview, phone);
                     })
-                    .collect(Collectors.toList());
+                    .toList();
         }
 
         SubmitStatus filter = SubmitStatus.valueOf(status.toUpperCase());
@@ -52,7 +51,6 @@ public List<ApplicationResponse> execute(String position, String status) {
                     String phone = application.getUser().getPhone();
                     return applicationMapper.mappingToDto(application, interview, phone);
                 })
-                .collect(Collectors.toList());
-
+                .toList();
     }
 }

src/main/java/land/leets/domain/application/usecase/UpdateApplicationImpl.java

@@ -5,7 +5,6 @@
 import land.leets.domain.application.exception.ApplicationNotFoundException;
 import land.leets.domain.application.presentation.dto.ApplicationRequest;
 import land.leets.domain.application.presentation.mapper.ApplicationMapper;
-import land.leets.domain.application.type.SubmitStatus;
 import land.leets.domain.auth.AuthDetails;
 import land.leets.domain.user.usecase.UpdateUser;
 import lombok.RequiredArgsConstructor;
@@ -15,6 +14,8 @@
 import java.time.LocalDateTime;
 import java.util.UUID;
 
+import static land.leets.domain.application.type.SubmitStatus.SUBMIT;
+
 @Service
 @RequiredArgsConstructor
 public class UpdateApplicationImpl implements UpdateApplication {
@@ -32,12 +33,8 @@ public Application execute(AuthDetails authDetails, ApplicationRequest request)
         Application application = applicationRepository.findByUser_Uid(uid).orElseThrow(ApplicationNotFoundException::new);
         applicationMapper.updateApplicationFromDto(application, request);
 
-        LocalDateTime appliedAt = null;
-        if (request.getSubmitStatus() == SubmitStatus.SUBMIT) {
-            appliedAt = LocalDateTime.now();
-        }
-        application.setAppliedAt(appliedAt);
-
+        LocalDateTime appliedAt = request.getSubmitStatus() == SUBMIT ? LocalDateTime.now() : null;
+        application.updateInfo(appliedAt);
         return applicationRepository.save(application);
     }
 }

src/main/java/land/leets/domain/interview/exception/InterviewNotFoundException.java

@@ -0,0 +1,10 @@
+package land.leets.domain.interview.exception;
+
+import land.leets.global.error.ErrorCode;
+import land.leets.global.error.exception.ServiceException;
+
+public class InterviewNotFoundException extends ServiceException {
+    public InterviewNotFoundException() {
+        super(ErrorCode.INTERVIEW_NOT_FOUND);
+    }
+}

src/main/java/land/leets/domain/interview/presentation/InterviewController.java

@@ -9,17 +9,23 @@
 import land.leets.domain.interview.domain.Interview;
 import land.leets.domain.interview.presentation.dto.req.FixedInterviewRequest;
 import land.leets.domain.interview.presentation.dto.req.InterviewAttendanceRequest;
+import land.leets.domain.interview.type.HasInterview;
 import land.leets.domain.interview.usecase.UpdateInterview;
+import land.leets.domain.mail.usecase.CreateInterviewRequest;
 import land.leets.global.error.ErrorResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.view.RedirectView;
+
+import java.util.UUID;
 
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/interview")
 @Tag(name = "INTERVIEW")
 public class InterviewController {
     private final UpdateInterview updateInterview;
+    private final CreateInterviewRequest createInterviewRequest;
 
     @Operation(summary = "(유저) 면접 참여 여부 변경", description = "면접 참여 여부를 변경합니다.")
     @ApiResponses({
@@ -29,7 +35,7 @@ public class InterviewController {
             @ApiResponse(responseCode = "404", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
             @ApiResponse(responseCode = "500", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
     })
-    @PostMapping()
+    @PatchMapping
     public Interview update(@RequestBody InterviewAttendanceRequest request) {
         return updateInterview.byUser(request);
     }
@@ -46,4 +52,20 @@ public Interview update(@RequestBody InterviewAttendanceRequest request) {
     public Interview update(@PathVariable Long id, @RequestBody FixedInterviewRequest request) {
         return updateInterview.byAdmin(id, request);
     }
+
+    @Operation(summary = "(유저) 면접 여부 변경 요청 생성하기", description = "면접 참가 여부 변경 요청을 생성합니다.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200"),
+            @ApiResponse(responseCode = "400", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+            @ApiResponse(responseCode = "403", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+            @ApiResponse(responseCode = "404", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+            @ApiResponse(responseCode = "500", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+    })
+    @GetMapping
+    public RedirectView hasInterview(@RequestParam UUID uid, @RequestParam HasInterview hasInterview) {
+        createInterviewRequest.execute(uid, hasInterview);
+        RedirectView redirectView = new RedirectView();
+        redirectView.setUrl("https://www.leets.land");
+        return redirectView;
+    }
 }

src/main/java/land/leets/domain/interview/presentation/dto/req/InterviewAttendanceRequest.java

@@ -5,11 +5,13 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.UUID;
+
 @Getter
 @AllArgsConstructor
 public class InterviewAttendanceRequest {
     @NotNull
-    private String email;
+    private UUID uid;
 
     @NotNull
     private HasInterview hasInterview;

src/main/java/land/leets/domain/interview/usecase/GetInterviewDetailsImpl.java

@@ -3,6 +3,7 @@
 import land.leets.domain.application.domain.Application;
 import land.leets.domain.interview.domain.Interview;
 import land.leets.domain.interview.domain.repository.InterviewRepository;
+import land.leets.domain.interview.exception.InterviewNotFoundException;
 import land.leets.domain.interview.presentation.dto.res.InterviewDetailsResponse;
 import land.leets.domain.interview.presentation.mapper.InterviewMapper;
 import lombok.RequiredArgsConstructor;
@@ -16,7 +17,7 @@ public class GetInterviewDetailsImpl implements GetInterviewDetails {
 
     @Override
     public InterviewDetailsResponse execute(Application application) {
-        Interview interview = interviewRepository.findByApplication(application).orElseThrow(); //TODO 예외처리
+        Interview interview = interviewRepository.findByApplication(application).orElseThrow(InterviewNotFoundException::new);
         return interviewMapper.mappingDetailsToDto(interview);
     }
 }