[RELEASE] 251103 릴리즈

fix: PostRepository & CommentRepository의 일부 메서드의 정렬 순서 오류 해결 (#522) 
refactor: 이메일 유니크키 제거
refactor: 엔티티가 BaseEntity를 상속하도록 (#524) 
fix: BaseEntity 관련 마이그레이션 파일 수정 (#530) 
feat: 멘토 승격 api 구현 (#532) 
fix: 대학교 중복 오류 수정 (#510) 
refactor: 불필요한 로그 삭제 (#543)
fix: 운영환경 8081 포트 설정 추가 (#542) 
fix: dev환경 디비명 변경 (#546)
refactor: 불필요한 로그 삭제 (#547) 
refactor: 학기를 테이블로 관리하도록 변경 (#526) 
refactor: 모의지원 시 지원한 대학 정보 응답 추가 (#539)

Author: Gyuhyeok99

docker-compose.dev.yml

@@ -6,18 +6,16 @@ services:
     container_name: redis
     ports:
       - "6379:6379"
-    network_mode: host
 
   redis-exporter:
     image: oliver006/redis_exporter
     container_name: redis-exporter
     ports:
       - "9121:9121"
     environment:
-      REDIS_ADDR: "localhost:6379"
+      REDIS_ADDR: "redis:6379"
     depends_on:
       - redis
-    network_mode: host
 
   solid-connection-dev:
     build:
@@ -26,13 +24,15 @@ services:
     container_name: solid-connection-dev
     ports:
       - "8080:8080"
+      - "8081:8081"
     environment:
       - SPRING_PROFILES_ACTIVE=dev
+      - SPRING_DATA_REDIS_HOST=redis
+      - SPRING_DATA_REDIS_PORT=6379
     volumes:
       - ./logs:/var/log/spring
     depends_on:
       - redis
-    network_mode: host
 
   alloy:
     image: grafana/alloy:latest

docker-compose.prod.yml

@@ -24,6 +24,7 @@ services:
     container_name: solid-connection-server
     ports:
       - "8080:8080"
+      - "8081:8081"
     environment:
       - SPRING_PROFILES_ACTIVE=prod
       - SPRING_DATA_REDIS_HOST=redis

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

@@ -2,6 +2,7 @@
 
 import static com.example.solidconnection.common.VerifyStatus.PENDING;
 
+import com.example.solidconnection.common.BaseEntity;
 import com.example.solidconnection.common.VerifyStatus;
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import jakarta.persistence.Column;
@@ -27,15 +28,15 @@
 @Entity
 @Table(indexes = {
         @Index(name = "idx_app_user_term_delete",
-                columnList = "site_user_id, term, is_delete"),
+                columnList = "site_user_id, term_id, is_delete"),
         @Index(name = "idx_app_first_choice_search",
-                columnList = "verify_status, term, is_delete, first_choice_university_info_for_apply_id"),
+                columnList = "verify_status, term_id, is_delete, first_choice_university_info_for_apply_id"),
         @Index(name = "idx_app_second_choice_search",
-                columnList = "verify_status, term, is_delete, second_choice_university_info_for_apply_id"),
+                columnList = "verify_status, term_id, is_delete, second_choice_university_info_for_apply_id"),
         @Index(name = "idx_app_third_choice_search",
-                columnList = "verify_status, term, is_delete, third_choice_university_info_for_apply_id")
+                columnList = "verify_status, term_id, is_delete, third_choice_university_info_for_apply_id")
 })
-public class Application {
+public class Application extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -58,8 +59,8 @@ public class Application {
     @Column(columnDefinition = "int not null default 1", name = "update_count")
     private Integer updateCount;
 
-    @Column(length = 50, nullable = false, name = "term")
-    private String term;
+    @Column(nullable = false, name = "term_id")
+    private long termId;
 
     @Column(name = "is_delete")
     private boolean isDelete = false;
@@ -80,11 +81,11 @@ public Application(
             SiteUser siteUser,
             Gpa gpa,
             LanguageTest languageTest,
-            String term) {
+            long termId) {
         this.siteUserId = siteUser.getId();
         this.gpa = gpa;
         this.languageTest = languageTest;
-        this.term = term;
+        this.termId = termId;
         this.updateCount = 1;
         this.verifyStatus = PENDING;
     }
@@ -93,7 +94,7 @@ public Application(
             SiteUser siteUser,
             Gpa gpa,
             LanguageTest languageTest,
-            String term,
+            long termId,
             Integer updateCount,
             long firstChoiceUnivApplyInfoId,
             Long secondChoiceUnivApplyInfoId,
@@ -102,7 +103,7 @@ public Application(
         this.siteUserId = siteUser.getId();
         this.gpa = gpa;
         this.languageTest = languageTest;
-        this.term = term;
+        this.termId = termId;
         this.updateCount = updateCount;
         this.firstChoiceUnivApplyInfoId = firstChoiceUnivApplyInfoId;
         this.secondChoiceUnivApplyInfoId = secondChoiceUnivApplyInfoId;
@@ -115,15 +116,15 @@ public Application(
             SiteUser siteUser,
             Gpa gpa,
             LanguageTest languageTest,
-            String term,
+            long termId,
             long firstChoiceUnivApplyInfoId,
             Long secondChoiceUnivApplyInfoId,
             Long thirdChoiceUnivApplyInfoId,
             String nicknameForApply) {
         this.siteUserId = siteUser.getId();
         this.gpa = gpa;
         this.languageTest = languageTest;
-        this.term = term;
+        this.termId = termId;
         this.updateCount = 1;
         this.firstChoiceUnivApplyInfoId = firstChoiceUnivApplyInfoId;
         this.secondChoiceUnivApplyInfoId = secondChoiceUnivApplyInfoId;

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

@@ -1,12 +1,20 @@
 package com.example.solidconnection.application.dto;
 
 import com.example.solidconnection.application.domain.Application;
+import com.example.solidconnection.university.domain.UnivApplyInfo;
+import java.util.List;
 
 public record ApplicationSubmissionResponse(
-        int applyCount
+        int totalApplyCount,
+        int applyCount,
+        UnivApplyInfoResponse appliedUniversities
 ) {
 
-    public static ApplicationSubmissionResponse from(Application application) {
-        return new ApplicationSubmissionResponse(application.getUpdateCount());
+    public static ApplicationSubmissionResponse of(int totalApplyCount, Application application, List<UnivApplyInfo> uniApplyInfos) {
+        return new ApplicationSubmissionResponse(
+                totalApplyCount,
+                application.getUpdateCount(),
+                UnivApplyInfoResponse.of(application, uniApplyInfos)
+        );
     }
 }

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

@@ -0,0 +1,41 @@
+package com.example.solidconnection.application.dto;
+
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
+
+import com.example.solidconnection.application.domain.Application;
+import com.example.solidconnection.university.domain.UnivApplyInfo;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public record UnivApplyInfoResponse(
+
+        @JsonProperty("firstChoiceUniversity")
+        String firstChoiceUnivApplyInfo,
+
+        @JsonProperty("secondChoiceUniversity")
+        @JsonInclude(NON_NULL)
+        String secondChoiceUnivApplyInfo,
+
+        @JsonProperty("thirdChoiceUniversity")
+        @JsonInclude(NON_NULL)
+        String thirdChoiceUnivApplyInfo) {
+
+    public static UnivApplyInfoResponse of(Application application, List<UnivApplyInfo> univApplyInfos) {
+        Map<Long, String> univApplyInfoMap = univApplyInfos.stream()
+                .collect(Collectors.toMap(
+                        UnivApplyInfo::getId,
+                        UnivApplyInfo::getKoreanName
+                ));
+
+        return new UnivApplyInfoResponse(
+                univApplyInfoMap.get(application.getFirstChoiceUnivApplyInfoId()),
+                application.getSecondChoiceUnivApplyInfoId() != null
+                        ? univApplyInfoMap.get(application.getSecondChoiceUnivApplyInfoId()) : null,
+                application.getThirdChoiceUnivApplyInfoId() != null
+                        ? univApplyInfoMap.get(application.getThirdChoiceUnivApplyInfoId()) : null
+        );
+    }
+}

src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java

@@ -22,22 +22,22 @@ public interface ApplicationRepository extends JpaRepository<Application, Long>
                OR a.secondChoiceUnivApplyInfoId IN :univApplyInfoIds
                OR a.thirdChoiceUnivApplyInfoId IN :univApplyInfoIds)
                AND a.verifyStatus = :status
-               AND a.term = :term
+               AND a.termId = :termId
                AND a.isDelete = false
            """)
-    List<Application> findAllByUnivApplyInfoIds(@Param("univApplyInfoIds") List<Long> univApplyInfoIds, @Param("status") VerifyStatus status, @Param("term") String term);
+    List<Application> findAllByUnivApplyInfoIds(@Param("univApplyInfoIds") List<Long> univApplyInfoIds, @Param("status") VerifyStatus status, @Param("termId") long termId);
 
     @Query("""
            SELECT a
            FROM Application a
            WHERE a.siteUserId = :siteUserId
-               AND a.term = :term
+               AND a.termId = :termId
                AND a.isDelete = false
            """)
-    Optional<Application> findBySiteUserIdAndTerm(@Param("siteUserId") long siteUserId, @Param("term") String term);
+    Optional<Application> findBySiteUserIdAndTermId(@Param("siteUserId") long siteUserId, @Param("termId") long termId);
 
-    default Application getApplicationBySiteUserIdAndTerm(long siteUserId, String term) {
-        return findBySiteUserIdAndTerm(siteUserId, term)
+    default Application getApplicationBySiteUserIdAndTermId(long siteUserId, long termId) {
+        return findBySiteUserIdAndTermId(siteUserId, termId)
                 .orElseThrow(() -> new CustomException(APPLICATION_NOT_FOUND));
     }
 }

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

@@ -1,6 +1,7 @@
 package com.example.solidconnection.application.service;
 
 import static com.example.solidconnection.common.exception.ErrorCode.APPLICATION_NOT_APPROVED;
+import static com.example.solidconnection.common.exception.ErrorCode.CURRENT_TERM_NOT_FOUND;
 import static com.example.solidconnection.common.exception.ErrorCode.USER_NOT_FOUND;
 
 import com.example.solidconnection.application.domain.Application;
@@ -11,9 +12,12 @@
 import com.example.solidconnection.common.exception.CustomException;
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import com.example.solidconnection.siteuser.repository.SiteUserRepository;
+import com.example.solidconnection.term.domain.Term;
+import com.example.solidconnection.term.repository.TermRepository;
 import com.example.solidconnection.university.domain.UnivApplyInfo;
 import com.example.solidconnection.university.repository.UnivApplyInfoRepository;
 import com.example.solidconnection.university.repository.custom.UnivApplyInfoFilterRepositoryImpl;
+import io.micrometer.common.util.StringUtils;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -23,7 +27,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,25 +38,29 @@ public class ApplicationQueryService {
     private final UnivApplyInfoRepository univApplyInfoRepository;
     private final UnivApplyInfoFilterRepositoryImpl universityFilterRepository;
     private final SiteUserRepository siteUserRepository;
-
-    @Value("${university.term}")
-    public String term;
+    private final TermRepository termRepository;
 
     // todo: 캐싱 정책 변경 시 수정 필요
     @Transactional(readOnly = true)
     public ApplicationsResponse getApplicants(long siteUserId, String regionCode, String keyword) {
         // 1. 대학 지원 정보 필터링 (regionCode, keyword)
         SiteUser siteUser = siteUserRepository.findById(siteUserId)
                 .orElseThrow(() -> new CustomException(USER_NOT_FOUND));
-        List<UnivApplyInfo> univApplyInfos = universityFilterRepository.findAllByRegionCodeAndKeywords(regionCode, List.of(keyword));
+        List<String> keywords = StringUtils.isNotBlank(keyword) ? List.of(keyword) : List.of();
+
+        Term term = termRepository.findByIsCurrentTrue()
+                .orElseThrow(() -> new CustomException(CURRENT_TERM_NOT_FOUND));
+
+        List<UnivApplyInfo> univApplyInfos = universityFilterRepository.findAllByRegionCodeAndKeywordsAndTermId(regionCode, keywords, term.getId());
         if (univApplyInfos.isEmpty()) {
             return new ApplicationsResponse(List.of(), List.of(), List.of());
         }
+
         // 2. 조건에 맞는 모든 Application 한 번에 조회
         List<Long> univApplyInfoIds = univApplyInfos.stream()
                 .map(UnivApplyInfo::getId)
                 .toList();
-        List<Application> applications = applicationRepository.findAllByUnivApplyInfoIds(univApplyInfoIds, VerifyStatus.APPROVED, term);
+        List<Application> applications = applicationRepository.findAllByUnivApplyInfoIds(univApplyInfoIds, VerifyStatus.APPROVED, term.getId());
         // 3. 지원서 분류 및 DTO 변환
         return classifyApplicationsByChoice(univApplyInfos, applications, siteUser);
     }
@@ -62,7 +69,11 @@ public ApplicationsResponse getApplicants(long siteUserId, String regionCode, St
     public ApplicationsResponse getApplicantsByUserApplications(long siteUserId) {
         SiteUser siteUser = siteUserRepository.findById(siteUserId)
                 .orElseThrow(() -> new CustomException(USER_NOT_FOUND));
-        Application userLatestApplication = applicationRepository.getApplicationBySiteUserIdAndTerm(siteUser.getId(), term);
+
+        Term term = termRepository.findByIsCurrentTrue()
+                .orElseThrow(() -> new CustomException(CURRENT_TERM_NOT_FOUND));
+
+        Application userLatestApplication = applicationRepository.getApplicationBySiteUserIdAndTermId(siteUser.getId(), term.getId());
 
         List<Long> univApplyInfoIds = Stream.of(
                         userLatestApplication.getFirstChoiceUnivApplyInfoId(),
@@ -76,7 +87,7 @@ public ApplicationsResponse getApplicantsByUserApplications(long siteUserId) {
             return new ApplicationsResponse(List.of(), List.of(), List.of());
         }
 
-        List<Application> applications = applicationRepository.findAllByUnivApplyInfoIds(univApplyInfoIds, VerifyStatus.APPROVED, term);
+        List<Application> applications = applicationRepository.findAllByUnivApplyInfoIds(univApplyInfoIds, VerifyStatus.APPROVED, term.getId());
         List<UnivApplyInfo> univApplyInfos = univApplyInfoRepository.findAllByIds(univApplyInfoIds);
 
         return classifyApplicationsByChoice(univApplyInfos, applications, siteUser);
@@ -128,7 +139,11 @@ private List<ApplicantsResponse> createUniversityApplicantsResponses(
     public void validateSiteUserCanViewApplicants(long siteUserId) {
         SiteUser siteUser = siteUserRepository.findById(siteUserId)
                 .orElseThrow(() -> new CustomException(USER_NOT_FOUND));
-        VerifyStatus verifyStatus = applicationRepository.getApplicationBySiteUserIdAndTerm(siteUser.getId(), term).getVerifyStatus();
+
+        Term term = termRepository.findByIsCurrentTrue()
+                .orElseThrow(() -> new CustomException(CURRENT_TERM_NOT_FOUND));
+
+        VerifyStatus verifyStatus = applicationRepository.getApplicationBySiteUserIdAndTermId(siteUser.getId(), term.getId()).getVerifyStatus();
         if (verifyStatus != VerifyStatus.APPROVED) {
             throw new CustomException(APPLICATION_NOT_APPROVED);
         }