From fe594bdf0e1d1c6153a0776f754490b1e7adf290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98jminkkk=E2=80=99?= <102847513+jminkkk@users.noreply.github.com> Date: Wed, 21 Aug 2024 22:07:36 +0900 Subject: [PATCH 1/6] =?UTF-8?q?feat(controller):=20=EB=B9=84=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EB=8F=84=20=EC=A1=B0=ED=9A=8C=ED=95=A0=20=EC=88=98=20?= =?UTF-8?q?=EC=9E=88=EB=8F=84=EB=A1=9D=20MemberDto=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/controller/SpringDocTemplateController.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java index fed1e2d58..91aff0598 100644 --- a/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java +++ b/backend/src/main/java/codezap/template/controller/SpringDocTemplateController.java @@ -56,9 +56,9 @@ public interface SpringDocTemplateController { ResponseEntity createTemplate(MemberDto memberDto, CreateTemplateRequest createTemplateRequest); @SecurityRequirement(name = "쿠키 인증 토큰") - @Operation(summary = "템플릿 검색", description = """ - 필터링 조건에 맞는 모든 템플릿을 조회합니다. \n - - 필터링 조건 \n + @Operation(summary = "템플릿 조회", description = """ + 조건에 맞는 모든 템플릿을 조회합니다. \n + - 조건 \n - 멤버 ID - 검색 키워드 (템플릿명, 템플릿 설명, 파일명, 소스 코드) - 카테고리 ID @@ -87,7 +87,6 @@ public interface SpringDocTemplateController { @ErrorCase(description = "태그가 없는 경우", exampleMessage = "식별자 1에 해당하는 태그가 존재하지 않습니다."), }) ResponseEntity getTemplates( - MemberDto memberDto, Long memberId, String keyword, Long categoryId, From 593429b363944e08bf1e87d2ba4900442f91706d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98jminkkk=E2=80=99?= <102847513+jminkkk@users.noreply.github.com> Date: Wed, 21 Aug 2024 22:08:26 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat(controller):=20explore=20API=20?= =?UTF-8?q?=EB=A5=BC=20=ED=85=9C=ED=94=8C=EB=A6=BF=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=99=80=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TemplateController.java | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/backend/src/main/java/codezap/template/controller/TemplateController.java b/backend/src/main/java/codezap/template/controller/TemplateController.java index f2ef75700..9edc7cec3 100644 --- a/backend/src/main/java/codezap/template/controller/TemplateController.java +++ b/backend/src/main/java/codezap/template/controller/TemplateController.java @@ -21,11 +21,10 @@ import codezap.member.dto.MemberDto; import codezap.template.dto.request.CreateTemplateRequest; import codezap.template.dto.request.UpdateTemplateRequest; -import codezap.template.dto.response.ExploreTemplatesResponse; import codezap.template.dto.response.FindAllTemplatesResponse; import codezap.template.dto.response.FindTemplateResponse; -import codezap.template.service.ThumbnailService; import codezap.template.service.facade.MemberTemplateApplicationService; +import codezap.template.service.facade.TemplateApplicationService; import lombok.RequiredArgsConstructor; @RestController @@ -34,7 +33,7 @@ public class TemplateController implements SpringDocTemplateController { private final MemberTemplateApplicationService memberTemplateApplicationService; - private final ThumbnailService thumbnailService; + private final TemplateApplicationService templateApplicationService; @PostMapping public ResponseEntity createTemplate( @@ -48,15 +47,14 @@ public ResponseEntity createTemplate( @GetMapping public ResponseEntity getTemplates( - @AuthenticationPrinciple MemberDto memberDto, - @RequestParam Long memberId, - @RequestParam String keyword, + @RequestParam(required = false) Long memberId, + @RequestParam(required = false) String keyword, @RequestParam(required = false) Long categoryId, @RequestParam(required = false) List tagIds, @PageableDefault(size = 20, page = 1) Pageable pageable ) { - FindAllTemplatesResponse response = - memberTemplateApplicationService.findAllBy(memberDto, memberId, keyword, categoryId, tagIds, pageable); + FindAllTemplatesResponse response = templateApplicationService.findAllBy(memberId, keyword, categoryId, tagIds, + pageable); return ResponseEntity.ok(response); } @@ -68,11 +66,6 @@ public ResponseEntity getTemplateById( return ResponseEntity.ok(memberTemplateApplicationService.getByIdAndMember(memberDto, id)); } - @GetMapping("/explore") - public ResponseEntity explore() { - return ResponseEntity.ok(thumbnailService.findAll()); - } - @PostMapping("/{id}") public ResponseEntity updateTemplate( @AuthenticationPrinciple MemberDto memberDto, From cb2f36cb1f4561ed8b528bdf729efee227352a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98jminkkk=E2=80=99?= <102847513+jminkkk@users.noreply.github.com> Date: Wed, 21 Aug 2024 22:11:15 +0900 Subject: [PATCH 3/6] =?UTF-8?q?feat(template):=20=EA=B8=B0=EC=A1=B4=20?= =?UTF-8?q?=EB=B6=84=EA=B8=B0=EC=B2=98=EB=A6=AC=EB=90=9C=20=EC=BF=BC?= =?UTF-8?q?=EB=A6=AC=EB=A5=BC=20Specification=EB=A5=BC=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EC=97=AC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/TemplateJpaRepository.java | 78 ---- .../repository/TemplateRepository.java | 8 - .../template/service/TemplateService.java | 29 +- .../CategoryTemplateApplicationService.java | 20 - .../MemberTemplateApplicationService.java | 12 - .../facade/TemplateApplicationService.java | 34 +- .../controller/TemplateControllerTest.java | 143 +------ .../repository/FakeTemplateRepository.java | 67 +-- .../service/TemplateServiceSearchTest.java | 396 ------------------ .../template/service/TemplateServiceTest.java | 31 +- 10 files changed, 51 insertions(+), 767 deletions(-) delete mode 100644 backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java diff --git a/backend/src/main/java/codezap/template/repository/TemplateJpaRepository.java b/backend/src/main/java/codezap/template/repository/TemplateJpaRepository.java index b7330c1a3..84c057ac7 100644 --- a/backend/src/main/java/codezap/template/repository/TemplateJpaRepository.java +++ b/backend/src/main/java/codezap/template/repository/TemplateJpaRepository.java @@ -7,8 +7,6 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; import org.springframework.http.HttpStatus; import codezap.global.exception.CodeZapException; @@ -27,81 +25,5 @@ default Template fetchById(Long id) { Page