배포

src/main/java/store/ckin/coupon/coupon/controller/CouponController.java

@@ -10,7 +10,6 @@
 import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -54,10 +53,10 @@ public ResponseEntity<Void> createCoupon(@Valid @RequestBody CreateCouponRequest
      * @param memberId 회원 아이디
      */
     @PostMapping("/welcome")
-    public ResponseEntity<Void> createWelcomeCoupon(@RequestParam("memberId") Long memberId) {
+    public ResponseEntity<Boolean> createWelcomeCoupon(@RequestParam("memberId") Long memberId) {
         couponService.createWelcomeCoupon(memberId);
 
-        return ResponseEntity.status(HttpStatus.CREATED).build();
+        return ResponseEntity.status(HttpStatus.CREATED).body(true);
     }
 
     /**
@@ -70,7 +69,6 @@ public ResponseEntity<Void> createWelcomeCoupon(@RequestParam("memberId") Long m
     public ResponseEntity<Boolean> createCouponByIds(@PathVariable("memberId") Long memberId,
                                                      @PathVariable("couponTemplateId") Long couponTemplateId) {
         boolean content = couponService.createCouponByIds(memberId, couponTemplateId);
-        log.debug("content: {}", content);
 
         return ResponseEntity.status(HttpStatus.CREATED).body(content);
     }
@@ -179,8 +177,7 @@ public ResponseEntity<Void> updateCouponUsedDate(@RequestParam("couponId") List<
      */
     @GetMapping("/sale")
     public ResponseEntity<List<GetCouponResponseDto>> getCouponForBuyList(@RequestParam("memberId") Long memberId,
-                                                                          @RequestParam("bookId")
-                                                                          List<Long> bookIdList) {
+                                                                          @RequestParam("bookId") List<Long> bookIdList) {
 
         List<GetCouponResponseDto> content = couponService.getCouponForBuyList(memberId, bookIdList);
 

src/main/java/store/ckin/coupon/coupon/dto/request/CreateCouponRequestDto.java

@@ -3,7 +3,6 @@
 import java.util.Date;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.PositiveOrZero;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -27,14 +26,4 @@ public class CreateCouponRequestDto {
     @NotNull(message = "쿠폰 발급일을 입력해주세요.")
     private Date issueDate;
     private Date usedDate;
-
-    @Builder
-    public CreateCouponRequestDto(Long memberId, Long couponTemplateId, Date expirationDate, Date issueDate,
-                                  Date usedDate) {
-        this.memberId = memberId;
-        this.couponTemplateId = couponTemplateId;
-        this.expirationDate = expirationDate;
-        this.issueDate = issueDate;
-        this.usedDate = usedDate;
-    }
 }

src/main/java/store/ckin/coupon/coupon/service/impl/CouponServiceImpl.java

@@ -7,7 +7,6 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import store.ckin.coupon.coupon.adapter.CouponAdapter;
 import store.ckin.coupon.coupon.dto.request.CreateCouponRequestDto;
@@ -183,8 +182,7 @@ public boolean createCouponByIds(Long memberId, Long couponTemplateId) {
         if (!couponTemplateRepository.existsById((couponTemplateId))) {
             return false;
         }
-
-        if (isExistCoupon(memberId, couponTemplateId)) {
+        if (Boolean.TRUE.equals(isExistCoupon(memberId, couponTemplateId))) {
             return false;
         }
         couponRepository.save(Coupon.builder()
@@ -209,7 +207,7 @@ public void createWelcomeCoupon(Long memberId) {
         couponRepository.save(Coupon.builder()
                 .memberId(memberId)
                 .couponTemplateId(couponTemplateResponseDto.getId())
-                .expirationDate(couponTemplateResponseDto.getExpirationDate())
+                .expirationDate(Date.valueOf(LocalDate.now().plusDays(30)))
                 .issueDate(Date.valueOf(LocalDate.now()))
                 .usedDate(null)
                 .build());

src/main/java/store/ckin/coupon/coupontemplate/controller/CouponTemplateController.java

@@ -2,7 +2,6 @@
 
 import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
@@ -27,7 +26,6 @@
  * @author : gaeun
  * @version : 2024. 02. 15
  */
-@Slf4j
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/coupon/couponTemplate")
@@ -88,18 +86,18 @@ public ResponseEntity<Void> deleteCouponTemplate(@PathVariable("couponTemplateId
         return ResponseEntity.ok().build();
     }
 
-//    /**
-//     * 쿠폰 템플릿 사용여부를 변경하는 메서드 입니다.
-//     *
-//     * @param templateId 템플릿 아이디
-//     * @param state      사용여부
-//     * @return 200 OK
-//     */
-//    @PutMapping("/{templateId}")
-//    public ResponseEntity<Void> updateTemplateStatus(@PathVariable("templateId") Long templateId,
-//                                                     @RequestParam("state") Boolean state) {
-//        couponTemplateService.updateCouponTemplateStatus(templateId, state);
-//
-//        return ResponseEntity.ok().build();
-//    }
+    /**
+     * 쿠폰 템플릿 사용여부를 변경하는 메서드 입니다.
+     *
+     * @param templateId 템플릿 아이디
+     * @param state      사용여부
+     * @return 200 OK
+     */
+    @PutMapping("/{templateId}")
+    public ResponseEntity<Void> updateTemplateStatus(@PathVariable("templateId") Long templateId,
+                                                     @RequestParam("state") Boolean state) {
+        couponTemplateService.updateCouponTemplateStatus(templateId, state);
+
+        return ResponseEntity.ok().build();
+    }
 }

src/main/java/store/ckin/coupon/coupontemplate/repository/impl/CouponTemplateRepositoryImpl.java

@@ -110,6 +110,8 @@ public Optional<GetCouponTemplateResponseDto> getCouponTemplate(Long couponTempl
     @Override
     public GetCouponTemplateResponseDto getCouponTemplateByTypeId(Long typeId) {
         return from(couponTemplate)
+                .leftJoin(couponPolicy)
+                .on(couponTemplate.policyId.eq(couponPolicy.id))
                 .select(new QGetCouponTemplateResponseDto(
                         couponTemplate.id,
                         couponTemplate.policyId,

src/main/java/store/ckin/coupon/coupontemplate/service/impl/CouponTemplateServiceImpl.java

@@ -108,7 +108,6 @@ public void updateCouponTemplateStatus(Long templateId, Boolean state) {
         CouponTemplate couponTemplate = couponTemplateRepository.findById(templateId)
                 .orElseThrow(CouponTemplateNotFoundException::new);
 
-        log.debug("state : {}", state);
         couponTemplate.updateTemplateStatus(state);
     }
 }

src/main/java/store/ckin/coupon/util/AdapterHeaderUtil.java

@@ -1,16 +1,13 @@
 package store.ckin.coupon.util;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 /**
  * Adapter 에서 사용할 헤더를 만드는 클래스입니다.
  *
- * @author 정승조
+ * @author 이가은
  * @version 2024. 02. 15.
  */
 public class AdapterHeaderUtil {
@@ -26,9 +23,6 @@ private AdapterHeaderUtil() {
     public static HttpHeaders getHttpHeaders() {
         HttpHeaders httpHeaders = new HttpHeaders();
 
-        HttpServletRequest request = ((ServletRequestAttributes)
-                RequestContextHolder.currentRequestAttributes()).getRequest();
-
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
         httpHeaders.setAccept(List.of(MediaType.APPLICATION_JSON));
 

src/main/resources/application-prod.properties

@@ -0,0 +1,2 @@
+# gateway URL
+port.gateway-uri=http://133.186.209.180:9010

src/main/resources/application.properties

@@ -26,5 +26,5 @@ ckin.keymanager.url=https://api-keymanager.nhncloudservice.com
 ckin.keymanager.path=/keymanager/v1.0/appkey/{appkey}/secrets/{keyid}
 
 # gateway URL
-port.gateway-uri=http://localhost:9010            
+port.gateway-uri=http://localhost:9010