From aa07b18d32c9136b32ca9dcca5f78458ec7603fe Mon Sep 17 00:00:00 2001 From: sung-silver Date: Tue, 24 Dec 2024 00:51:02 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[FEAT]=20=EB=B0=B0=EB=84=88=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20API=20=EC=9D=B8=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4?= =?UTF-8?q?=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation/web/banner/api/BannerApi.java | 18 ++++++++++++++++++ .../web/banner/api/BannerApiController.java | 7 +++++++ 2 files changed, 25 insertions(+) diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java index 75958592..6cffe4a1 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java @@ -70,4 +70,22 @@ public interface BannerApi { ) ResponseEntity> createBanner(BannerRequest.BannerCreate request); + @Operation( + summary = "배너 생성 API", + responses = { + @ApiResponse( + responseCode = "200", + description = "배너 수정 성공" + ), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청" + ), + @ApiResponse( + responseCode = "500", + description = "서버 내부 오류" + ) + } + ) + ResponseEntity> updateBanner(Long bannerId, BannerRequest.BannerCreate request); } diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java index 074aa371..3e3fabe4 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java @@ -6,6 +6,7 @@ import org.sopt.makers.operation.dto.BaseResponse; import org.sopt.makers.operation.util.ApiResponseUtil; import org.sopt.makers.operation.web.banner.dto.request.BannerRequest; +import org.sopt.makers.operation.web.banner.dto.request.BannerRequest.*; import org.sopt.makers.operation.web.banner.service.BannerService; import org.springframework.http.ResponseEntity; @@ -44,4 +45,10 @@ public ResponseEntity> createBanner(@RequestBody BannerRequest.B val response = bannerService.createBanner(request); return ApiResponseUtil.success(SUCCESS_CREATE_BANNER, response); } + + @PutMapping("/{bannerId}") + @Override + public ResponseEntity> updateBanner(@PathVariable("bannerId") Long bannerId, BannerCreate request) { + return null; + } } From 19a3df6f5031624b4b441e9ff45932c191aceb1c Mon Sep 17 00:00:00 2001 From: sung-silver Date: Tue, 24 Dec 2024 00:52:55 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[FEAT]=20=EB=B0=B0=EB=84=88=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EC=9D=B8=ED=84=B0?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/makers/operation/web/banner/api/BannerApi.java | 6 +++--- .../operation/web/banner/api/BannerApiController.java | 5 ++--- .../operation/web/banner/dto/request/BannerRequest.java | 2 +- .../makers/operation/web/banner/service/BannerService.java | 6 ++++-- .../operation/web/banner/service/BannerServiceImpl.java | 7 ++++++- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java index 6cffe4a1..efe28570 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java @@ -5,7 +5,7 @@ import org.sopt.makers.operation.dto.BaseResponse; -import org.sopt.makers.operation.web.banner.dto.request.*; +import org.sopt.makers.operation.web.banner.dto.request.BannerRequest.*; import org.springframework.http.ResponseEntity; public interface BannerApi { @@ -68,7 +68,7 @@ public interface BannerApi { ) } ) - ResponseEntity> createBanner(BannerRequest.BannerCreate request); + ResponseEntity> createBanner(BannerCreateOrModify request); @Operation( summary = "배너 생성 API", @@ -87,5 +87,5 @@ public interface BannerApi { ) } ) - ResponseEntity> updateBanner(Long bannerId, BannerRequest.BannerCreate request); + ResponseEntity> updateBanner(Long bannerId, BannerCreateOrModify request); } diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java index 3e3fabe4..bef6ff02 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java @@ -5,7 +5,6 @@ import org.sopt.makers.operation.dto.BaseResponse; import org.sopt.makers.operation.util.ApiResponseUtil; -import org.sopt.makers.operation.web.banner.dto.request.BannerRequest; import org.sopt.makers.operation.web.banner.dto.request.BannerRequest.*; import org.sopt.makers.operation.web.banner.service.BannerService; import org.springframework.http.ResponseEntity; @@ -41,14 +40,14 @@ public ResponseEntity> getIssuedPreSignedUrlForPutImage(@Request @PostMapping @Override - public ResponseEntity> createBanner(@RequestBody BannerRequest.BannerCreate request) { + public ResponseEntity> createBanner(@RequestBody BannerCreateOrModify request) { val response = bannerService.createBanner(request); return ApiResponseUtil.success(SUCCESS_CREATE_BANNER, response); } @PutMapping("/{bannerId}") @Override - public ResponseEntity> updateBanner(@PathVariable("bannerId") Long bannerId, BannerCreate request) { + public ResponseEntity> updateBanner(@PathVariable("bannerId") Long bannerId, BannerCreateOrModify request) { return null; } } diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/dto/request/BannerRequest.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/dto/request/BannerRequest.java index 2721dfab..009a05a8 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/dto/request/BannerRequest.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/dto/request/BannerRequest.java @@ -9,7 +9,7 @@ @RequiredArgsConstructor(access = PRIVATE) public class BannerRequest { - public record BannerCreate( + public record BannerCreateOrModify( @JsonProperty("location") String bannerLocation, @JsonProperty("content_type") String bannerType, @JsonProperty("publisher") String publisher, diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerService.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerService.java index ec33d31c..7d98944e 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerService.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerService.java @@ -1,6 +1,6 @@ package org.sopt.makers.operation.web.banner.service; -import org.sopt.makers.operation.web.banner.dto.request.*; +import org.sopt.makers.operation.web.banner.dto.request.BannerRequest.*; import org.sopt.makers.operation.web.banner.dto.response.BannerResponse; public interface BannerService { @@ -9,5 +9,7 @@ public interface BannerService { BannerResponse.ImagePreSignedUrl getIssuedPreSignedUrlForPutImage(String contentName, String imageType, String imageExtension, String contentType); - BannerResponse.BannerDetail createBanner(BannerRequest.BannerCreate request); + BannerResponse.BannerDetail createBanner(BannerCreateOrModify request); + + BannerResponse.BannerDetail updateBanner(Long bannerId, BannerCreateOrModify request); } diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java index 8d51ac4b..550df01c 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java @@ -57,7 +57,7 @@ private String getBannerImageName(String location, String contentName, String im @Transactional @Override - public BannerDetail createBanner(BannerCreate request) { + public BannerDetail createBanner(BannerCreateOrModify request) { val period = getPublishPeriod(request.startDate(), request.endDate()); val image = getBannerImage(request.pcImage(), request.mobileImage()); val newBanner = Banner.builder() @@ -73,6 +73,11 @@ public BannerDetail createBanner(BannerCreate request) { return BannerResponse.BannerDetail.fromEntity(banner); } + @Override + public BannerDetail updateBanner(Long bannerId, BannerCreateOrModify request) { + return null; + } + private PublishPeriod getPublishPeriod(LocalDate startDate, LocalDate endDate) { return PublishPeriod.builder() .startDate(startDate) From d629ab7d81cbca87815288d1f4294527da7e1d98 Mon Sep 17 00:00:00 2001 From: sung-silver Date: Tue, 24 Dec 2024 01:03:03 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[FEAT]=20=EA=B8=B0=EC=A1=B4=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=EB=A5=BC=20=EC=82=AD=EC=A0=9C=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/banner/service/BannerServiceImpl.java | 13 ++++++++++++- .../sopt/makers/operation/client/s3/S3Service.java | 2 ++ .../makers/operation/client/s3/S3ServiceImpl.java | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java index 550df01c..b9611b64 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java @@ -20,7 +20,9 @@ @RequiredArgsConstructor @Transactional(readOnly = true) public class BannerServiceImpl implements BannerService { - + private static final String SLASH = "/"; + private static final String PROTOCOL_SEPARATOR = "//"; + private static final int PROTOCOL_END_OFFSET = 2; private final BannerRepository bannerRepository; private final S3Service s3Service; private final ValueConfig valueConfig; @@ -73,11 +75,20 @@ public BannerDetail createBanner(BannerCreateOrModify request) { return BannerResponse.BannerDetail.fromEntity(banner); } + @Transactional @Override public BannerDetail updateBanner(Long bannerId, BannerCreateOrModify request) { + val banner = getBannerById(bannerId); return null; } + private void deleteExistImage(String url) { + val protocolEndIndex = url.indexOf(PROTOCOL_SEPARATOR) + PROTOCOL_END_OFFSET; + val firstSlashIndex = url.indexOf(SLASH, protocolEndIndex); + val extractedPath = url.substring(firstSlashIndex); + s3Service.deleteFile(valueConfig.getBannerBucket(), extractedPath); + } + private PublishPeriod getPublishPeriod(LocalDate startDate, LocalDate endDate) { return PublishPeriod.builder() .startDate(startDate) diff --git a/operation-external/src/main/java/org/sopt/makers/operation/client/s3/S3Service.java b/operation-external/src/main/java/org/sopt/makers/operation/client/s3/S3Service.java index 6b5e1b60..cb5f6a3a 100644 --- a/operation-external/src/main/java/org/sopt/makers/operation/client/s3/S3Service.java +++ b/operation-external/src/main/java/org/sopt/makers/operation/client/s3/S3Service.java @@ -4,4 +4,6 @@ public interface S3Service { String createPreSignedUrlForPutObject(String bucketName, String fileName); String getUrl(String bucketName, String fileName); + + void deleteFile(String bucketName, String fileName); } diff --git a/operation-external/src/main/java/org/sopt/makers/operation/client/s3/S3ServiceImpl.java b/operation-external/src/main/java/org/sopt/makers/operation/client/s3/S3ServiceImpl.java index f14aa89c..a1ffd6b1 100644 --- a/operation-external/src/main/java/org/sopt/makers/operation/client/s3/S3ServiceImpl.java +++ b/operation-external/src/main/java/org/sopt/makers/operation/client/s3/S3ServiceImpl.java @@ -46,7 +46,8 @@ public String getUrl(String bucketName, String fileName) { } } - public void deleteFile(String bucketName, String fileName){ + @Override + public void deleteFile(String bucketName, String fileName) { s3Client.deleteObject(b -> b.bucket(bucketName).key(fileName)); } } \ No newline at end of file From cb1adac627a0c7bb85b6f3321db65ab8556a15c1 Mon Sep 17 00:00:00 2001 From: sung-silver Date: Tue, 24 Dec 2024 01:16:25 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[FEAT]=20=EB=B0=B0=EB=84=88=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/banner/service/BannerServiceImpl.java | 15 +++++++++++++-- .../makers/operation/banner/domain/Banner.java | 6 ++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java index b9611b64..9c37a1cf 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java @@ -78,8 +78,19 @@ public BannerDetail createBanner(BannerCreateOrModify request) { @Transactional @Override public BannerDetail updateBanner(Long bannerId, BannerCreateOrModify request) { - val banner = getBannerById(bannerId); - return null; + var banner = getBannerById(bannerId); + val period = getPublishPeriod(request.startDate(), request.endDate()); + val image = getBannerImage(request.pcImage(), request.mobileImage()); + + deleteExistImage(banner.getImage().getPcImageUrl()); + deleteExistImage(banner.getImage().getMobileImageUrl()); + banner.updatePublisher(request.publisher()); + banner.updateLink(request.link()); + banner.updateContentType(ContentType.getByValue(request.bannerType())); + banner.updateLocation(PublishLocation.getByValue(request.bannerLocation())); + banner.updatePeriod(period); + banner.updateImage(image); + return BannerResponse.BannerDetail.fromEntity(banner); } private void deleteExistImage(String url) { diff --git a/operation-domain/src/main/java/org/sopt/makers/operation/banner/domain/Banner.java b/operation-domain/src/main/java/org/sopt/makers/operation/banner/domain/Banner.java index 0db9ef46..c87dabab 100644 --- a/operation-domain/src/main/java/org/sopt/makers/operation/banner/domain/Banner.java +++ b/operation-domain/src/main/java/org/sopt/makers/operation/banner/domain/Banner.java @@ -81,4 +81,10 @@ public void updateContentType(ContentType contentType) { public void updatePublisher(String publisher) { this.publisher = publisher; } + + public void updateLink(String link) { this.link = link;} + + public void updatePeriod(PublishPeriod period) { this.period = period; } + + public void updateImage(BannerImage image) { this.image = image; } } From 4a3d37ad859004888c9e32014748d760ff2e8c3e Mon Sep 17 00:00:00 2001 From: sung-silver Date: Tue, 24 Dec 2024 01:17:51 +0900 Subject: [PATCH 5/8] =?UTF-8?q?[FEAT]=20=EB=B0=B0=EB=84=88=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../makers/operation/web/banner/api/BannerApiController.java | 4 +++- .../makers/operation/code/success/web/BannerSuccessCode.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java index bef6ff02..791d6a93 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java @@ -14,6 +14,7 @@ import static org.sopt.makers.operation.code.success.web.BannerSuccessCode.SUCCESS_CREATE_BANNER; import static org.sopt.makers.operation.code.success.web.BannerSuccessCode.SUCCESS_GET_BANNER_DETAIL; import static org.sopt.makers.operation.code.success.web.BannerSuccessCode.SUCCESS_GET_BANNER_IMAGE_PRE_SIGNED_URL; +import static org.sopt.makers.operation.code.success.web.BannerSuccessCode.SUCCESS_UPDATE_BANNER; @RestController @RequestMapping("/api/v1/banners") @@ -48,6 +49,7 @@ public ResponseEntity> createBanner(@RequestBody BannerCreateOrM @PutMapping("/{bannerId}") @Override public ResponseEntity> updateBanner(@PathVariable("bannerId") Long bannerId, BannerCreateOrModify request) { - return null; + val response = bannerService.updateBanner(bannerId, request); + return ApiResponseUtil.success(SUCCESS_UPDATE_BANNER, response); } } diff --git a/operation-common/src/main/java/org/sopt/makers/operation/code/success/web/BannerSuccessCode.java b/operation-common/src/main/java/org/sopt/makers/operation/code/success/web/BannerSuccessCode.java index 55546c1a..35264c39 100644 --- a/operation-common/src/main/java/org/sopt/makers/operation/code/success/web/BannerSuccessCode.java +++ b/operation-common/src/main/java/org/sopt/makers/operation/code/success/web/BannerSuccessCode.java @@ -12,6 +12,7 @@ public enum BannerSuccessCode implements SuccessCode { SUCCESS_GET_BANNER_DETAIL(HttpStatus.OK, "배너 상세 정보 조회 성공"), SUCCESS_GET_BANNER_IMAGE_PRE_SIGNED_URL(HttpStatus.OK, "이미지 업로드 pre signed url 조회에 성공했습니다"), + SUCCESS_UPDATE_BANNER(HttpStatus.OK, "이미지 수정에 성공했습니다"), SUCCESS_CREATE_BANNER(HttpStatus.CREATED, "배너 생성에 성공했습니다") ; From 8eb6449f530566af78756c3f48cfad9b378cb6df Mon Sep 17 00:00:00 2001 From: sung-silver Date: Tue, 24 Dec 2024 01:22:36 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[CHORE]=20import=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=ED=8F=AC=EB=A7=A4=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/sopt/makers/operation/web/banner/api/BannerApi.java | 6 +++--- .../operation/web/banner/api/BannerApiController.java | 6 +++--- .../makers/operation/web/banner/service/BannerService.java | 6 +++--- .../operation/web/banner/service/BannerServiceImpl.java | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java index efe28570..f4b2bb0d 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java @@ -5,7 +5,7 @@ import org.sopt.makers.operation.dto.BaseResponse; -import org.sopt.makers.operation.web.banner.dto.request.BannerRequest.*; +import org.sopt.makers.operation.web.banner.dto.request.BannerRequest; import org.springframework.http.ResponseEntity; public interface BannerApi { @@ -68,7 +68,7 @@ public interface BannerApi { ) } ) - ResponseEntity> createBanner(BannerCreateOrModify request); + ResponseEntity> createBanner(BannerRequest.BannerCreateOrModify request); @Operation( summary = "배너 생성 API", @@ -87,5 +87,5 @@ public interface BannerApi { ) } ) - ResponseEntity> updateBanner(Long bannerId, BannerCreateOrModify request); + ResponseEntity> updateBanner(Long bannerId, BannerRequest.BannerCreateOrModify request); } diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java index 791d6a93..29359595 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApiController.java @@ -5,7 +5,7 @@ import org.sopt.makers.operation.dto.BaseResponse; import org.sopt.makers.operation.util.ApiResponseUtil; -import org.sopt.makers.operation.web.banner.dto.request.BannerRequest.*; +import org.sopt.makers.operation.web.banner.dto.request.BannerRequest; import org.sopt.makers.operation.web.banner.service.BannerService; import org.springframework.http.ResponseEntity; @@ -41,14 +41,14 @@ public ResponseEntity> getIssuedPreSignedUrlForPutImage(@Request @PostMapping @Override - public ResponseEntity> createBanner(@RequestBody BannerCreateOrModify request) { + public ResponseEntity> createBanner(@RequestBody BannerRequest.BannerCreateOrModify request) { val response = bannerService.createBanner(request); return ApiResponseUtil.success(SUCCESS_CREATE_BANNER, response); } @PutMapping("/{bannerId}") @Override - public ResponseEntity> updateBanner(@PathVariable("bannerId") Long bannerId, BannerCreateOrModify request) { + public ResponseEntity> updateBanner(@PathVariable("bannerId") Long bannerId, BannerRequest.BannerCreateOrModify request) { val response = bannerService.updateBanner(bannerId, request); return ApiResponseUtil.success(SUCCESS_UPDATE_BANNER, response); } diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerService.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerService.java index 7d98944e..af59c57c 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerService.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerService.java @@ -1,6 +1,6 @@ package org.sopt.makers.operation.web.banner.service; -import org.sopt.makers.operation.web.banner.dto.request.BannerRequest.*; +import org.sopt.makers.operation.web.banner.dto.request.BannerRequest; import org.sopt.makers.operation.web.banner.dto.response.BannerResponse; public interface BannerService { @@ -9,7 +9,7 @@ public interface BannerService { BannerResponse.ImagePreSignedUrl getIssuedPreSignedUrlForPutImage(String contentName, String imageType, String imageExtension, String contentType); - BannerResponse.BannerDetail createBanner(BannerCreateOrModify request); + BannerResponse.BannerDetail createBanner(BannerRequest.BannerCreateOrModify request); - BannerResponse.BannerDetail updateBanner(Long bannerId, BannerCreateOrModify request); + BannerResponse.BannerDetail updateBanner(Long bannerId, BannerRequest.BannerCreateOrModify request); } diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java index 9c37a1cf..37b2e1d0 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/service/BannerServiceImpl.java @@ -10,7 +10,7 @@ import org.sopt.makers.operation.code.failure.BannerFailureCode; import org.sopt.makers.operation.config.ValueConfig; import org.sopt.makers.operation.exception.BannerException; -import org.sopt.makers.operation.web.banner.dto.request.BannerRequest.*; +import org.sopt.makers.operation.web.banner.dto.request.*; import org.sopt.makers.operation.web.banner.dto.response.BannerResponse; import org.sopt.makers.operation.web.banner.dto.response.BannerResponse.*; import org.springframework.stereotype.Service; @@ -59,7 +59,7 @@ private String getBannerImageName(String location, String contentName, String im @Transactional @Override - public BannerDetail createBanner(BannerCreateOrModify request) { + public BannerDetail createBanner(BannerRequest.BannerCreateOrModify request) { val period = getPublishPeriod(request.startDate(), request.endDate()); val image = getBannerImage(request.pcImage(), request.mobileImage()); val newBanner = Banner.builder() @@ -77,7 +77,7 @@ public BannerDetail createBanner(BannerCreateOrModify request) { @Transactional @Override - public BannerDetail updateBanner(Long bannerId, BannerCreateOrModify request) { + public BannerDetail updateBanner(Long bannerId, BannerRequest.BannerCreateOrModify request) { var banner = getBannerById(bannerId); val period = getPublishPeriod(request.startDate(), request.endDate()); val image = getBannerImage(request.pcImage(), request.mobileImage()); From 77106daa658eb902702c1989e7a99ad4e03936d3 Mon Sep 17 00:00:00 2001 From: sung-silver Date: Mon, 13 Jan 2025 22:41:00 +0900 Subject: [PATCH 7/8] =?UTF-8?q?[CHORE]=20=EB=B0=B0=EB=84=88=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20success=20code=20=EB=AC=B8=EA=B5=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../makers/operation/code/success/web/BannerSuccessCode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operation-common/src/main/java/org/sopt/makers/operation/code/success/web/BannerSuccessCode.java b/operation-common/src/main/java/org/sopt/makers/operation/code/success/web/BannerSuccessCode.java index 35264c39..0c810b6b 100644 --- a/operation-common/src/main/java/org/sopt/makers/operation/code/success/web/BannerSuccessCode.java +++ b/operation-common/src/main/java/org/sopt/makers/operation/code/success/web/BannerSuccessCode.java @@ -12,7 +12,7 @@ public enum BannerSuccessCode implements SuccessCode { SUCCESS_GET_BANNER_DETAIL(HttpStatus.OK, "배너 상세 정보 조회 성공"), SUCCESS_GET_BANNER_IMAGE_PRE_SIGNED_URL(HttpStatus.OK, "이미지 업로드 pre signed url 조회에 성공했습니다"), - SUCCESS_UPDATE_BANNER(HttpStatus.OK, "이미지 수정에 성공했습니다"), + SUCCESS_UPDATE_BANNER(HttpStatus.OK, "배너 수정에 성공했습니다"), SUCCESS_CREATE_BANNER(HttpStatus.CREATED, "배너 생성에 성공했습니다") ; From 34254bc45714075d58dc25f3cde6688f9d28a930 Mon Sep 17 00:00:00 2001 From: sung-silver Date: Sat, 18 Jan 2025 22:50:15 +0900 Subject: [PATCH 8/8] =?UTF-8?q?[CHORE]=20swagger=20summary=20=EC=88=98?= =?UTF-8?q?=EC=A0=95:=20=EB=B0=B0=EB=84=88=20=EC=83=9D=EC=84=B1=20->=20?= =?UTF-8?q?=EB=B0=B0=EB=84=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/sopt/makers/operation/web/banner/api/BannerApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java index f4b2bb0d..90854456 100644 --- a/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java +++ b/operation-api/src/main/java/org/sopt/makers/operation/web/banner/api/BannerApi.java @@ -71,7 +71,7 @@ public interface BannerApi { ResponseEntity> createBanner(BannerRequest.BannerCreateOrModify request); @Operation( - summary = "배너 생성 API", + summary = "배너 수정 API", responses = { @ApiResponse( responseCode = "200",