Merge pull request #199 from solid-connection/chore/release-sync

[RELEASE] 250214 릴리즈

Author: wibaek

.github/ISSUE_TEMPLATE/refactor_request.md

@@ -0,0 +1,28 @@
+---
+name: Refactor request
+about: Suggest an refactor for this project
+title: ''
+labels: refactor
+assignees: ''
+
+---
+
+## 어떤 부분을 리팩터링하려 하나요?
+
+> 리팩터링하려는 부분에 대해 간결하게 설명해주세요
+
+### AS-IS
+- as-is
+- as-is
+
+### TO-BE
+- to-be
+- to-be
+
+## 작업 상세 내용
+
+- [ ] TODO
+- [ ] TODO
+- [ ] TODO
+
+## 참고할만한 자료(선택)

build.gradle

@@ -37,17 +37,24 @@ dependencies {//todo: 안쓰는 의존성이나 deprecated된 의존성 제거
     implementation 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
     implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.micrometer:micrometer-registry-prometheus'
+    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
 
+    // Lombok
     compileOnly 'org.projectlombok:lombok:1.18.26'
     annotationProcessor 'org.projectlombok:lombok'
+
+    // Test
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'com.h2database:h2:2.2.224'
+    testImplementation 'org.mockito:mockito-core:3.3.3'
     testImplementation 'io.rest-assured:rest-assured:5.4.0'
 
-    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+    // Testcontainers
+    testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'org.testcontainers:mysql'
+
     annotationProcessor(
             'com.querydsl:querydsl-apt:5.0.0:jakarta',
             'jakarta.persistence:jakarta.persistence-api:3.1.0',

src/main/java/com/example/solidconnection/SolidConnectionApplication.java

@@ -2,10 +2,12 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+@ConfigurationPropertiesScan
 @EnableScheduling
 @EnableJpaAuditing
 @EnableCaching

src/main/java/com/example/solidconnection/application/controller/ApplicationController.java

@@ -5,6 +5,8 @@
 import com.example.solidconnection.application.dto.ApplyRequest;
 import com.example.solidconnection.application.service.ApplicationQueryService;
 import com.example.solidconnection.application.service.ApplicationSubmissionService;
+import com.example.solidconnection.custom.resolver.AuthorizedUser;
+import com.example.solidconnection.siteuser.domain.SiteUser;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -16,8 +18,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.security.Principal;
-
 @RequiredArgsConstructor
 @RequestMapping("/application")
 @RestController
@@ -29,30 +29,33 @@ public class ApplicationController {
     // 지원서 제출하기 api
     @PostMapping()
     public ResponseEntity<ApplicationSubmissionResponse> apply(
-            Principal principal,
-            @Valid @RequestBody ApplyRequest applyRequest) {
-        boolean result = applicationSubmissionService.apply(principal.getName(), applyRequest);
+            @AuthorizedUser SiteUser siteUser,
+            @Valid @RequestBody ApplyRequest applyRequest
+    ) {
+        boolean result = applicationSubmissionService.apply(siteUser, applyRequest);
         return ResponseEntity
                 .status(HttpStatus.OK)
                 .body(new ApplicationSubmissionResponse(result));
     }
 
     @GetMapping
     public ResponseEntity<ApplicationsResponse> getApplicants(
-            Principal principal,
+            @AuthorizedUser SiteUser siteUser,
             @RequestParam(required = false, defaultValue = "") String region,
-            @RequestParam(required = false, defaultValue = "") String keyword) {
-        applicationQueryService.validateSiteUserCanViewApplicants(principal.getName());
-        ApplicationsResponse result = applicationQueryService.getApplicants(principal.getName(), region, keyword);
+            @RequestParam(required = false, defaultValue = "") String keyword
+    ) {
+        applicationQueryService.validateSiteUserCanViewApplicants(siteUser);
+        ApplicationsResponse result = applicationQueryService.getApplicants(siteUser, region, keyword);
         return ResponseEntity
                 .ok(result);
     }
 
     @GetMapping("/competitors")
     public ResponseEntity<ApplicationsResponse> getApplicantsForUserCompetitors(
-            Principal principal) {
-        applicationQueryService.validateSiteUserCanViewApplicants(principal.getName());
-        ApplicationsResponse result = applicationQueryService.getApplicantsByUserApplications(principal.getName());
+            @AuthorizedUser SiteUser siteUser
+    ) {
+        applicationQueryService.validateSiteUserCanViewApplicants(siteUser);
+        ApplicationsResponse result = applicationQueryService.getApplicantsByUserApplications(siteUser);
         return ResponseEntity
                 .ok(result);
     }

src/main/java/com/example/solidconnection/application/dto/ApplyRequest.java

@@ -1,14 +1,17 @@
 package com.example.solidconnection.application.dto;
 
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 
 public record ApplyRequest(
+
         @NotNull(message = "gpa score id를 입력해주세요.")
         Long gpaScoreId,
 
         @NotNull(message = "language test score id를 입력해주세요.")
         Long languageTestScoreId,
 
+        @Valid
         UniversityChoiceRequest universityChoiceRequest
 ) {
 }

src/main/java/com/example/solidconnection/application/dto/UniversityChoiceRequest.java

@@ -1,11 +1,10 @@
 package com.example.solidconnection.application.dto;
 
-import jakarta.validation.constraints.NotNull;
+import com.example.solidconnection.custom.validation.annotation.ValidUniversityChoice;
 
+@ValidUniversityChoice
 public record UniversityChoiceRequest(
-        @NotNull(message = "1지망 대학교를 입력해주세요.")
         Long firstChoiceUniversityId,
-
         Long secondChoiceUniversityId,
         Long thirdChoiceUniversityId) {
 }

src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java

@@ -8,7 +8,6 @@
 import com.example.solidconnection.cache.annotation.ThunderingHerdCaching;
 import com.example.solidconnection.custom.exception.CustomException;
 import com.example.solidconnection.siteuser.domain.SiteUser;
-import com.example.solidconnection.siteuser.repository.SiteUserRepository;
 import com.example.solidconnection.type.VerifyStatus;
 import com.example.solidconnection.university.domain.University;
 import com.example.solidconnection.university.domain.UniversityInfoForApply;
@@ -34,7 +33,6 @@ public class ApplicationQueryService {
 
     private final ApplicationRepository applicationRepository;
     private final UniversityInfoForApplyRepository universityInfoForApplyRepository;
-    private final SiteUserRepository siteUserRepository;
     private final UniversityFilterRepositoryImpl universityFilterRepository;
 
     @Value("${university.term}")
@@ -49,9 +47,7 @@ public class ApplicationQueryService {
      * */
     @Transactional(readOnly = true)
     @ThunderingHerdCaching(key = "application:query:{1}:{2}", cacheManager = "customCacheManager", ttlSec = 86400)
-    public ApplicationsResponse getApplicants(String email, String regionCode, String keyword) {
-        SiteUser siteUser = siteUserRepository.getByEmail(email);
-
+    public ApplicationsResponse getApplicants(SiteUser siteUser, String regionCode, String keyword) {
         // 국가와 키워드와 지역을 통해 대학을 필터링한다.
         List<University> universities
                 = universityFilterRepository.findByRegionCodeAndKeywords(regionCode, List.of(keyword));
@@ -64,9 +60,7 @@ public ApplicationsResponse getApplicants(String email, String regionCode, Strin
     }
 
     @Transactional(readOnly = true)
-    public ApplicationsResponse getApplicantsByUserApplications(String email) {
-        SiteUser siteUser = siteUserRepository.getByEmail(email);
-
+    public ApplicationsResponse getApplicantsByUserApplications(SiteUser siteUser) {
         Application userLatestApplication = applicationRepository.getApplicationBySiteUserAndTerm(siteUser, term);
         List<University> userAppliedUniversities = Arrays.asList(
                         Optional.ofNullable(userLatestApplication.getFirstChoiceUniversity())
@@ -91,8 +85,7 @@ public ApplicationsResponse getApplicantsByUserApplications(String email) {
     // 학기별로 상태가 관리된다.
     // 금학기에 지원이력이 있는 사용자만 지원정보를 확인할 수 있도록 한다.
     @Transactional(readOnly = true)
-    public void validateSiteUserCanViewApplicants(String email) {
-        SiteUser siteUser = siteUserRepository.getByEmail(email);
+    public void validateSiteUserCanViewApplicants(SiteUser siteUser) {
         VerifyStatus verifyStatus = applicationRepository.getApplicationBySiteUserAndTerm(siteUser, term).getVerifyStatus();
         if (verifyStatus != VerifyStatus.APPROVED) {
             throw new CustomException(APPLICATION_NOT_APPROVED);

src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java

@@ -10,7 +10,6 @@
 import com.example.solidconnection.score.repository.GpaScoreRepository;
 import com.example.solidconnection.score.repository.LanguageTestScoreRepository;
 import com.example.solidconnection.siteuser.domain.SiteUser;
-import com.example.solidconnection.siteuser.repository.SiteUserRepository;
 import com.example.solidconnection.type.VerifyStatus;
 import com.example.solidconnection.university.domain.UniversityInfoForApply;
 import com.example.solidconnection.university.repository.UniversityInfoForApplyRepository;
@@ -19,7 +18,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -38,7 +39,6 @@ public class ApplicationSubmissionService {
 
     private final ApplicationRepository applicationRepository;
     private final UniversityInfoForApplyRepository universityInfoForApplyRepository;
-    private final SiteUserRepository siteUserRepository;
     private final GpaScoreRepository gpaScoreRepository;
     private final LanguageTestScoreRepository languageTestScoreRepository;
 
@@ -48,10 +48,8 @@ public class ApplicationSubmissionService {
     // 학점 및 어학성적이 모두 유효한 경우에만 지원서 등록이 가능하다.
     // 기존에 있던 status field 우선 APRROVED로 입력시킨다.
     @Transactional
-    public boolean apply(String email, ApplyRequest applyRequest) {
-        SiteUser siteUser = siteUserRepository.getByEmail(email);
+    public boolean apply(SiteUser siteUser, ApplyRequest applyRequest) {
         UniversityChoiceRequest universityChoiceRequest = applyRequest.universityChoiceRequest();
-        validateUniversityChoices(universityChoiceRequest);
 
         Long gpaScoreId = applyRequest.gpaScoreId();
         Long languageTestScoreId = applyRequest.languageTestScoreId();
@@ -119,23 +117,4 @@ private void validateUpdateLimitNotExceed(Application application) {
             throw new CustomException(APPLY_UPDATE_LIMIT_EXCEED);
         }
     }
-
-    // 입력값 유효성 검증
-    private void validateUniversityChoices(UniversityChoiceRequest universityChoiceRequest) {
-        Set<Long> uniqueUniversityIds = new HashSet<>();
-        uniqueUniversityIds.add(universityChoiceRequest.firstChoiceUniversityId());
-        if (universityChoiceRequest.secondChoiceUniversityId() != null) {
-            addUniversityChoice(uniqueUniversityIds, universityChoiceRequest.secondChoiceUniversityId());
-        }
-        if (universityChoiceRequest.thirdChoiceUniversityId() != null) {
-            addUniversityChoice(uniqueUniversityIds, universityChoiceRequest.thirdChoiceUniversityId());
-        }
-    }
-
-    private void addUniversityChoice(Set<Long> uniqueUniversityIds, Long universityId) {
-        boolean notAdded = !uniqueUniversityIds.add(universityId);
-        if (notAdded) {
-            throw new CustomException(CANT_APPLY_FOR_SAME_UNIVERSITY);
-        }
-    }
 }

src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java

@@ -0,0 +1,83 @@
+package com.example.solidconnection.auth.client;
+
+import com.example.solidconnection.auth.dto.oauth.AppleTokenDto;
+import com.example.solidconnection.auth.dto.oauth.AppleUserInfoDto;
+import com.example.solidconnection.config.client.AppleOAuthClientProperties;
+import com.example.solidconnection.custom.exception.CustomException;
+import io.jsonwebtoken.Jwts;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.security.PublicKey;
+import java.util.Objects;
+
+import static com.example.solidconnection.custom.exception.ErrorCode.APPLE_AUTHORIZATION_FAILED;
+import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_APPLE_ID_TOKEN;
+
+/*
+ * 애플 인증을 위한 OAuth2 클라이언트
+ * https://developer.apple.com/documentation/signinwithapplerestapi/generate_and_validate_tokens
+ * */
+@Component
+@RequiredArgsConstructor
+public class AppleOAuthClient {
+
+    private final RestTemplate restTemplate;
+    private final AppleOAuthClientProperties properties;
+    private final AppleOAuthClientSecretProvider clientSecretProvider;
+    private final ApplePublicKeyProvider publicKeyProvider;
+
+    public AppleUserInfoDto processOAuth(String code) {
+        String idToken = requestIdToken(code);
+        PublicKey applePublicKey = publicKeyProvider.getApplePublicKey(idToken);
+        return new AppleUserInfoDto(parseEmailFromToken(applePublicKey, idToken));
+    }
+
+    public String requestIdToken(String code) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        MultiValueMap<String, String> formData = buildFormData(code);
+
+        try {
+            ResponseEntity<AppleTokenDto> response = restTemplate.exchange(
+                    properties.tokenUrl(),
+                    HttpMethod.POST,
+                    new HttpEntity<>(formData, headers),
+                    AppleTokenDto.class
+            );
+            return Objects.requireNonNull(response.getBody()).idToken();
+        } catch (Exception e) {
+            throw new CustomException(APPLE_AUTHORIZATION_FAILED, e.getMessage());
+        }
+    }
+
+    private MultiValueMap<String, String> buildFormData(String code) {
+        MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
+        formData.add("client_id", properties.clientId());
+        formData.add("client_secret", clientSecretProvider.generateClientSecret());
+        formData.add("code", code);
+        formData.add("grant_type", "authorization_code");
+        formData.add("redirect_uri", properties.redirectUrl());
+        return formData;
+    }
+
+    private String parseEmailFromToken(PublicKey applePublicKey, String idToken) {
+        try {
+            return Jwts.parser()
+                    .setSigningKey(applePublicKey)
+                    .parseClaimsJws(idToken)
+                    .getBody()
+                    .get("email", String.class);
+        } catch (Exception e) {
+            throw new CustomException(INVALID_APPLE_ID_TOKEN);
+        }
+    }
+}