🍀 dev to main

src/main/java/angel_bridge/angel_bridge_server/domain/assignment/dto/response/AssignmentResponseDto.java

@@ -48,10 +48,11 @@ public static AssignmentResponseDto fromOngoing(Assignment assignment, int perfo
                 .build();
     }
 
-    public static AssignmentResponseDto fromClosed(Education education) {
+    public static AssignmentResponseDto fromClosed(Education education, int performanceRate) {
         return AssignmentResponseDto.builder()
                 .educationId(education.getId())
                 .educationTitle(education.getEducationTitle())
+                .performanceRate(performanceRate)
                 .noticeLink(education.getNoticeLink())
                 .methodLink(education.getMethodLink())
                 .isFinished(true)

src/main/java/angel_bridge/angel_bridge_server/domain/assignment/service/AssignmentService.java

@@ -184,12 +184,12 @@ public AssignmentResponseDto getAssignmentBox(Long educationId, Long memberId) {
         Assignment currentAssignment = assignmentRepository.findCurrentAssignmentByEducationId(educationId, LocalDateTime.now())
                 .orElse(null);
 
+        int performanceRate = calculatePerformanceRate(educationId, memberId);
+
         if (currentAssignment == null) {
-            return AssignmentResponseDto.fromClosed(education);
+            return AssignmentResponseDto.fromClosed(education, performanceRate);
         }
 
-        int performanceRate = calculatePerformanceRate(educationId, memberId);
-
         return AssignmentResponseDto.fromOngoing(currentAssignment, performanceRate);
     }
 

src/main/java/angel_bridge/angel_bridge_server/domain/banner/controller/AdminBannerController.java

@@ -33,13 +33,6 @@ public CommonResponse<AdminBannerResponseDto> updateBanner(@Valid @RequestPart(v
         return new CommonResponse<>(bannerService.updateBanner(request, file, bannerId), "해당 배너 이미지 수정에 성공하였습니다.");
     }
 
-    @Operation(summary = "배너 게시 여부 변경", description = "해당 배너 게시 여부를 변경하는 API")
-    @PatchMapping("/{bannerId}")
-    public CommonResponse<AdminBannerResponseDto> changeIsPost(@PathVariable Long bannerId) {
-
-        return new CommonResponse<>(bannerService.changeIsPost(bannerId), "해당 배너의 게시 여부를 변경하였습니다.");
-    }
-
     @Operation(summary = "배너 삭제", description = "하나의 배너를 삭제하는 API")
     @DeleteMapping("/{bannerId}")
     public CommonResponse<Void> deleteBanner(@PathVariable Long bannerId) {

src/main/java/angel_bridge/angel_bridge_server/domain/banner/dto/request/AdminBannerRequestDto.java

@@ -11,19 +11,14 @@ public record AdminBannerRequestDto(
         String name,
 
         @Schema(description = "배너 게시 순서", example = "1")
-        Integer priority,
-
-        @NotNull
-        @Schema(description = "배너 게시 유무", example = "true")
-        Boolean isPost
+        Integer priority
 ) {
     public Banner toEntity(String file) {
 
         return Banner.builder()
                 .bannerImage(file)
                 .name(this.name)
                 .priority(this.priority)
-                .isPost(this.isPost)
                 .build();
     }
 }

src/main/java/angel_bridge/angel_bridge_server/domain/banner/dto/response/AdminBannerResponseDto.java

@@ -12,9 +12,7 @@ public record AdminBannerResponseDto(
 
         String name,
 
-        Integer priority,
-
-        Boolean isPost
+        Integer priority
 ) {
     public static AdminBannerResponseDto from(Banner banner) {
 
@@ -23,7 +21,6 @@ public static AdminBannerResponseDto from(Banner banner) {
                 .imageFile(banner.getBannerImage())
                 .name(banner.getName())
                 .priority(banner.getPriority())
-                .isPost(banner.getIsPost())
                 .build();
     }
 }

src/main/java/angel_bridge/angel_bridge_server/domain/banner/entity/Banner.java

@@ -29,25 +29,16 @@ public class Banner extends BaseEntity {
     @Column(name = "priority")
     private Integer priority;
 
-    @Column(name = "is_post", nullable = false)
-    private Boolean isPost;
-
-    public void changeIsPost() {
-        this.isPost = !this.isPost;
-    }
-
     public void update(AdminBannerRequestDto request, String file) {
         this.bannerImage = file;
         this.name = request.name();
         this.priority = request.priority();
-        this.isPost = request.isPost();
     }
 
     @Builder
-    public Banner(String bannerImage, String name, Integer priority, Boolean isPost) {
+    public Banner(String bannerImage, String name, Integer priority) {
         this.bannerImage = bannerImage;
         this.name = name;
         this.priority = priority;
-        this.isPost = isPost;
     }
 }

src/main/java/angel_bridge/angel_bridge_server/domain/banner/service/BannerService.java

@@ -80,18 +80,6 @@ public AdminBannerResponseDto updateBanner(AdminBannerRequestDto request, Multip
         return AdminBannerResponseDto.from(updateBanner);
     }
 
-    // [PATCH] 어드민 배너 게시 여부 변경
-    @Transactional
-    public AdminBannerResponseDto changeIsPost(Long bannerId) {
-
-        Banner banner = findBannerById(bannerId);
-
-        banner.changeIsPost();
-        Banner updateBanner = bannerRepository.save(banner);
-
-        return AdminBannerResponseDto.from(updateBanner);
-    }
-
     // [DELETE] 어드민 배너 삭제
     @Transactional
     public void deleteBanner(Long bannerId) {

src/main/java/angel_bridge/angel_bridge_server/domain/education/dto/response/EducationDetailResponseDto.java

@@ -4,6 +4,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 
 @Builder
@@ -26,8 +27,8 @@ public record EducationDetailResponseDto(
         @Schema(description = "모집 마감일", example = "2025-01-05")
         LocalDate recruitmentEndDate,
 
-        @Schema(description = "가격", example = "119,000원")
-        String price,
+        @Schema(description = "가격", example = "119,000")
+        BigDecimal price,
 
         @Schema(description = "프리뷰 이미지", example = "프리뷰 이미지 url")
         String preFile,
@@ -39,14 +40,17 @@ public record EducationDetailResponseDto(
 
         public static EducationDetailResponseDto from(Education education, String preImage, String detailImage) {
 
+                String priceString = education.getPrice();
+                BigDecimal price = new BigDecimal(priceString.replaceAll("[^0-9]", ""));
+
                 return EducationDetailResponseDto.builder()
                         .title(education.getEducationTitle())
                         .description(education.getEducationDescription())
                         .educationStartDate(education.getEducationStartDate())
                         .educationEndDate(education.getEducationEndDate())
                         .recruitmentStartDate(education.getRecruitmentStartDate())
                         .recruitmentEndDate(education.getRecruitmentEndDate())
-                        .price(education.getPrice())
+                        .price(price)
                         .preFile(preImage)
                         .detailFile(detailImage)
                         .build();

src/main/java/angel_bridge/angel_bridge_server/domain/education/entity/Education.java

@@ -59,6 +59,10 @@ public class Education extends BaseEntity {
     @Column(name = "recruitment_status")
     private RecruitmentStatus recruitmentStatus;
 
+    public void setRecruitmentStatus(RecruitmentStatus status) {
+        this.recruitmentStatus = status;
+    }
+
     public void update(AdminEducationRequestDto request, String preFile, String detailFile) {
         this.educationPreImage = preFile;
         this.educationDetailImage = detailFile;

src/main/java/angel_bridge/angel_bridge_server/domain/education/service/EducationService.java

@@ -12,15 +12,15 @@
 import angel_bridge.angel_bridge_server.global.s3.service.ImageService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.*;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -35,6 +35,26 @@ public class EducationService {
     private final ImageService imageService;
     private final EducationRepository educationRepository;
 
+    // 자정에 recruitment Status 업데이트
+    @Transactional
+    @Scheduled(cron = "0 0 0 * * ?")
+    public void updateRecruitmentStatus() {
+
+        LocalDate today = LocalDate.now();
+
+        // 모집 예정 상태 업데이트
+        educationRepository.findAllByRecruitmentStartDateAfter(today)
+                .forEach(education -> education.setRecruitmentStatus(RecruitmentStatus.UPCOMING));
+
+        // 모집 중 상태 업데이트
+        educationRepository.findAllByRecruitmentStartDateBeforeAndRecruitmentEndDateAfter(today, today)
+                .forEach(education -> education.setRecruitmentStatus(RecruitmentStatus.ONGOING));
+
+        // 모집 종료 상태 업데이트
+        educationRepository.findAllByRecruitmentEndDateBefore(today)
+                .forEach(education -> education.setRecruitmentStatus(RecruitmentStatus.CLOSED));
+    }
+
     // [GET] 일반 사용자 추천 교육 프로그램 조회
     public List<EducationResponseDto> getRecommendationProgram() {
 
@@ -106,14 +126,14 @@ public AdminEducationResponseDto updateEducation(AdminEducationRequestDto reques
             // 기존 이미지 삭제 후 새로운 이미지 저장
             if (preImage != null && !preImage.isEmpty()) {
                 if (preFile != null && !preFile.isEmpty()) {
-                    imageService.deleteImage(preFile);
+//                    imageService.deleteImage(preFile);
                 }
 
                 preFile = imageService.uploadImage(preImage);
             }
             if (detailImage != null && !detailImage.isEmpty()) {
                 if (detailFile != null && !detailFile.isEmpty()) {
-                    imageService.deleteImage(detailFile);
+//                    imageService.deleteImage(detailFile);
                 }
 
                 detailFile = imageService.uploadImage(detailImage);
@@ -154,20 +174,35 @@ public PagedResponseDto<EducationResponseDto> getAllProgram(int page) {
 
         if (page == 0)
             throw new ApplicationException(BAD_REQUEST_ERROR);
-        Pageable pageable = PageRequest.of(page - 1, 12);
 
-        // 페이지 조회
-        Page<Education> educationPage = educationRepository.findAllActive(pageable);
+        // 모집 마감이 아닌 데이터와 모집 마감 데이터 모두 조회
+        List<Education> activeEducations = educationRepository.findAllActiveAndNotClosed();
+        List<Education> closedEducations = educationRepository.findAllClosed();
 
-        // Education 객체를 EducationResponseDto로 매핑
-        List<EducationResponseDto> content = educationPage.getContent().stream()
+        // 모집 중 데이터와 마감 데이터 병합
+        List<Education> allEducations = new ArrayList<>();
+        allEducations.addAll(activeEducations);
+        allEducations.addAll(closedEducations);
+
+        // 전체 데이터를 EducationResponseDto로 매핑
+        List<EducationResponseDto> allContent = allEducations.stream()
                 .map(education -> EducationResponseDto.from(
                         education, imageService.getImageUrl(education.getEducationPreImage())))
                 .toList();
 
+        // 페이지네이션 처리
+        int pageSize = 12;
+        int start = (page - 1) * pageSize;
+        int end = Math.min(start + pageSize, allContent.size());
+
+        if (start >= allContent.size())
+            throw new ApplicationException(BAD_REQUEST_ERROR);
+
+        List<EducationResponseDto> pagedContent = allContent.subList(start, end);
+
         // PagedResponseDto로 변환하여 반환
         return PagedResponseDto.from(
-                new PageImpl<>(content, pageable, educationPage.getTotalElements())
+                new PageImpl<>(pagedContent, PageRequest.of(page - 1, pageSize), allContent.size())
         );
     }
 
@@ -178,7 +213,7 @@ public PagedResponseDto<EducationResponseDto> getAllOngoingProgram(int page) {
             throw new ApplicationException(BAD_REQUEST_ERROR);
         }
 
-        Pageable pageable = PageRequest.of(page - 1, 12);
+        Pageable pageable = PageRequest.of(page - 1, 12, Sort.by(Sort.Direction.ASC, "recruitmentEndDate"));
 
         // 페이지 조회
         Page<Education> educationPage = educationRepository.findByRecruitmentStatusAndDeletedAtIsNull(RecruitmentStatus.ONGOING, pageable);
@@ -202,7 +237,7 @@ public PagedResponseDto<EducationResponseDto> getAllUpcomingProgram(int page) {
             throw new ApplicationException(BAD_REQUEST_ERROR);
         }
 
-        Pageable pageable = PageRequest.of(page - 1, 12);
+        Pageable pageable = PageRequest.of(page - 1, 12, Sort.by(Sort.Direction.ASC, "recruitmentEndDate"));
 
         // 페이지 조회
         Page<Education> educationPage = educationRepository.findByRecruitmentStatusAndDeletedAtIsNull(RecruitmentStatus.UPCOMING, pageable);

src/main/java/angel_bridge/angel_bridge_server/domain/enrollment/entity/Enrollment.java

@@ -8,10 +8,12 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
 
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@SQLDelete(sql = "UPDATE Enrollment SET deleted_at = NOW() where enrollment_id = ?")
 public class Enrollment extends BaseEntity {
 
     @Id

src/main/java/angel_bridge/angel_bridge_server/domain/enrollment/service/EnrollmentService.java

@@ -10,10 +10,7 @@
 import angel_bridge.angel_bridge_server.global.repository.MemberRepository;
 import angel_bridge.angel_bridge_server.global.s3.service.ImageService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.*;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -51,7 +48,7 @@ public PagedResponseDto<EnrollmentResponseDto> getInProgressProgram(int page, Lo
             throw new ApplicationException(BAD_REQUEST_ERROR);
         }
 
-        Pageable pageable = PageRequest.of(page - 1, 4);
+        Pageable pageable = PageRequest.of(page - 1, 4, Sort.by(Sort.Direction.DESC, "createdAt"));
 
         Page<Enrollment> enrollmentPage = enrollmentRepository.findByMemberAndEnrollmentStatusAndDeletedAtIsNull(member, EnrollmentStatus.IN_PROGRESS, pageable);
 
@@ -75,7 +72,7 @@ public PagedResponseDto<EnrollmentResponseDto> getScheduledProgram(int page, Lon
             throw new ApplicationException(BAD_REQUEST_ERROR);
         }
 
-        Pageable pageable = PageRequest.of(page - 1, 4);
+        Pageable pageable = PageRequest.of(page - 1, 4, Sort.by(Sort.Direction.DESC, "createdAt"));
 
         Page<Enrollment> enrollmentPage = enrollmentRepository.findByMemberAndEnrollmentStatusAndDeletedAtIsNull(member, EnrollmentStatus.SCHEDULED, pageable);
 
@@ -99,7 +96,7 @@ public PagedResponseDto<EnrollmentResponseDto> getCompletedProgram(int page, Lon
             throw new ApplicationException(BAD_REQUEST_ERROR);
         }
 
-        Pageable pageable = PageRequest.of(page - 1, 4);
+        Pageable pageable = PageRequest.of(page - 1, 4, Sort.by(Sort.Direction.DESC, "createdAt"));
 
         Page<Enrollment> enrollmentPage = enrollmentRepository.findByMemberAndEnrollmentStatusAndDeletedAtIsNull(member, EnrollmentStatus.COMPLETED, pageable);