Merge pull request #188 from teamterning/staging

[🔀 merge] [3차] 코드 리펙토링 사항 적용

Author: junggyo1020

build.gradle

@@ -23,46 +23,41 @@ ext {
 
 dependencies {
 
-	//default
+	// Spring Boot 기본 의존성
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-aop'
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+
+	// Lombok
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
+
+	// 테스트 의존성
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
-	//postgresql
+	// PostgreSQL
 	implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.3'
 
-	//swagger
+	// Swagger
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
 
-	//Health-check
-	implementation 'org.springframework.boot:spring-boot-starter-actuator'
-
-	//QueryDSL
+	// QueryDSL
 	implementation "com.querydsl:querydsl-jpa:${queryDslVersion}:jakarta"
 	annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}:jakarta"
 	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
 	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
-	//validation
-//	implementation 'ort.springframework.boot:spring-boot-starter-validation'
-
-	//JWT
+	// JWT
 	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
 	implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
 	implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
-	implementation 'com.nimbusds:nimbus-jose-jwt:3.10'
-
-	// security
-	implementation 'org.springframework.boot:spring-boot-starter-security'
+//	implementation 'com.nimbusds:nimbus-jose-jwt:3.10'
 
-	// gson
+	// Gson
 	implementation 'com.google.code.gson:gson:2.8.6'
-
-	implementation 'org.springframework.boot:spring-boot-starter-aop'
-
 }
 
 //QueryDSL 초기 설정

src/main/java/org/terning/terningserver/controller/HomeController.java

@@ -1,6 +1,8 @@
 package org.terning.terningserver.controller;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -27,14 +29,12 @@ public class HomeController implements HomeSwagger {
     public ResponseEntity<SuccessResponse<HomeAnnouncementsResponseDto>> getAnnouncements(
             @AuthenticationPrincipal Long userId,
             @RequestParam(value = "sortBy", required = false, defaultValue = "deadlineSoon") String sortBy,
-            @RequestParam("startYear") int startYear,
-            @RequestParam("startMonth") int startMonth
-    ){
-        HomeAnnouncementsResponseDto announcements = homeService.getAnnouncements(userId, sortBy, startYear, startMonth);
-
+            @PageableDefault(size = 10) Pageable pageable) {
+        HomeAnnouncementsResponseDto announcements = homeService.getAnnouncements(userId, sortBy, pageable);
         return ResponseEntity.ok(SuccessResponse.of(SUCCESS_GET_ANNOUNCEMENTS, announcements));
     }
 
+
     @GetMapping("/home/upcoming")
     public ResponseEntity<SuccessResponse<List<UpcomingScrapResponseDto>>> getUpcomingScraps(
             @AuthenticationPrincipal Long userId

src/main/java/org/terning/terningserver/controller/swagger/HomeSwagger.java

@@ -2,6 +2,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.terning.terningserver.dto.user.response.HomeAnnouncementsResponseDto;
 import org.terning.terningserver.dto.user.response.UpcomingScrapResponseDto;
@@ -16,8 +17,7 @@ public interface HomeSwagger {
     ResponseEntity<SuccessResponse<HomeAnnouncementsResponseDto>> getAnnouncements(
             Long userId,
             String sortBy,
-            int startYear,
-            int startMonth
+            Pageable pageable
     );
 
     @Operation(summary = "홈화면 > 곧 마감인 스크랩 공고 조회", description = "곧 마감인 스크랩 공고를 조회하는 API")

src/main/java/org/terning/terningserver/domain/Filter.java

@@ -6,8 +6,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.terning.terningserver.domain.enums.Grade;
+import org.terning.terningserver.domain.enums.JobType;
 import org.terning.terningserver.domain.enums.WorkingPeriod;
-import org.terning.terningserver.dto.auth.request.SignUpFilterRequestDto;
 
 import static lombok.AccessLevel.PROTECTED;
 import static jakarta.persistence.GenerationType.IDENTITY;
@@ -23,6 +23,9 @@ public class Filter {
     @GeneratedValue(strategy = IDENTITY)
     private Long id;
 
+    @Enumerated(EnumType.STRING)
+    private JobType jobType;
+
     @Enumerated(EnumType.STRING)
     private Grade grade;
 
@@ -34,7 +37,8 @@ public class Filter {
     private int startMonth; // 근무 시작 월
 
 
-    public void updateFilter(Grade grade, WorkingPeriod workingPeriod, int startYear, int startMonth) {
+    public void updateFilter(JobType jobType, Grade grade, WorkingPeriod workingPeriod, int startYear, int startMonth) {
+        this.jobType = jobType;
         this.grade = grade;
         this.workingPeriod = workingPeriod;
         this.startYear = startYear;

src/main/java/org/terning/terningserver/domain/enums/JobType.java

@@ -0,0 +1,33 @@
+package org.terning.terningserver.domain.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.terning.terningserver.exception.CustomException;
+import org.terning.terningserver.exception.enums.ErrorMessage;
+
+@Getter
+@RequiredArgsConstructor
+public enum JobType {
+    TOTAL("total", "전체"),
+    PLAN("plan", "기획/전략"),
+    MARKETING("marketing", "마케팅/홍보"),
+    ADMIN("admin", "사무/회계"),
+    SALES("sales", "인사/영업"),
+    DESIGN("design", "디자인/예술"),
+    IT("it", "개발/IT"),
+    RESEARCH("research", "연구/생산"),
+    ETC("etc", "기타");
+
+    private final String key;
+    private final String value;
+
+    public static JobType fromKey(String key) {
+        for (JobType jobType : JobType.values()) {
+            if (jobType.key.equalsIgnoreCase(key)) {
+                return jobType;
+            }
+        }
+        throw new CustomException(ErrorMessage.INVALID_JOB_TYPE);
+    }
+
+}

src/main/java/org/terning/terningserver/dto/filter/request/UpdateUserFilterRequestDto.java

@@ -1,6 +1,7 @@
 package org.terning.terningserver.dto.filter.request;
 
 public record UpdateUserFilterRequestDto(
+        String jobType,
         String grade,
         String workingPeriod,
         int startYear,

src/main/java/org/terning/terningserver/dto/filter/response/UserFilterDetailResponseDto.java

@@ -7,15 +7,17 @@
 
 @Builder(access = PRIVATE)
 public record UserFilterDetailResponseDto(
+        String jobType,
         String grade,
         String workingPeriod,
         Integer startYear,
         Integer startMonth
 ) {
     public static UserFilterDetailResponseDto of(final Filter userFilter) {
         return UserFilterDetailResponseDto.builder()
-                .grade(userFilter == null ? null : userFilter.getGrade().getKey())
-                .workingPeriod(userFilter == null ? null : userFilter.getWorkingPeriod().getKey())
+                .jobType(userFilter == null || userFilter.getJobType() == null ? "total" : userFilter.getJobType().getKey())
+                .grade(userFilter == null || userFilter.getGrade() == null ? null : userFilter.getGrade().getKey())
+                .workingPeriod(userFilter == null || userFilter.getWorkingPeriod() == null ? null : userFilter.getWorkingPeriod().getKey())
                 .startYear(userFilter == null ? null : userFilter.getStartYear())
                 .startMonth(userFilter == null ? null : userFilter.getStartMonth())
                 .build();

src/main/java/org/terning/terningserver/dto/user/response/HomeAnnouncementsResponseDto.java

@@ -6,12 +6,20 @@
 
 @Builder
 public record HomeAnnouncementsResponseDto(
-        int totalCount, // 필터링 된 공고 총 개수
+        int totalPages,
+        long totalCount,
+        boolean hasNext,
         List<HomeResponseDto> result
 ) {
-    public static HomeAnnouncementsResponseDto of(final int totalCount, final List<HomeResponseDto> announcements){
+    public static HomeAnnouncementsResponseDto of(
+            final int totalPages,
+            final long totalCount,
+            final boolean hasNext,
+            final List<HomeResponseDto> announcements) {
         return HomeAnnouncementsResponseDto.builder()
+                .totalPages(totalPages)
                 .totalCount(totalCount)
+                .hasNext(hasNext)
                 .result(announcements)
                 .build();
     }

src/main/java/org/terning/terningserver/exception/enums/ErrorMessage.java

@@ -15,9 +15,10 @@ public enum ErrorMessage {
     FAILED_TOKEN_REISSUE(404, "토큰 재발급에 실패하였습니다"),
     UNAUTHORIZED_JWT_EXCEPTION(401, "유효하지 않은 토큰입니다"),
 
-    // 사용자 필터링 정보 생성
+    // 필터링
     FAILED_SIGN_UP_USER_FILTER_CREATION(404, "사용자 필터 생성에 실패하였습니다"),
     FAILED_SIGN_UP_USER_FILTER_ASSIGNMENT(404, "사용자 필터 연결에 실패하였습니다"),
+    INVALID_JOB_TYPE(401, "유효하지 않은 직무 카테고리입니다."),
 
     // 스크랩
     EXISTS_SCRAP_ALREADY(400, "이미 스크랩했습니다."),

src/main/java/org/terning/terningserver/repository/internship_announcement/InternshipRepositoryCustom.java

@@ -1,5 +1,6 @@
 package org.terning.terningserver.repository.internship_announcement;
 
+import com.querydsl.core.Tuple;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.terning.terningserver.domain.InternshipAnnouncement;
@@ -14,6 +15,7 @@ public interface InternshipRepositoryCustom {
 
     Page<InternshipAnnouncement> searchInternshipAnnouncement(String keyword, String sortBy, Pageable pageable);
 
-    List<InternshipAnnouncement> findFilteredInternships(User user, String sortBy, int startYear, int startMonth);
+    Page<Tuple> findFilteredInternshipsWithScrapInfo(User user, String sortBy, Pageable pageable);
 
+    Page<Tuple> findAllInternshipsWithScrapInfo(User user, String sortBy, Pageable pageable);
 }