From cb7db7b6f5bf2af1643d074cc4180b823307c729 Mon Sep 17 00:00:00 2001 From: Sion Shin Date: Mon, 4 Dec 2023 16:44:29 +0900 Subject: [PATCH] refactor: delete unused dto --- .../response/SharedPrayListResponseDto.java | 17 ---------- .../uspray/controller/ShareController.java | 4 +-- .../uspray/uspray/service/ShareService.java | 32 ------------------- 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 src/main/java/com/uspray/uspray/DTO/sharedpray/response/SharedPrayListResponseDto.java diff --git a/src/main/java/com/uspray/uspray/DTO/sharedpray/response/SharedPrayListResponseDto.java b/src/main/java/com/uspray/uspray/DTO/sharedpray/response/SharedPrayListResponseDto.java deleted file mode 100644 index 5387dfe3..00000000 --- a/src/main/java/com/uspray/uspray/DTO/sharedpray/response/SharedPrayListResponseDto.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.uspray.uspray.DTO.sharedpray.response; - -import com.uspray.uspray.DTO.pray.response.PrayResponseDto; -import java.util.List; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class SharedPrayListResponseDto { - - private List sharedPrayList; -} diff --git a/src/main/java/com/uspray/uspray/controller/ShareController.java b/src/main/java/com/uspray/uspray/controller/ShareController.java index cd8ad5cb..d28c3b19 100644 --- a/src/main/java/com/uspray/uspray/controller/ShareController.java +++ b/src/main/java/com/uspray/uspray/controller/ShareController.java @@ -6,7 +6,6 @@ import com.uspray.uspray.DTO.sharedpray.request.SharedPrayDeleteRequestDto; import com.uspray.uspray.DTO.sharedpray.request.SharedPrayRequestDto; import com.uspray.uspray.DTO.sharedpray.request.SharedPraySaveRequestDto; -import com.uspray.uspray.DTO.sharedpray.response.SharedPrayListResponseDto; import com.uspray.uspray.DTO.sharedpray.response.SharedPrayResponseDto; import com.uspray.uspray.exception.SuccessStatus; import com.uspray.uspray.service.ShareFacade; @@ -36,14 +35,13 @@ @Tag(name = "Shared pray", description = "기도제목 공유 관련 API") public class ShareController { - private final ShareService shareService; private final ShareFacade shareFacade; @GetMapping @ApiResponse( responseCode = "200", description = "공유받은 기도제목 조회 (보관함 조회)", - content = @Content(schema = @Schema(implementation = SharedPrayListResponseDto.class)) + content = @Content(schema = @Schema(implementation = SharedPrayRequestDto.class)) ) @Operation(summary = "공유받은 기도제목 조회 (보관함 조회)") public ApiResponseDto> getSharedPrayList( diff --git a/src/main/java/com/uspray/uspray/service/ShareService.java b/src/main/java/com/uspray/uspray/service/ShareService.java index befdf582..dba65086 100644 --- a/src/main/java/com/uspray/uspray/service/ShareService.java +++ b/src/main/java/com/uspray/uspray/service/ShareService.java @@ -1,20 +1,9 @@ package com.uspray.uspray.service; -import com.uspray.uspray.DTO.sharedpray.request.SharedPrayRequestDto; -import com.uspray.uspray.DTO.sharedpray.response.SharedPrayResponseDto; -import com.uspray.uspray.domain.Member; -import com.uspray.uspray.domain.Pray; import com.uspray.uspray.domain.SharedPray; -import com.uspray.uspray.exception.ErrorStatus; -import com.uspray.uspray.exception.model.CustomException; -import com.uspray.uspray.exception.model.NotFoundException; -import com.uspray.uspray.infrastructure.MemberRepository; -import com.uspray.uspray.infrastructure.PrayRepository; import com.uspray.uspray.infrastructure.SharedPrayRepository; import java.time.LocalDate; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -24,27 +13,6 @@ public class ShareService { private final SharedPrayRepository sharedPrayRepository; - private final MemberRepository memberRepository; - - @Transactional - public void deleteSharedPray(String userId, Long sharedPrayId) { - - Member member = memberRepository.getMemberByUserId(userId); - if (!sharedPrayRepository.existsById(sharedPrayId)) { - throw new NotFoundException(ErrorStatus.NOT_FOUND_SHARED_PRAY_EXCEPTION, ErrorStatus.NOT_FOUND_SHARED_PRAY_EXCEPTION.getMessage()); - } - List sharedPrayList = sharedPrayRepository.findAllByMemberOrderByCreatedAtDesc(member); - - // 본인 sharedPray가 아니면 지우지 못하게 막아야 함 - // 본인 sharedPray를 가지고 와서 아이디가 일치하면 삭제, 아니면 exception 발생 - for (SharedPray s : sharedPrayList) { - if (Objects.equals(s.getId(), sharedPrayId)) { - sharedPrayRepository.deleteById(sharedPrayId); - return; - } - } - throw new CustomException(ErrorStatus.DELETE_NOT_AUTHORIZED_EXCEPTION, ErrorStatus.DELETE_NOT_AUTHORIZED_EXCEPTION.getMessage()); - } @Transactional public void cleanSharedPray(LocalDate threshold) {