Merge pull request #274 from solid-connection/release

[DEPLOY] v1.0.4

Author: nayonsoso

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Gyuhyeok99 @nayonsoso @wibaek

.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: CI with Gradle
+
+on:
+  pull_request:
+    branches: [ "develop", "release", "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      checks: write
+
+    steps:
+      - name: Checkout the code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Make Gradle wrapper executable
+        run: chmod +x ./gradlew
+
+      - name: Build with Gradle Wrapper
+        run: ./gradlew build
+
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v5
+        if: success() || failure()
+        with:
+          report_paths: '**/build/test-results/test/TEST-*.xml'

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

@@ -6,6 +6,7 @@
 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.custom.security.annotation.RequireAdminAccess;
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -32,12 +33,13 @@ public ResponseEntity<ApplicationSubmissionResponse> apply(
             @AuthorizedUser SiteUser siteUser,
             @Valid @RequestBody ApplyRequest applyRequest
     ) {
-        boolean result = applicationSubmissionService.apply(siteUser, applyRequest);
+        ApplicationSubmissionResponse applicationSubmissionResponse = applicationSubmissionService.apply(siteUser, applyRequest);
         return ResponseEntity
                 .status(HttpStatus.OK)
-                .body(new ApplicationSubmissionResponse(result));
+                .body(applicationSubmissionResponse);
     }
 
+    @RequireAdminAccess
     @GetMapping
     public ResponseEntity<ApplicationsResponse> getApplicants(
             @AuthorizedUser SiteUser siteUser,

src/main/java/com/example/solidconnection/application/domain/Application.java

@@ -46,7 +46,7 @@ public class Application {
     @Column(length = 100)
     private String nicknameForApply;
 
-    @Column(columnDefinition = "int not null default 0")
+    @Column(columnDefinition = "int not null default 1")
     private Integer updateCount;
 
     @Column(length = 50, nullable = false)
@@ -76,7 +76,7 @@ public Application(
         this.gpa = gpa;
         this.languageTest = languageTest;
         this.term = term;
-        this.updateCount = 0;
+        this.updateCount = 1;
         this.verifyStatus = PENDING;
     }
 
@@ -115,7 +115,7 @@ public Application(
         this.gpa = gpa;
         this.languageTest = languageTest;
         this.term = term;
-        this.updateCount = 0;
+        this.updateCount = 1;
         this.firstChoiceUniversity = firstChoiceUniversity;
         this.secondChoiceUniversity = secondChoiceUniversity;
         this.thirdChoiceUniversity = thirdChoiceUniversity;

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

@@ -1,5 +1,11 @@
 package com.example.solidconnection.application.dto;
 
+import com.example.solidconnection.application.domain.Application;
+
 public record ApplicationSubmissionResponse(
-        boolean isSuccess) {
+        int applyCount
+) {
+    public static ApplicationSubmissionResponse from(Application application) {
+        return new ApplicationSubmissionResponse(application.getUpdateCount());
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.example.solidconnection.application.service;
 
 import com.example.solidconnection.application.domain.Application;
+import com.example.solidconnection.application.dto.ApplicationSubmissionResponse;
 import com.example.solidconnection.application.dto.ApplyRequest;
 import com.example.solidconnection.application.dto.UniversityChoiceRequest;
 import com.example.solidconnection.application.repository.ApplicationRepository;
@@ -49,15 +50,10 @@ public class ApplicationSubmissionService {
             key = {"applications:all"},
             cacheManager = "customCacheManager"
     )
-    public boolean apply(SiteUser siteUser, ApplyRequest applyRequest) {
+    public ApplicationSubmissionResponse apply(SiteUser siteUser, ApplyRequest applyRequest) {
         UniversityChoiceRequest universityChoiceRequest = applyRequest.universityChoiceRequest();
-
-        Long gpaScoreId = applyRequest.gpaScoreId();
-        Long languageTestScoreId = applyRequest.languageTestScoreId();
-        GpaScore gpaScore = getValidGpaScore(siteUser, gpaScoreId);
-        LanguageTestScore languageTestScore = getValidLanguageTestScore(siteUser, languageTestScoreId);
-
-        Optional<Application> application = applicationRepository.findBySiteUserAndTerm(siteUser, term);
+        GpaScore gpaScore = getValidGpaScore(siteUser, applyRequest.gpaScoreId());
+        LanguageTestScore languageTestScore = getValidLanguageTestScore(siteUser, applyRequest.languageTestScoreId());
 
         UniversityInfoForApply firstChoiceUniversity = universityInfoForApplyRepository
                 .getUniversityInfoForApplyByIdAndTerm(universityChoiceRequest.firstChoiceUniversityId(), term);
@@ -68,22 +64,19 @@ public boolean apply(SiteUser siteUser, ApplyRequest applyRequest) {
                 .map(id -> universityInfoForApplyRepository.getUniversityInfoForApplyByIdAndTerm(id, term))
                 .orElse(null);
 
-        if (application.isEmpty()) {
-            Application newApplication = new Application(siteUser, gpaScore.getGpa(), languageTestScore.getLanguageTest(),
-                    term, firstChoiceUniversity, secondChoiceUniversity, thirdChoiceUniversity, getRandomNickname());
-            newApplication.setVerifyStatus(VerifyStatus.APPROVED);
-            applicationRepository.save(newApplication);
-        } else {
-            Application before = application.get();
-            validateUpdateLimitNotExceed(before);
-            before.setIsDeleteTrue(); // 기존 이력 soft delete 수행한다.
-
-            Application newApplication = new Application(siteUser, gpaScore.getGpa(), languageTestScore.getLanguageTest(),
-                    term, before.getUpdateCount() + 1, firstChoiceUniversity, secondChoiceUniversity, thirdChoiceUniversity, getRandomNickname());
-            newApplication.setVerifyStatus(VerifyStatus.APPROVED);
-            applicationRepository.save(newApplication);
-        }
-        return true;
+        Optional<Application> existingApplication = applicationRepository.findBySiteUserAndTerm(siteUser, term);
+        int updateCount = existingApplication
+                .map(application -> {
+                    validateUpdateLimitNotExceed(application);
+                    application.setIsDeleteTrue();
+                    return application.getUpdateCount() + 1;
+                })
+                .orElse(1);
+        Application newApplication = new Application(siteUser, gpaScore.getGpa(), languageTestScore.getLanguageTest(),
+                term, updateCount, firstChoiceUniversity, secondChoiceUniversity, thirdChoiceUniversity, getRandomNickname());
+        newApplication.setVerifyStatus(VerifyStatus.APPROVED);
+        applicationRepository.save(newApplication);
+        return ApplicationSubmissionResponse.from(newApplication);
     }
 
     private GpaScore getValidGpaScore(SiteUser siteUser, Long gpaScoreId) {

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

@@ -9,20 +9,17 @@
 import org.apache.tomcat.util.codec.binary.Base64;
 import org.springframework.stereotype.Component;
 
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
+import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.Date;
-import java.util.stream.Collectors;
 
 import static com.example.solidconnection.custom.exception.ErrorCode.FAILED_TO_READ_APPLE_PRIVATE_KEY;
 
 /*
- * 애플 OAuth 에 필요하 클라이언트 시크릿은 매번 동적으로 생성해야 한다.
+ * 애플 OAuth 에 필요한 클라이언트 시크릿은 매번 동적으로 생성해야 한다.
  * 클라이언트 시크릿은 애플 개발자 계정에서 발급받은 개인키(*.p8)를 사용하여 JWT 를 생성한다.
  * https://developer.apple.com/documentation/accountorganizationaldatasharing/creating-a-client-secret
  * */
@@ -32,14 +29,13 @@ public class AppleOAuthClientSecretProvider {
 
     private static final String KEY_ID_HEADER = "kid";
     private static final long TOKEN_DURATION = 1000 * 60 * 10; // 10min
-    private static final String SECRET_KEY_PATH = "secret/AppleOAuthKey.p8";
 
     private final AppleOAuthClientProperties appleOAuthClientProperties;
     private PrivateKey privateKey;
 
     @PostConstruct
     private void initPrivateKey() {
-        privateKey = readPrivateKey();
+        privateKey = loadPrivateKey();
     }
 
     public String generateClientSecret() {
@@ -57,16 +53,14 @@ public String generateClientSecret() {
                 .compact();
     }
 
-    private PrivateKey readPrivateKey() {
-        try (InputStream is = getClass().getClassLoader().getResourceAsStream(SECRET_KEY_PATH);
-             BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
-
-            String secretKey = reader.lines().collect(Collectors.joining("\n"));
+    private PrivateKey loadPrivateKey() {
+        try {
+            String secretKey = appleOAuthClientProperties.secretKey();
             byte[] encoded = Base64.decodeBase64(secretKey);
             PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(encoded);
             KeyFactory keyFactory = KeyFactory.getInstance("EC");
             return keyFactory.generatePrivate(keySpec);
-        } catch (Exception e) {
+        } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
             throw new CustomException(FAILED_TO_READ_APPLE_PRIVATE_KEY);
         }
     }

src/main/java/com/example/solidconnection/config/client/AppleOAuthClientProperties.java

@@ -10,6 +10,7 @@ public record AppleOAuthClientProperties(
         String publicKeyUrl,
         String clientId,
         String teamId,
-        String keyId
+        String keyId,
+        String secretKey
 ) {
 }

src/main/java/com/example/solidconnection/custom/exception/ErrorCode.java

@@ -5,7 +5,7 @@
 import org.springframework.http.HttpStatus;
 
 import static com.example.solidconnection.application.service.ApplicationSubmissionService.APPLICATION_UPDATE_COUNT_LIMIT;
-import static com.example.solidconnection.siteuser.service.SiteUserService.MIN_DAYS_BETWEEN_NICKNAME_CHANGES;
+import static com.example.solidconnection.siteuser.service.MyPageService.MIN_DAYS_BETWEEN_NICKNAME_CHANGES;
 
 @Getter
 @AllArgsConstructor

src/main/java/com/example/solidconnection/custom/security/annotation/RequireAdminAccess.java

@@ -0,0 +1,11 @@
+package com.example.solidconnection.custom.security.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RequireAdminAccess {
+}