From 2f41dc7a6e82380c906f963e3d45362b496ac9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=20=EC=8A=B9=20=EC=97=B0?= <53565255+seungyeonnnnnni@users.noreply.github.com> Date: Wed, 15 May 2024 17:36:48 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=EB=AF=B8=EC=85=98=20=EC=9E=AC?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D(=EC=82=AD=EC=A0=9C)=20=EC=8B=9C=20=EC=97=B0?= =?UTF-8?q?=EA=B4=80=EA=B4=80=EA=B3=84=EC=97=90=20=EC=9E=88=EB=8A=94=20mis?= =?UTF-8?q?sionComment=20=EC=82=AD=EC=A0=9C=20=EB=A1=9C=EC=A7=81=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 --- .../application/service/MissionArchiveDeleteUseCase.java | 3 +++ .../domain/service/MissionArchiveDeleteService.java | 1 + .../domain/repository/MissionCommentRepository.java | 3 +++ .../domain/service/MissionCommentDeleteService.java | 4 ++++ 4 files changed, 11 insertions(+) diff --git a/src/main/java/com/moing/backend/domain/missionArchive/application/service/MissionArchiveDeleteUseCase.java b/src/main/java/com/moing/backend/domain/missionArchive/application/service/MissionArchiveDeleteUseCase.java index 362fec96..65e92852 100644 --- a/src/main/java/com/moing/backend/domain/missionArchive/application/service/MissionArchiveDeleteUseCase.java +++ b/src/main/java/com/moing/backend/domain/missionArchive/application/service/MissionArchiveDeleteUseCase.java @@ -12,6 +12,7 @@ import com.moing.backend.domain.missionArchive.domain.service.MissionArchiveQueryService; import com.moing.backend.domain.missionArchive.domain.service.MissionArchiveSaveService; import com.moing.backend.domain.missionArchive.exception.NoAccessMissionArchiveException; +import com.moing.backend.domain.missionComment.domain.service.MissionCommentDeleteService; import com.moing.backend.domain.missionHeart.domain.service.MissionHeartQueryService; import com.moing.backend.domain.team.domain.entity.Team; import com.moing.backend.domain.teamScore.application.service.TeamScoreUpdateUseCase; @@ -31,6 +32,7 @@ public class MissionArchiveDeleteUseCase { private final MissionArchiveQueryService missionArchiveQueryService; private final MissionArchiveDeleteService missionArchiveDeleteService; private final MissionQueryService missionQueryService; + private final MissionCommentDeleteService missionCommentDeleteService; private final MemberGetService memberGetService; private final TeamScoreUpdateUseCase teamScoreUpdateUseCase; @@ -61,6 +63,7 @@ public Long deleteArchive(String userSocialId, Long missionId,Long count) { updateUtils.deleteImgUrl(archive); } + missionCommentDeleteService.deleteAllCommentByMissionArchive(deleteArchive.getId()); missionArchiveDeleteService.deleteMissionArchive(deleteArchive); teamScoreUpdateUseCase.gainScoreOfArchive(mission, ScoreStatus.MINUS); diff --git a/src/main/java/com/moing/backend/domain/missionArchive/domain/service/MissionArchiveDeleteService.java b/src/main/java/com/moing/backend/domain/missionArchive/domain/service/MissionArchiveDeleteService.java index 3bb8f5c1..567f8ae9 100644 --- a/src/main/java/com/moing/backend/domain/missionArchive/domain/service/MissionArchiveDeleteService.java +++ b/src/main/java/com/moing/backend/domain/missionArchive/domain/service/MissionArchiveDeleteService.java @@ -2,6 +2,7 @@ import com.moing.backend.domain.missionArchive.domain.entity.MissionArchive; import com.moing.backend.domain.missionArchive.domain.repository.MissionArchiveRepository; +import com.moing.backend.domain.missionComment.domain.service.MissionCommentDeleteService; import com.moing.backend.global.annotation.DomainService; import lombok.RequiredArgsConstructor; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/moing/backend/domain/missionComment/domain/repository/MissionCommentRepository.java b/src/main/java/com/moing/backend/domain/missionComment/domain/repository/MissionCommentRepository.java index 8c7d8e35..160b39a7 100644 --- a/src/main/java/com/moing/backend/domain/missionComment/domain/repository/MissionCommentRepository.java +++ b/src/main/java/com/moing/backend/domain/missionComment/domain/repository/MissionCommentRepository.java @@ -3,10 +3,13 @@ import com.moing.backend.domain.missionComment.domain.entity.MissionComment; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; import java.util.Optional; public interface MissionCommentRepository extends JpaRepository, MissionCommentCustomRepository { Optional findMissionCommentByMissionCommentId(Long missionCommentId); + void deleteAllMissionCommentsByMissionArchiveId(Long missionArchiveId); + } diff --git a/src/main/java/com/moing/backend/domain/missionComment/domain/service/MissionCommentDeleteService.java b/src/main/java/com/moing/backend/domain/missionComment/domain/service/MissionCommentDeleteService.java index b41f541a..4a9ff9ec 100644 --- a/src/main/java/com/moing/backend/domain/missionComment/domain/service/MissionCommentDeleteService.java +++ b/src/main/java/com/moing/backend/domain/missionComment/domain/service/MissionCommentDeleteService.java @@ -15,4 +15,8 @@ public class MissionCommentDeleteService implements CommentDeleteService Date: Wed, 15 May 2024 19:36:50 +0900 Subject: [PATCH 2/2] =?UTF-8?q?MNG-24=20feat:=20=EC=9C=A0=EC=A0=80=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=8D=BC=ED=8B=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/dto/response/UserProperty.java | 18 ++++++++++++++++++ .../dto/response/GetTeamResponse.java | 9 +++++++-- .../team/domain/service/TeamGetService.java | 2 +- .../team/presentation/TeamControllerTest.java | 9 ++++++++- 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/moing/backend/domain/member/dto/response/UserProperty.java diff --git a/src/main/java/com/moing/backend/domain/member/dto/response/UserProperty.java b/src/main/java/com/moing/backend/domain/member/dto/response/UserProperty.java new file mode 100644 index 00000000..14eaa609 --- /dev/null +++ b/src/main/java/com/moing/backend/domain/member/dto/response/UserProperty.java @@ -0,0 +1,18 @@ +package com.moing.backend.domain.member.dto.response; + +import com.moing.backend.domain.member.domain.constant.Gender; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; + +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Getter +public class UserProperty { + private Gender gender; + private LocalDate birthDate; +} diff --git a/src/main/java/com/moing/backend/domain/team/application/dto/response/GetTeamResponse.java b/src/main/java/com/moing/backend/domain/team/application/dto/response/GetTeamResponse.java index bad378b3..3bacdbe8 100644 --- a/src/main/java/com/moing/backend/domain/team/application/dto/response/GetTeamResponse.java +++ b/src/main/java/com/moing/backend/domain/team/application/dto/response/GetTeamResponse.java @@ -1,5 +1,7 @@ package com.moing.backend.domain.team.application.dto.response; +import com.moing.backend.domain.member.domain.entity.Member; +import com.moing.backend.domain.member.dto.response.UserProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -16,13 +18,16 @@ public class GetTeamResponse { private String memberNickName; private Integer numOfTeam; private List teamBlocks = new ArrayList<>(); + private UserProperty userProperty; public GetTeamResponse(Integer numOfTeam, List teamBlocks) { this.numOfTeam=numOfTeam; this.teamBlocks = teamBlocks; } - public void updateMemberNickName(String memberNickName) { - this.memberNickName=memberNickName; + public void updateMemberInfo(Member member) { + this.memberNickName=member.getNickName(); + this.userProperty=new UserProperty(member.getGender(), member.getBirthDate()); + } } diff --git a/src/main/java/com/moing/backend/domain/team/domain/service/TeamGetService.java b/src/main/java/com/moing/backend/domain/team/domain/service/TeamGetService.java index 360190f4..a89d672e 100644 --- a/src/main/java/com/moing/backend/domain/team/domain/service/TeamGetService.java +++ b/src/main/java/com/moing/backend/domain/team/domain/service/TeamGetService.java @@ -26,7 +26,7 @@ public class TeamGetService { public GetTeamResponse getTeamByMember(Member member) { GetTeamResponse getTeamResponse = teamRepository.findTeamByMemberId(member.getMemberId()); - getTeamResponse.updateMemberNickName(member.getNickName()); + getTeamResponse.updateMemberInfo(member); return getTeamResponse; } diff --git a/src/test/java/com/moing/backend/domain/team/presentation/TeamControllerTest.java b/src/test/java/com/moing/backend/domain/team/presentation/TeamControllerTest.java index 7ccf996b..93a3fb28 100644 --- a/src/test/java/com/moing/backend/domain/team/presentation/TeamControllerTest.java +++ b/src/test/java/com/moing/backend/domain/team/presentation/TeamControllerTest.java @@ -1,6 +1,8 @@ package com.moing.backend.domain.team.presentation; import com.moing.backend.config.CommonControllerTest; +import com.moing.backend.domain.member.domain.constant.Gender; +import com.moing.backend.domain.member.dto.response.UserProperty; import com.moing.backend.domain.team.application.dto.request.CreateTeamRequest; import com.moing.backend.domain.team.application.dto.request.UpdateTeamRequest; import com.moing.backend.domain.team.application.dto.response.*; @@ -12,6 +14,7 @@ import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; import org.springframework.test.web.servlet.ResultActions; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -129,10 +132,12 @@ public void get_team() throws Exception { teamBlocks.add(teamBlock1); teamBlocks.add(teamBlock2); + UserProperty userProperty=new UserProperty(Gender.WOMAN, LocalDate.of(2000, 3, 28)); GetTeamResponse output = GetTeamResponse.builder() .numOfTeam(1) .memberNickName("유저 닉네임") .teamBlocks(teamBlocks) + .userProperty(userProperty) .build(); given(getTeamUseCase.getTeam(any())).willReturn(output); @@ -167,7 +172,9 @@ public void get_team() throws Exception { fieldWithPath("data.teamBlocks[].category").description("소모임 카테고리"), fieldWithPath("data.teamBlocks[].startDate").description("소모임 시작일"), fieldWithPath("data.teamBlocks[].deletionTime").description("소모임 삭제 시간 (삭제 안했으면 null)"), - fieldWithPath("data.teamBlocks[].profileImgUrl").description("프로필 사진 url") + fieldWithPath("data.teamBlocks[].profileImgUrl").description("프로필 사진 url"), + fieldWithPath("data.userProperty.gender").description("유저 성별"), + fieldWithPath("data.userProperty.birthDate").description("유저 태어난 날") ) )