Fix/#171 카테고리 API 수정

.github/workflows/cd.yml

@@ -42,7 +42,7 @@ jobs:
           context: .
           file: ./Dockerfile
           push: true
-          tags: woals2840/certi-server
+          tags: seongmin0229/certi-server
 
   deploy-cd:
     needs: build

.github/workflows/ci.yml

@@ -42,5 +42,5 @@ jobs:
         context: .
         file: ./Dockerfile
         push: true
-        tags: woals2840/certi-server
+        tags: seongmin0229/certi-server
 

src/main/java/org/sopt/certi_server/domain/certification/controller/CertificationController.java

@@ -6,6 +6,7 @@
 import lombok.RequiredArgsConstructor;
 import org.sopt.certi_server.domain.certification.dto.response.CertificationDetailResponse;
 import org.sopt.certi_server.domain.certification.dto.response.CertificationListResponse;
+import org.sopt.certi_server.domain.certification.dto.response.CertificationRankResponse;
 import org.sopt.certi_server.domain.certification.dto.response.CertificationRecommendationListResponse;
 import org.sopt.certi_server.domain.certification.dto.response.CertificationSimple;
 import org.sopt.certi_server.domain.certification.service.CertificationService;
@@ -81,4 +82,24 @@ public ResponseEntity<SuccessResponse<CertificationRecommendationListResponse>>
         return ResponseEntity.ok(SuccessResponse.of(SuccessCode.SUCCESS_FETCH, certiRecommendListRes));
     }
 
+    @GetMapping("/job")
+    @Operation(summary = "직무별 자격증 조회 API", description = "3순위 직무별 자격증을 조회합니다")
+    public ResponseEntity<SuccessResponse<?>> getTop3ByJob(
+        @AuthenticationPrincipal Long userId
+    ){
+        List<CertificationRankResponse> certificationRankResponseList = certificationService.getCertificationJob(userId);
+        return ResponseEntity.ok(SuccessResponse.of(SuccessCode.SUCCESS_FETCH, certificationRankResponseList));
+    }
+
+    @GetMapping("/track")
+    @Operation(summary = "계열별 자격증 조회 API", description = "3순위 계열별 자격증을 조회합니다")
+    public ResponseEntity<SuccessResponse<?>> getTop3ByTrack(
+        @AuthenticationPrincipal Long userId
+    ) {
+        List<CertificationRankResponse> certificationRankResponseList = certificationService.getCertificationTrack(userId);
+        return ResponseEntity.ok(SuccessResponse.of(SuccessCode.SUCCESS_FETCH, certificationRankResponseList));
+
+    }
+
+
 }

src/main/java/org/sopt/certi_server/domain/certification/dto/response/CertificationRankResponse.java

@@ -0,0 +1,19 @@
+package org.sopt.certi_server.domain.certification.dto.response;
+
+import org.sopt.certi_server.domain.certification.entity.Certification;
+
+public record CertificationRankResponse(
+	int rank,
+	String certificationName,
+	String certificationType
+) {
+	public CertificationRankResponse(int rank, Certification certification) {
+		this(
+			rank,
+			certification.getName(),
+			certification.getCertificationType() != null
+				? certification.getCertificationType().getKoreanName()
+				: null
+		);
+	}
+}

src/main/java/org/sopt/certi_server/domain/certification/dto/response/CertificationScoreDto.java

@@ -11,7 +11,8 @@ public record CertificationScoreDto(
         String testType,
         List<String> tags,
         int recommendationScore,
-        boolean isFavorite) {
+        boolean isFavorite,
+        String description) {
     public static CertificationScoreDto from(
             Certification certification,
             int recommendationScore,
@@ -24,7 +25,8 @@ public static CertificationScoreDto from(
                 certification.getTestType().getType(),
                 certification.getTags().stream().toList(),
                 recommendationScore,
-                isFavorite
+                isFavorite,
+                certification.getDescription()
         );
     }
 

src/main/java/org/sopt/certi_server/domain/certification/dto/response/CertificationSimple.java

@@ -16,6 +16,7 @@ public class CertificationSimple {
     private List<String> tags;
     @JsonProperty(value = "isFavorite")
     private boolean favorite;
+    private String description;
 
     public CertificationSimple(
             Certification certification,
@@ -29,5 +30,6 @@ public CertificationSimple(
                 certification.getTestType().getType() : null;
         this.tags = certification.getTags();
         this.favorite = favorite;
+        this.description = certification.getDescription();
     }
 }

src/main/java/org/sopt/certi_server/domain/certification/service/CertificationService.java

@@ -17,15 +17,19 @@
 import org.sopt.certi_server.domain.major.entity.Major;
 import org.sopt.certi_server.domain.major.repository.MajorRepository;
 import org.sopt.certi_server.domain.user.entity.User;
+import org.sopt.certi_server.domain.user.entity.enums.TrackType;
 import org.sopt.certi_server.domain.user.service.UserService;
 import org.sopt.certi_server.global.error.code.ErrorCode;
 import org.sopt.certi_server.global.error.exception.NotFoundException;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -45,6 +49,7 @@ public class CertificationService {
     private final CertificationJobRepository certificationJobRepository;
     private final CertificationRepositoryCustomImpl certificationRepositoryCustomImpl;
     private final UserService userService;
+    private final FavoriteRepository favoriteRepository;
 
 
     @Cacheable(
@@ -197,4 +202,40 @@ public CertificationListResponse getCertificationList(final Long userId, final b
 
     }
 
+    public List<CertificationRankResponse> getCertificationJob(final Long userId){
+        User user = userService.getUser(userId);
+        List<String> jobList = userService.getUserJob(userId).jobList();
+        if (jobList.isEmpty()) {
+            throw new NotFoundException(ErrorCode.JOB_NOT_FOUND);
+        }
+        String jobName = jobList.get(0);
+        Job job = jobRepository.findByName(jobName)
+            .orElseThrow(() -> new NotFoundException(ErrorCode.JOB_NOT_FOUND));
+
+        Pageable top3 = PageRequest.of(0, 3);
+        List<Certification> certList =
+            favoriteRepository.findTopByJobOrderByFavoriteCount(job.getId(), top3);
+
+        AtomicInteger rank = new AtomicInteger(1);
+
+        return certList.stream()
+            .map(cert -> new CertificationRankResponse(rank.getAndIncrement(), cert))
+            .toList();
+    }
+
+    public List<CertificationRankResponse> getCertificationTrack(final Long userId){
+        User user = userService.getUser(userId);
+        TrackType trackType = user.getTrack();
+
+        Pageable top3 = PageRequest.of(0, 3);
+
+        List<Certification> certificationList = favoriteRepository.findTopCertificationsByTrack(trackType, top3);
+
+        AtomicInteger rank = new AtomicInteger(1);
+
+        return certificationList.stream()
+            .map(c -> new CertificationRankResponse(rank.getAndIncrement(), c))
+            .toList();
+    }
+
 }

src/main/java/org/sopt/certi_server/domain/favorite/repository/FavoriteRepository.java

@@ -3,8 +3,11 @@
 import org.sopt.certi_server.domain.certification.entity.Certification;
 import org.sopt.certi_server.domain.favorite.entity.Favorite;
 import org.sopt.certi_server.domain.user.entity.User;
+import org.sopt.certi_server.domain.user.entity.enums.TrackType;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -29,4 +32,32 @@ public interface FavoriteRepository extends JpaRepository<Favorite, Long> {
     boolean existsByUserAndCertification(User user, Certification certification);
 
 	void deleteAllByUser(User user);
+
+    @Query("""
+        select distinct c
+        from Favorite f
+            join f.certification c
+            join CertificationJob cj on cj.certification = c
+        where cj.job.id = :jobId
+        group by c
+        order by count(f) desc, max(cj.weight) desc
+        """)
+    List<Certification> findTopByJobOrderByFavoriteCount(
+        @Param("jobId") Long jobId,
+        Pageable pageable
+    );
+
+    @Query("""
+        select c
+        from Favorite f
+            join f.certification c
+            join f.user u
+        where u.track = :track
+        group by c
+        order by count(f) desc
+        """)
+    List<Certification> findTopCertificationsByTrack(
+        @Param("track") TrackType track,
+        Pageable pageable
+    );
 }