Merge branch 'develop' of https://github.com/KUSITMS-29th-TEAM-F/backend

into develop
KUSITMS-29th-TEAM-F · May 23, 2024 · dcc8242 · dcc8242
2 parents dcd1a6b + b87ca2e
commit dcc8242
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 16 deletions.
diff --git a/README.md b/README.md
diff --git a/src/main/java/backend/univfit/domain/apply/api/dto/response/AnnouncementDetailResponse.java b/src/main/java/backend/univfit/domain/apply/api/dto/response/AnnouncementDetailResponse.java
@@ -17,7 +17,8 @@ public record AnnouncementDetailResponse(
         String detailContents,
         Integer likes,
         Boolean memberIsLiked,
-        Boolean memberIsStored
+        Boolean memberIsStored,
+        String applyLink
 ) {
     public static AnnouncementDetailResponse of(Long scholarshipId, String scholarShipImage, String scholarShipName, String scholarShipFoundation, Long remainingDay,
                                                 String applyPossible,
@@ -26,12 +27,13 @@ public static AnnouncementDetailResponse of(Long scholarshipId, String scholarSh
                                                 String detailContents,
                                                 Integer likes,
                                                 Boolean memberIsLiked,
-                                                Boolean memberIsStored) {
+                                                Boolean memberIsStored,
+                                                String applyLink) {
 
         return new AnnouncementDetailResponse(scholarshipId, scholarShipImage,
                 scholarShipName, scholarShipFoundation, remainingDay, applyPossible,
                 supportAmount, applicationPeriod, hashTag, applyCondition,
-                detailContents, likes, memberIsLiked, memberIsStored
+                detailContents, likes, memberIsLiked, memberIsStored, applyLink
         );
 
     }

diff --git a/src/main/java/backend/univfit/domain/apply/api/dto/response/MyCoverLetterListEntry.java b/src/main/java/backend/univfit/domain/apply/api/dto/response/MyCoverLetterListEntry.java
@@ -2,6 +2,9 @@
 
 import lombok.*;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter
@@ -10,14 +13,17 @@
 public class MyCoverLetterListEntry {
     private Long coverLetterId;
     private String title;
+    private LocalDateTime localDateTime;
 
     public static MyCoverLetterListEntry of(
             Long coverLetterId,
-            String title
-    ){
+            String title,
+            LocalDateTime localDateTime
+    ) {
         return MyCoverLetterListEntry.builder()
                 .coverLetterId(coverLetterId)
                 .title(title)
+                .localDateTime(localDateTime)
                 .build();
     }
 }
diff --git a/src/main/java/backend/univfit/domain/apply/application/AnnouncementServiceImpl.java b/src/main/java/backend/univfit/domain/apply/application/AnnouncementServiceImpl.java
@@ -111,7 +111,7 @@ public AnnouncementDetailResponse getAnnouncement(Long announcementId, MemberInf
         return AnnouncementDetailResponse.of(ae.getId(), ae.getScholarShipImage(), ae.getScholarShipName(), ae.getScholarShipFoundation(),
                 remainingDay, applyPossible, supportAmount, ae.getApplicationPeriod(),
                 ae.getHashTag(), applyCondition, ae.getDetailContents(), likesCount,
-                isLikedByMember, isStoredByMember);
+                isLikedByMember, isStoredByMember, ae.getFoundationLink());
     }
 
     @Override

diff --git a/src/main/java/backend/univfit/domain/apply/application/ApplyListService.java b/src/main/java/backend/univfit/domain/apply/application/ApplyListService.java
@@ -149,7 +149,7 @@ public ApplyListDetailResponse getApplyListDetail(MemberInfoObject mio, Long app
             Long id = coverLetterEntity.getId();
             String title = coverLetterEntity.getTitle();
 
-            MyCoverLetterListEntry myCoverLetterListEntry = MyCoverLetterListEntry.of(id, title);
+            MyCoverLetterListEntry myCoverLetterListEntry = MyCoverLetterListEntry.of(id, title, coverLetterEntity.getCreatedAt());
             myCoverLetterList.add(myCoverLetterListEntry);
         }
 

diff --git a/src/main/java/backend/univfit/domain/apply/repository/ApplyJpaRepository.java b/src/main/java/backend/univfit/domain/apply/repository/ApplyJpaRepository.java
@@ -9,7 +9,6 @@
 
 public interface ApplyJpaRepository extends JpaRepository<ApplyEntity, Long> {
     List<ApplyEntity> findAllByMember(Member member);
-    void deleteApplyEntityByMemberAndId(Member member, Long id);
-
+    void deleteByMemberAndAnnouncementEntity(Member member, AnnouncementEntity announcementEntity);
     ApplyEntity findByMemberAndAnnouncementEntity(Member member, AnnouncementEntity announcementEntity);
 }
diff --git a/src/main/java/backend/univfit/domain/coverletter/entity/CoverLetterEntity.java b/src/main/java/backend/univfit/domain/coverletter/entity/CoverLetterEntity.java
@@ -14,7 +14,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
-public class CoverLetterEntity {
+public class CoverLetterEntity extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;

diff --git a/src/main/java/backend/univfit/domain/member/api/MemberApi.java b/src/main/java/backend/univfit/domain/member/api/MemberApi.java
@@ -16,9 +16,9 @@
 @RequestMapping("/members")
 public class MemberApi {
     private final MemberService memberService;
-    @DeleteMapping("/application/{id}")
+    @DeleteMapping("/application/{applicationId}")
     public ApiResponse<GeneralResponse> deleteMemberApplication(@MemberInfo MemberInfoObject mio,
-                                                                @PathVariable(name = "id") Long id){
-        return ApiResponse.onSuccess(memberService.deleteMemberApplication(mio, id));
+                                                                @PathVariable(name = "applicationId") Long applicationId){
+        return ApiResponse.onSuccess(memberService.deleteMemberApplication(mio, applicationId));
     }
 }
diff --git a/src/main/java/backend/univfit/domain/member/application/MemberService.java b/src/main/java/backend/univfit/domain/member/application/MemberService.java
@@ -1,5 +1,8 @@
 package backend.univfit.domain.member.application;
 
+import backend.univfit.domain.apply.entity.AnnouncementEntity;
+import backend.univfit.domain.apply.exception.AnnouncementException;
+import backend.univfit.domain.apply.repository.AnnouncementJpaRepository;
 import backend.univfit.domain.apply.repository.ApplyJpaRepository;
 import backend.univfit.domain.member.entity.Member;
 import backend.univfit.domain.member.repository.MemberJpaRepository;
@@ -10,18 +13,22 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import static backend.univfit.global.error.status.ErrorStatus.ANNOUNCEMENT_NOT_FOUND;
+
 @Service
 @Slf4j
 @RequiredArgsConstructor
 public class MemberService {
     private final MemberJpaRepository memberJpaRepository;
     private final ApplyJpaRepository applyJpaRepository;
+    private final AnnouncementJpaRepository announcementJpaRepository;
 
     @Transactional
-    public GeneralResponse deleteMemberApplication(MemberInfoObject mio, Long id) {
+    public GeneralResponse deleteMemberApplication(MemberInfoObject mio, Long applicationId) {
         Member member = memberJpaRepository.findById(mio.getMemberId()).get();
+        AnnouncementEntity announcement = announcementJpaRepository.findById(applicationId).orElseThrow(() -> new AnnouncementException(ANNOUNCEMENT_NOT_FOUND));
 
-        applyJpaRepository.deleteApplyEntityByMemberAndId(member, id);
+        applyJpaRepository.deleteByMemberAndAnnouncementEntity(member, announcement);
         return GeneralResponse.of();
     }
 }