From 59fe23804876da8ebd1756ab246f58fec43fda9d Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Mon, 19 Feb 2024 03:50:31 +0900 Subject: [PATCH 01/20] =?UTF-8?q?[Chore]=20ImageService=20=EC=98=A4?= =?UTF-8?q?=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ttubeog/domain/image/application/ImageService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ttubeog/domain/image/application/ImageService.java b/src/main/java/com/ttubeog/domain/image/application/ImageService.java index d270450..6ff8cd9 100644 --- a/src/main/java/com/ttubeog/domain/image/application/ImageService.java +++ b/src/main/java/com/ttubeog/domain/image/application/ImageService.java @@ -68,7 +68,7 @@ public ResponseEntity createSpotImage(HttpServletRequest request, Long spotId .spot(spot) .build(); - String imageUrl = amazonS3Manager.uploadFile(amazonS3Manager.generateStoreKeyName(image), multipartFile); + String imageUrl = amazonS3Manager.uploadFile(amazonS3Manager.generateSpotKeyName(image), multipartFile); image.updateImageUrl(imageUrl); Image savedImage = imageRepository.save(image); @@ -149,7 +149,7 @@ public ResponseEntity createGuestBookImage(HttpServletRequest request, Long g .guestBook(guestBook) .build(); - String imageUrl = amazonS3Manager.uploadFile(amazonS3Manager.generateStoreKeyName(image), multipartFile); + String imageUrl = amazonS3Manager.uploadFile(amazonS3Manager.generateGuestBookKeyName(image), multipartFile); image.updateImageUrl(imageUrl); Image savedImage = imageRepository.save(image); From 62d65679960dcd8ddfd8b77a9152a461207b1c45 Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Thu, 7 Mar 2024 01:54:24 +0900 Subject: [PATCH 02/20] =?UTF-8?q?[Docs]=20Swagger=20=EB=82=B4=EC=9A=A9=20?= =?UTF-8?q?=EB=B3=B4=EC=B6=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/presentation/StoreController.java | 52 +++++++++++++++---- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/ttubeog/domain/store/presentation/StoreController.java b/src/main/java/com/ttubeog/domain/store/presentation/StoreController.java index 5083785..46d65b0 100644 --- a/src/main/java/com/ttubeog/domain/store/presentation/StoreController.java +++ b/src/main/java/com/ttubeog/domain/store/presentation/StoreController.java @@ -1,7 +1,6 @@ package com.ttubeog.domain.store.presentation; import com.fasterxml.jackson.core.JsonProcessingException; -import com.ttubeog.domain.benefit.application.BenefitService; import com.ttubeog.domain.game.application.GameService; import com.ttubeog.domain.game.dto.response.FindGameRes; import com.ttubeog.domain.likes.application.LikesService; @@ -36,10 +35,15 @@ public class StoreController { private final GameService gameService; - // 매장 등록 + /** + * 매장 등록 API + * @param request 유저 검증 + * @param registerStoreReq 매장 등록 DTO + * @return ApiResponse (check: true, information: registerStoreRes) + */ @Operation(summary = "매장 등록", description = "매장을 등록합니다.") @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "매장 등록 성공", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = RegisterStoreRes.class))}), + @ApiResponse(responseCode = "200", description = "OK", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = RegisterStoreRes.class))}), @ApiResponse(responseCode = "400", description = "매장 등록 실패", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))}) }) @PostMapping @@ -50,10 +54,15 @@ public ResponseEntity registerStore( return storeService.registerStore(request, registerStoreReq); } - // 매장 수정 + /** + * 매장 수정 API + * @param request 유저 검증 + * @param updateStoreReq 매장 수정 DTO + * @return ApiResponse (check: true, information: updateStoreRes) + */ @Operation(summary = "매장 수정", description = "매장 정보를 수정합니다.") @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "매장 수정 성공", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = UpdateStoreRes.class))}), + @ApiResponse(responseCode = "200", description = "OK", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = UpdateStoreRes.class))}), @ApiResponse(responseCode = "400", description = "매장 수정 실패", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))}) }) @PatchMapping @@ -64,10 +73,15 @@ public ResponseEntity updateStore( return storeService.updateStore(request, updateStoreReq); } - // 매장 삭제 + /** + * 매장 삭제 API + * @param request 유저 검증 + * @param storeId 매장 ID + * @return ApiResponse (check: true, information: message) + */ @Operation(summary = "매장 삭제", description = "매장 정보를 삭제합니다.") @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "매장 삭제 성공", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = Message.class))}), + @ApiResponse(responseCode = "200", description = "OK", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = Message.class))}), @ApiResponse(responseCode = "400", description = "매장 삭제 실패", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))}) }) @DeleteMapping("/{storeId}") @@ -78,10 +92,15 @@ public ResponseEntity deleteStore( return storeService.deleteStore(request, storeId); } - // 매장 세부사항 조회 + /** + * 매장 세부사항 조회 API + * @param request 유저검증 + * @param storeId 매장 ID + * @return ApiResponse (check: true, information: getStoreDetailRes) + */ @Operation(summary = "매장 세부사항 조회", description = "매장 세부사항을 조회합니다.") @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "매장 세부사항 조회 성공", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = GetStoreDetailRes.class))}), + @ApiResponse(responseCode = "200", description = "매장 ", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = GetStoreDetailRes.class))}), @ApiResponse(responseCode = "400", description = "매장 세부사항 조회 실패", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))}) }) @GetMapping("/{storeId}") @@ -92,7 +111,12 @@ public ResponseEntity getStoreDetails( return storeService.getStoreDetails(request, storeId); } - // 매장 좋아요 누르기 + /** + * 매장 좋아요 누르기 API + * @param request 유저 검증 + * @param storeId 매장 ID + * @return ApiResponse (check: true, information: message) + */ @Operation(summary = "매장 좋아요 누르기", description = "매장에 대한 좋아요를 누릅니다.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "매장 좋아요 누르기 성공", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = Message.class))}), @@ -106,7 +130,13 @@ public ResponseEntity likesStore( return likesService.likesStore(request, storeId); } - //StoreId로 매장, 혜택 조회 + /** + * 매장 혜택 조회 API + * @param request 유저 검증 + * @param storeId 매장 ID + * @return ApiResponse (check: true, information: findGameRes) + * @throws JsonProcessingException JSON Processing 에러 + */ @Operation(summary = "매장으로 게임, 혜택 조회", description = "매장ID에 해당하는 모든 게임과 해당 혜택을 조회합니다.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "게임 조회 누르기 성공", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = FindGameRes.class))}), From 0258f8bfea4113b04c464eee7c6d2b3a23ab0bf4 Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Sat, 16 Mar 2024 18:52:08 +0900 Subject: [PATCH 03/20] =?UTF-8?q?[Remove]=20Tag=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/tag/application/TagService.java | 11 ----------- .../com/ttubeog/domain/tag/domain/RoadTag.java | 6 ------ .../com/ttubeog/domain/tag/domain/SpotTag.java | 6 ------ .../com/ttubeog/domain/tag/domain/StoreTag.java | 6 ------ .../java/com/ttubeog/domain/tag/domain/Tag.java | 15 --------------- .../tag/domain/repository/TagRepository.java | 9 --------- .../domain/tag/presentation/TagController.java | 7 ------- 7 files changed, 60 deletions(-) delete mode 100644 src/main/java/com/ttubeog/domain/tag/application/TagService.java delete mode 100644 src/main/java/com/ttubeog/domain/tag/domain/RoadTag.java delete mode 100644 src/main/java/com/ttubeog/domain/tag/domain/SpotTag.java delete mode 100644 src/main/java/com/ttubeog/domain/tag/domain/StoreTag.java delete mode 100644 src/main/java/com/ttubeog/domain/tag/domain/Tag.java delete mode 100644 src/main/java/com/ttubeog/domain/tag/domain/repository/TagRepository.java delete mode 100644 src/main/java/com/ttubeog/domain/tag/presentation/TagController.java diff --git a/src/main/java/com/ttubeog/domain/tag/application/TagService.java b/src/main/java/com/ttubeog/domain/tag/application/TagService.java deleted file mode 100644 index d317f47..0000000 --- a/src/main/java/com/ttubeog/domain/tag/application/TagService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.ttubeog.domain.tag.application; - -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@RequiredArgsConstructor -@Service -@Transactional(readOnly = true) -public class TagService { -} diff --git a/src/main/java/com/ttubeog/domain/tag/domain/RoadTag.java b/src/main/java/com/ttubeog/domain/tag/domain/RoadTag.java deleted file mode 100644 index dab31aa..0000000 --- a/src/main/java/com/ttubeog/domain/tag/domain/RoadTag.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.ttubeog.domain.tag.domain; - -import com.ttubeog.domain.common.BaseEntity; - -public class RoadTag extends BaseEntity { -} diff --git a/src/main/java/com/ttubeog/domain/tag/domain/SpotTag.java b/src/main/java/com/ttubeog/domain/tag/domain/SpotTag.java deleted file mode 100644 index 34276e0..0000000 --- a/src/main/java/com/ttubeog/domain/tag/domain/SpotTag.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.ttubeog.domain.tag.domain; - -import com.ttubeog.domain.common.BaseEntity; - -public class SpotTag extends BaseEntity { -} diff --git a/src/main/java/com/ttubeog/domain/tag/domain/StoreTag.java b/src/main/java/com/ttubeog/domain/tag/domain/StoreTag.java deleted file mode 100644 index 46bb60d..0000000 --- a/src/main/java/com/ttubeog/domain/tag/domain/StoreTag.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.ttubeog.domain.tag.domain; - -import com.ttubeog.domain.common.BaseEntity; - -public class StoreTag extends BaseEntity { -} diff --git a/src/main/java/com/ttubeog/domain/tag/domain/Tag.java b/src/main/java/com/ttubeog/domain/tag/domain/Tag.java deleted file mode 100644 index 6b17553..0000000 --- a/src/main/java/com/ttubeog/domain/tag/domain/Tag.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ttubeog.domain.tag.domain; - -import com.ttubeog.domain.common.BaseEntity; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; - -@Entity -public class Tag extends BaseEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; -} diff --git a/src/main/java/com/ttubeog/domain/tag/domain/repository/TagRepository.java b/src/main/java/com/ttubeog/domain/tag/domain/repository/TagRepository.java deleted file mode 100644 index 2a13288..0000000 --- a/src/main/java/com/ttubeog/domain/tag/domain/repository/TagRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.ttubeog.domain.tag.domain.repository; - -import com.ttubeog.domain.tag.domain.Tag; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface TagRepository extends JpaRepository { -} diff --git a/src/main/java/com/ttubeog/domain/tag/presentation/TagController.java b/src/main/java/com/ttubeog/domain/tag/presentation/TagController.java deleted file mode 100644 index 3e8ce15..0000000 --- a/src/main/java/com/ttubeog/domain/tag/presentation/TagController.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.ttubeog.domain.tag.presentation; - -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class TagController { -} From 1304e3f459cf9e04f9467fe793e4e0dcdf9971cb Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Sat, 16 Mar 2024 18:52:28 +0900 Subject: [PATCH 04/20] =?UTF-8?q?[Remove]=20Sido=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ttubeog/domain/area/domain/SidoArea.java | 15 --------------- .../domain/repository/SidoAreaRepository.java | 9 --------- 2 files changed, 24 deletions(-) delete mode 100644 src/main/java/com/ttubeog/domain/area/domain/SidoArea.java delete mode 100644 src/main/java/com/ttubeog/domain/area/domain/repository/SidoAreaRepository.java diff --git a/src/main/java/com/ttubeog/domain/area/domain/SidoArea.java b/src/main/java/com/ttubeog/domain/area/domain/SidoArea.java deleted file mode 100644 index 8f51e93..0000000 --- a/src/main/java/com/ttubeog/domain/area/domain/SidoArea.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ttubeog.domain.area.domain; - -import com.ttubeog.domain.common.BaseEntity; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; - -@Entity -public class SidoArea extends BaseEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; -} diff --git a/src/main/java/com/ttubeog/domain/area/domain/repository/SidoAreaRepository.java b/src/main/java/com/ttubeog/domain/area/domain/repository/SidoAreaRepository.java deleted file mode 100644 index e3b17dd..0000000 --- a/src/main/java/com/ttubeog/domain/area/domain/repository/SidoAreaRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.ttubeog.domain.area.domain.repository; - -import com.ttubeog.domain.area.domain.SidoArea; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface SidoAreaRepository extends JpaRepository { -} From 971168319e5381b342a6e5d28398abbf6e0d9af7 Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Sat, 16 Mar 2024 18:52:38 +0900 Subject: [PATCH 05/20] =?UTF-8?q?[Remove]=20Sigg=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ttubeog/domain/area/domain/SiggArea.java | 15 --------------- .../domain/repository/SiggAreaRepository.java | 9 --------- 2 files changed, 24 deletions(-) delete mode 100644 src/main/java/com/ttubeog/domain/area/domain/SiggArea.java delete mode 100644 src/main/java/com/ttubeog/domain/area/domain/repository/SiggAreaRepository.java diff --git a/src/main/java/com/ttubeog/domain/area/domain/SiggArea.java b/src/main/java/com/ttubeog/domain/area/domain/SiggArea.java deleted file mode 100644 index 2706ca0..0000000 --- a/src/main/java/com/ttubeog/domain/area/domain/SiggArea.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ttubeog.domain.area.domain; - -import com.ttubeog.domain.common.BaseEntity; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; - -@Entity -public class SiggArea extends BaseEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; -} diff --git a/src/main/java/com/ttubeog/domain/area/domain/repository/SiggAreaRepository.java b/src/main/java/com/ttubeog/domain/area/domain/repository/SiggAreaRepository.java deleted file mode 100644 index b404e61..0000000 --- a/src/main/java/com/ttubeog/domain/area/domain/repository/SiggAreaRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.ttubeog.domain.area.domain.repository; - -import com.ttubeog.domain.area.domain.SiggArea; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface SiggAreaRepository extends JpaRepository { -} From 2b78cb2e5bc715f996f08017e8973d09c0bf1a91 Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Sat, 16 Mar 2024 18:56:10 +0900 Subject: [PATCH 06/20] =?UTF-8?q?[Remove]=20AreaService,=20AreaController?= =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ttubeog/domain/area/application/AreaService.java | 11 ----------- .../domain/area/presentation/AreaController.java | 7 ------- 2 files changed, 18 deletions(-) delete mode 100644 src/main/java/com/ttubeog/domain/area/application/AreaService.java delete mode 100644 src/main/java/com/ttubeog/domain/area/presentation/AreaController.java diff --git a/src/main/java/com/ttubeog/domain/area/application/AreaService.java b/src/main/java/com/ttubeog/domain/area/application/AreaService.java deleted file mode 100644 index 1c95ff7..0000000 --- a/src/main/java/com/ttubeog/domain/area/application/AreaService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.ttubeog.domain.area.application; - -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@RequiredArgsConstructor -@Service -@Transactional(readOnly = true) -public class AreaService { -} diff --git a/src/main/java/com/ttubeog/domain/area/presentation/AreaController.java b/src/main/java/com/ttubeog/domain/area/presentation/AreaController.java deleted file mode 100644 index d5f8f22..0000000 --- a/src/main/java/com/ttubeog/domain/area/presentation/AreaController.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.ttubeog.domain.area.presentation; - -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class AreaController { -} From 57d564f7719058b281d36820436cf496648b43b5 Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Sat, 16 Mar 2024 19:33:15 +0900 Subject: [PATCH 07/20] =?UTF-8?q?[Chore]=20=EB=B3=80=EC=88=98=EB=AA=85=20?= =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ttubeog/domain/benefit/dto/response/SaveBenefitRes.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ttubeog/domain/benefit/dto/response/SaveBenefitRes.java b/src/main/java/com/ttubeog/domain/benefit/dto/response/SaveBenefitRes.java index 721cd72..b0a469a 100644 --- a/src/main/java/com/ttubeog/domain/benefit/dto/response/SaveBenefitRes.java +++ b/src/main/java/com/ttubeog/domain/benefit/dto/response/SaveBenefitRes.java @@ -32,13 +32,13 @@ public class SaveBenefitRes { private Boolean used; @Schema(description = "만료 여부", example = "false") - private Boolean expried; + private Boolean expired; @Schema(description = "혜택 저장 시간", example = "2024-01-12 09:30:50") private LocalDateTime createdAt; @Builder - public SaveBenefitRes(Long id, Long benefitId, Long storeId, String storeName, String content, BenefitType type, Boolean used, Boolean expried, LocalDateTime createdAt) { + public SaveBenefitRes(Long id, Long benefitId, Long storeId, String storeName, String content, BenefitType type, Boolean used, Boolean expired, LocalDateTime createdAt) { this.id = id; this.benefitId = benefitId; this.storeId = storeId; @@ -46,7 +46,7 @@ public SaveBenefitRes(Long id, Long benefitId, Long storeId, String storeName, S this.content = content; this.type = type; this.used = used; - this.expried = expried; + this.expired = expired; this.createdAt = createdAt; } } From 87871de95ce73828221359b57ff4b463fb1ffd68 Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Fri, 22 Mar 2024 17:05:16 +0900 Subject: [PATCH 08/20] =?UTF-8?q?[Chore]=20=EB=B3=80=EC=88=98=EB=AA=85=20?= =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ttubeog/domain/benefit/application/BenefitService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ttubeog/domain/benefit/application/BenefitService.java b/src/main/java/com/ttubeog/domain/benefit/application/BenefitService.java index 38de849..2a007b4 100644 --- a/src/main/java/com/ttubeog/domain/benefit/application/BenefitService.java +++ b/src/main/java/com/ttubeog/domain/benefit/application/BenefitService.java @@ -69,7 +69,7 @@ public ApiResponse saveBenefit(HttpServletRequest request, Long benefitId) throw .content(benefit.getContent()) .type(benefit.getType()) .used(memberBenefit.getUsed()) - .expried(memberBenefit.getExpired()) + .expired(memberBenefit.getExpired()) .createdAt(memberBenefit.getCreatedAt()) .build(); @@ -101,7 +101,7 @@ public ApiResponse useBenefit(HttpServletRequest request, Long benefitId) throws .storeId(benefit.getStore().getId()) .storeName(benefit.getStore().getName()) .used(memberBenefit.getUsed()) - .expried(memberBenefit.getExpired()) + .expired(memberBenefit.getExpired()) .createdAt(memberBenefit.getCreatedAt()) .content(benefit.getContent()) .type(benefit.getType()) @@ -124,7 +124,7 @@ public ApiResponse findMyBenefit(HttpServletRequest request, Integer page) throw .storeId(memberBenefit.getBenefit().getStore().getId()) .storeName(memberBenefit.getBenefit().getStore().getName()) .used(memberBenefit.getUsed()) - .expried(memberBenefit.getExpired()) + .expired(memberBenefit.getExpired()) .createdAt(memberBenefit.getCreatedAt()) .content(memberBenefit.getBenefit().getContent()) .type(memberBenefit.getBenefit().getType()) From 1af00b2c3af96baa7fc22194ab88e3fc8b71abb5 Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Fri, 22 Mar 2024 17:11:06 +0900 Subject: [PATCH 09/20] =?UTF-8?q?[Remove]=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ttubeog/domain/benefit/application/BenefitService.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/ttubeog/domain/benefit/application/BenefitService.java b/src/main/java/com/ttubeog/domain/benefit/application/BenefitService.java index 2a007b4..41e11bb 100644 --- a/src/main/java/com/ttubeog/domain/benefit/application/BenefitService.java +++ b/src/main/java/com/ttubeog/domain/benefit/application/BenefitService.java @@ -14,13 +14,11 @@ import com.ttubeog.domain.member.domain.Member; import com.ttubeog.domain.member.domain.repository.MemberRepository; import com.ttubeog.domain.member.exception.InvalidMemberException; -import com.ttubeog.domain.store.domain.repository.StoreRepository; import com.ttubeog.global.payload.ApiResponse; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,7 +34,6 @@ public class BenefitService { private final MemberRepository memberRepository; private final BenefitRepository benefitRepository; private final MemberBenefitRepository memberBenefitRepository; - private final StoreRepository storeRepository; private final JwtTokenProvider jwtTokenProvider; //게임 성공 후 혜택 저장 From f1932f462e76876a3ac7d2f4a6568a7ac8433e4e Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Fri, 22 Mar 2024 17:12:31 +0900 Subject: [PATCH 10/20] =?UTF-8?q?[Chore]=20API=20=EC=97=94=EB=93=9C?= =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ttubeog/domain/benefit/presentation/BenefitController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ttubeog/domain/benefit/presentation/BenefitController.java b/src/main/java/com/ttubeog/domain/benefit/presentation/BenefitController.java index 8f12215..7edc59f 100644 --- a/src/main/java/com/ttubeog/domain/benefit/presentation/BenefitController.java +++ b/src/main/java/com/ttubeog/domain/benefit/presentation/BenefitController.java @@ -43,7 +43,7 @@ public ResponseEntity saveBenefit( @ApiResponse(responseCode = "200", description = "혜택 사용 성공", content = { @Content(mediaType = "application/json", schema = @Schema(implementation = SaveBenefitRes.class) ) } ), @ApiResponse(responseCode = "400", description = "혜택 사용 실패", content = { @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class) ) } ), }) - @PatchMapping("{benefitId}/use") + @PatchMapping("/{benefitId}/use") public ResponseEntity useBenefit( HttpServletRequest request, @PathVariable(value = "benefitId") Long benefitId From 3841314375867e8cd3e7044d31399859b0a7cd15 Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Fri, 22 Mar 2024 17:29:01 +0900 Subject: [PATCH 11/20] =?UTF-8?q?[Chore]=20API=20=EC=97=94=EB=93=9C?= =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/guestbook/presentation/GuestBookController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ttubeog/domain/guestbook/presentation/GuestBookController.java b/src/main/java/com/ttubeog/domain/guestbook/presentation/GuestBookController.java index 24a8fdb..8681e68 100644 --- a/src/main/java/com/ttubeog/domain/guestbook/presentation/GuestBookController.java +++ b/src/main/java/com/ttubeog/domain/guestbook/presentation/GuestBookController.java @@ -22,7 +22,7 @@ @Tag(name = "GuestBook", description = "GuestBook API(방명록 API)") @RequiredArgsConstructor @RestController -@RequestMapping("api/v1/guestbook") +@RequestMapping("/api/v1/guestbook") public class GuestBookController { private final GuestBookService guestBookService; From 933c0b0e0be837a614c77ebcc43cc3e08eda866c Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Fri, 22 Mar 2024 17:31:45 +0900 Subject: [PATCH 12/20] =?UTF-8?q?[Chore]=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20import=EB=AC=B8=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ttubeog/domain/guestbook/application/GuestBookService.java | 3 --- .../domain/guestbook/presentation/GuestBookController.java | 1 - 2 files changed, 4 deletions(-) diff --git a/src/main/java/com/ttubeog/domain/guestbook/application/GuestBookService.java b/src/main/java/com/ttubeog/domain/guestbook/application/GuestBookService.java index 25a1831..654c159 100644 --- a/src/main/java/com/ttubeog/domain/guestbook/application/GuestBookService.java +++ b/src/main/java/com/ttubeog/domain/guestbook/application/GuestBookService.java @@ -1,6 +1,5 @@ package com.ttubeog.domain.guestbook.application; -import com.ttubeog.domain.UuidImage.domain.UuidImage; import com.ttubeog.domain.UuidImage.domain.repository.UuidImageRepository; import com.ttubeog.domain.auth.security.JwtTokenProvider; import com.ttubeog.domain.aws.s3.AmazonS3Manager; @@ -32,9 +31,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.List; -import java.util.UUID; @RequiredArgsConstructor @Service diff --git a/src/main/java/com/ttubeog/domain/guestbook/presentation/GuestBookController.java b/src/main/java/com/ttubeog/domain/guestbook/presentation/GuestBookController.java index 8681e68..24c4170 100644 --- a/src/main/java/com/ttubeog/domain/guestbook/presentation/GuestBookController.java +++ b/src/main/java/com/ttubeog/domain/guestbook/presentation/GuestBookController.java @@ -17,7 +17,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; @Tag(name = "GuestBook", description = "GuestBook API(방명록 API)") @RequiredArgsConstructor From 41d0da2be3f34d8b0cca2bece5fe4c6b5ed0262c Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Fri, 22 Mar 2024 17:32:12 +0900 Subject: [PATCH 13/20] =?UTF-8?q?[Remove]=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/guestbook/application/GuestBookService.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/com/ttubeog/domain/guestbook/application/GuestBookService.java b/src/main/java/com/ttubeog/domain/guestbook/application/GuestBookService.java index 654c159..c7b7576 100644 --- a/src/main/java/com/ttubeog/domain/guestbook/application/GuestBookService.java +++ b/src/main/java/com/ttubeog/domain/guestbook/application/GuestBookService.java @@ -42,12 +42,6 @@ public class GuestBookService { private final MemberRepository memberRepository; private final SpotRepository spotRepository; private final StoreRepository storeRepository; - private final ImageRepository imageRepository; - private final UuidImageRepository uuidImageRepository; - - //private final ImageService imageService; - - private final AmazonS3Manager amazonS3Manager; private final JwtTokenProvider jwtTokenProvider; From 389110396e65581e4563d8766c895b3b57f08f46 Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Fri, 22 Mar 2024 17:34:32 +0900 Subject: [PATCH 14/20] =?UTF-8?q?[Chore]=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=84=B8=EB=AF=B8=EC=BD=9C=EB=A1=A0=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ttubeog/domain/guestbook/domain/GuestBookType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ttubeog/domain/guestbook/domain/GuestBookType.java b/src/main/java/com/ttubeog/domain/guestbook/domain/GuestBookType.java index 241c544..4d7b0d2 100644 --- a/src/main/java/com/ttubeog/domain/guestbook/domain/GuestBookType.java +++ b/src/main/java/com/ttubeog/domain/guestbook/domain/GuestBookType.java @@ -5,5 +5,5 @@ @Getter public enum GuestBookType { SPOT, - STORE; + STORE } From 8d5454a6c1444f2b3405f529ab53833533ca6b28 Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Fri, 22 Mar 2024 17:41:24 +0900 Subject: [PATCH 15/20] =?UTF-8?q?[Chore]=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=84=B8=EB=AF=B8=EC=BD=9C=EB=A1=A0=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ttubeog/domain/road/domain/RoadType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ttubeog/domain/road/domain/RoadType.java b/src/main/java/com/ttubeog/domain/road/domain/RoadType.java index 84e8910..cc623fb 100644 --- a/src/main/java/com/ttubeog/domain/road/domain/RoadType.java +++ b/src/main/java/com/ttubeog/domain/road/domain/RoadType.java @@ -3,5 +3,5 @@ public enum RoadType { SPOT, - STORE; + STORE } From 70dc8bc57c68b32e10af01f863d8bd5ad71342ea Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Fri, 22 Mar 2024 17:42:30 +0900 Subject: [PATCH 16/20] =?UTF-8?q?[Chore]=20API=20=EC=97=94=EB=93=9C?= =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ttubeog/domain/road/presentation/RoadController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ttubeog/domain/road/presentation/RoadController.java b/src/main/java/com/ttubeog/domain/road/presentation/RoadController.java index d913cd7..57feb67 100644 --- a/src/main/java/com/ttubeog/domain/road/presentation/RoadController.java +++ b/src/main/java/com/ttubeog/domain/road/presentation/RoadController.java @@ -22,7 +22,7 @@ @Tag(name = "Road", description = "Road API(산책로 API)") @RequiredArgsConstructor @RestController -@RequestMapping("api/v1/road") +@RequestMapping("/api/v1/road") public class RoadController { private final RoadService roadService; From 02148b1d10364780a8878367b299fd4f417551e2 Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Fri, 22 Mar 2024 17:44:57 +0900 Subject: [PATCH 17/20] =?UTF-8?q?[Chore]=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20import=EB=AC=B8=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ttubeog/domain/spot/application/SpotService.java | 2 -- src/main/java/com/ttubeog/domain/spot/domain/Spot.java | 6 ------ .../domain/spot/dto/request/CreateSpotRequestDto.java | 1 - .../ttubeog/domain/spot/dto/response/GetSpotDetailRes.java | 2 -- .../ttubeog/domain/spot/dto/response/SpotResponseDto.java | 2 -- .../ttubeog/domain/spot/presentation/SpotController.java | 1 - 6 files changed, 14 deletions(-) diff --git a/src/main/java/com/ttubeog/domain/spot/application/SpotService.java b/src/main/java/com/ttubeog/domain/spot/application/SpotService.java index 6791236..96f7747 100644 --- a/src/main/java/com/ttubeog/domain/spot/application/SpotService.java +++ b/src/main/java/com/ttubeog/domain/spot/application/SpotService.java @@ -6,9 +6,7 @@ import com.ttubeog.domain.guestbook.domain.repository.GuestBookRepository; import com.ttubeog.domain.image.application.ImageService; import com.ttubeog.domain.image.domain.Image; -import com.ttubeog.domain.image.domain.ImageType; import com.ttubeog.domain.image.domain.repository.ImageRepository; -import com.ttubeog.domain.image.dto.request.CreateImageRequestDto; import com.ttubeog.domain.likes.domain.repository.LikesRepository; import com.ttubeog.domain.member.domain.Member; import com.ttubeog.domain.member.domain.repository.MemberRepository; diff --git a/src/main/java/com/ttubeog/domain/spot/domain/Spot.java b/src/main/java/com/ttubeog/domain/spot/domain/Spot.java index eb17831..eb6e38a 100644 --- a/src/main/java/com/ttubeog/domain/spot/domain/Spot.java +++ b/src/main/java/com/ttubeog/domain/spot/domain/Spot.java @@ -1,8 +1,6 @@ package com.ttubeog.domain.spot.domain; -import com.ttubeog.domain.area.domain.DongArea; import com.ttubeog.domain.common.BaseEntity; -import com.ttubeog.domain.image.domain.Image; import com.ttubeog.domain.member.domain.Member; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; @@ -10,10 +8,6 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.apache.ibatis.annotations.Many; -import org.hibernate.annotations.Fetch; - -import java.util.List; @NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter diff --git a/src/main/java/com/ttubeog/domain/spot/dto/request/CreateSpotRequestDto.java b/src/main/java/com/ttubeog/domain/spot/dto/request/CreateSpotRequestDto.java index 82ce67f..3362554 100644 --- a/src/main/java/com/ttubeog/domain/spot/dto/request/CreateSpotRequestDto.java +++ b/src/main/java/com/ttubeog/domain/spot/dto/request/CreateSpotRequestDto.java @@ -5,7 +5,6 @@ import lombok.Builder; import lombok.Getter; -import java.util.List; @Schema(description = "게시글 생성 DTO") @Getter diff --git a/src/main/java/com/ttubeog/domain/spot/dto/response/GetSpotDetailRes.java b/src/main/java/com/ttubeog/domain/spot/dto/response/GetSpotDetailRes.java index 3ab61c1..b76f5aa 100644 --- a/src/main/java/com/ttubeog/domain/spot/dto/response/GetSpotDetailRes.java +++ b/src/main/java/com/ttubeog/domain/spot/dto/response/GetSpotDetailRes.java @@ -1,8 +1,6 @@ package com.ttubeog.domain.spot.dto.response; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ttubeog.domain.benefit.domain.BenefitType; -import com.ttubeog.domain.store.domain.StoreType; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/ttubeog/domain/spot/dto/response/SpotResponseDto.java b/src/main/java/com/ttubeog/domain/spot/dto/response/SpotResponseDto.java index e11b81b..2971fa7 100644 --- a/src/main/java/com/ttubeog/domain/spot/dto/response/SpotResponseDto.java +++ b/src/main/java/com/ttubeog/domain/spot/dto/response/SpotResponseDto.java @@ -6,8 +6,6 @@ import lombok.Builder; import lombok.Getter; -import java.util.List; - @Getter @Builder diff --git a/src/main/java/com/ttubeog/domain/spot/presentation/SpotController.java b/src/main/java/com/ttubeog/domain/spot/presentation/SpotController.java index 8672a57..e0c2af5 100644 --- a/src/main/java/com/ttubeog/domain/spot/presentation/SpotController.java +++ b/src/main/java/com/ttubeog/domain/spot/presentation/SpotController.java @@ -1,7 +1,6 @@ package com.ttubeog.domain.spot.presentation; import com.fasterxml.jackson.core.JsonProcessingException; -import com.ttubeog.domain.guestbook.application.GuestBookService; import com.ttubeog.domain.likes.application.LikesService; import com.ttubeog.domain.member.exception.InvalidMemberException; import com.ttubeog.domain.spot.application.SpotService; From 0fe069d7e17ef9f0ffd27f6b194981635620b270 Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Fri, 22 Mar 2024 17:45:41 +0900 Subject: [PATCH 18/20] =?UTF-8?q?[Remove]=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ttubeog/domain/spot/application/SpotService.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/ttubeog/domain/spot/application/SpotService.java b/src/main/java/com/ttubeog/domain/spot/application/SpotService.java index 96f7747..b8aa412 100644 --- a/src/main/java/com/ttubeog/domain/spot/application/SpotService.java +++ b/src/main/java/com/ttubeog/domain/spot/application/SpotService.java @@ -44,9 +44,6 @@ public class SpotService { private final ImageRepository imageRepository; private final GuestBookRepository guestBookRepository; private final LikesRepository likesRepository; - private final BenefitRepository benefitRepository; - - private final ImageService imageService; private final JwtTokenProvider jwtTokenProvider; From 765a54bca5c01dddb7e719a41fb7cce55311515c Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Fri, 22 Mar 2024 17:46:39 +0900 Subject: [PATCH 19/20] =?UTF-8?q?[Chore]=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20import=EB=AC=B8=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ttubeog/domain/spot/application/SpotService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/ttubeog/domain/spot/application/SpotService.java b/src/main/java/com/ttubeog/domain/spot/application/SpotService.java index b8aa412..9f81718 100644 --- a/src/main/java/com/ttubeog/domain/spot/application/SpotService.java +++ b/src/main/java/com/ttubeog/domain/spot/application/SpotService.java @@ -1,10 +1,8 @@ package com.ttubeog.domain.spot.application; import com.ttubeog.domain.auth.security.JwtTokenProvider; -import com.ttubeog.domain.benefit.domain.repository.BenefitRepository; import com.ttubeog.domain.guestbook.domain.GuestBook; import com.ttubeog.domain.guestbook.domain.repository.GuestBookRepository; -import com.ttubeog.domain.image.application.ImageService; import com.ttubeog.domain.image.domain.Image; import com.ttubeog.domain.image.domain.repository.ImageRepository; import com.ttubeog.domain.likes.domain.repository.LikesRepository; From 322e1285f35cc3d8a89fe8f2d7d1b1556241621b Mon Sep 17 00:00:00 2001 From: Jeongmin39 Date: Fri, 22 Mar 2024 17:48:27 +0900 Subject: [PATCH 20/20] =?UTF-8?q?[Chore]=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20import=EB=AC=B8=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ttubeog/domain/store/domain/Store.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/ttubeog/domain/store/domain/Store.java b/src/main/java/com/ttubeog/domain/store/domain/Store.java index a72a1a7..1ce40f8 100644 --- a/src/main/java/com/ttubeog/domain/store/domain/Store.java +++ b/src/main/java/com/ttubeog/domain/store/domain/Store.java @@ -1,6 +1,5 @@ package com.ttubeog.domain.store.domain; -import com.ttubeog.domain.area.domain.DongArea; import com.ttubeog.domain.common.BaseEntity; import com.ttubeog.domain.member.domain.Member; import jakarta.persistence.Table;