From 7972caaf9f18507dca3d60694860cea61ed0f366 Mon Sep 17 00:00:00 2001 From: chahyunsoo Date: Thu, 23 May 2024 12:52:29 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[refactor]=20:=20=EC=A0=84=EC=B2=B4=20?= =?UTF-8?q?=EC=9E=A5=ED=95=99=EA=B8=88=20=EC=83=81=EC=84=B8=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=8B=9C=20=EC=A7=80=EC=9B=90=EB=A7=81=ED=81=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dto/response/AnnouncementDetailResponse.java | 8 +++++--- .../domain/apply/application/AnnouncementServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) 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 index 9d2777f..3350d72 100644 --- 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/application/AnnouncementServiceImpl.java b/src/main/java/backend/univfit/domain/apply/application/AnnouncementServiceImpl.java index 2d52f38..cd2da96 100644 --- 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 From c8eb536179f8b3ff51068314e8a7ae628f7cfaca Mon Sep 17 00:00:00 2001 From: chahyunsoo Date: Thu, 23 May 2024 13:48:33 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[fix]=20:=20=EC=A0=80=EC=9E=A5=EA=B3=B5?= =?UTF-8?q?=EA=B3=A0=20=EC=B7=A8=EC=86=8C=20=EC=95=88=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/apply/repository/ApplyJpaRepository.java | 3 +-- .../backend/univfit/domain/member/api/MemberApi.java | 6 +++--- .../domain/member/application/MemberService.java | 11 +++++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/backend/univfit/domain/apply/repository/ApplyJpaRepository.java b/src/main/java/backend/univfit/domain/apply/repository/ApplyJpaRepository.java index 596c324..ac91e52 100644 --- 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 { List 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/member/api/MemberApi.java b/src/main/java/backend/univfit/domain/member/api/MemberApi.java index f156ede..0127fac 100644 --- 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 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 index f6391d1..4186e64 100644 --- 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(); } } From 756eeddf6078731f1b6f91fc503ba9d10fc01b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B0=A8=ED=98=84=EC=88=98?= <98576976+chahyunsoo@users.noreply.github.com> Date: Thu, 23 May 2024 14:03:38 +0900 Subject: [PATCH 3/4] [docs] : Delete README.md --- README.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index bac4e1c..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -# Univ-Fit-BackEnd From b87ca2ee58258b876254f12da79a242a2ed4775e Mon Sep 17 00:00:00 2001 From: chahyunsoo Date: Thu, 23 May 2024 18:24:21 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[refactor]=20:=20=EC=9E=90=EC=86=8C?= =?UTF-8?q?=EC=84=9C=20=EC=83=9D=EC=84=B1=20=EC=8B=9C=EA=B0=84=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apply/api/dto/response/MyCoverLetterListEntry.java | 10 ++++++++-- .../domain/apply/application/ApplyListService.java | 2 +- .../domain/coverletter/entity/CoverLetterEntity.java | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) 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 index 1f716e9..5088c46 100644 --- 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/ApplyListService.java b/src/main/java/backend/univfit/domain/apply/application/ApplyListService.java index 5dd323a..9be606c 100644 --- a/src/main/java/backend/univfit/domain/apply/application/ApplyListService.java +++ b/src/main/java/backend/univfit/domain/apply/application/ApplyListService.java @@ -148,7 +148,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/coverletter/entity/CoverLetterEntity.java b/src/main/java/backend/univfit/domain/coverletter/entity/CoverLetterEntity.java index eff6fe3..1a1830e 100644 --- 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;