🚀 :: Api-v0.1.2

🚀 :: Api-v0.1.2

DuDoong-Api/src/main/java/band/gosrock/api/config/ServletFilterConfig.java

@@ -11,6 +11,7 @@
 import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer;
 import org.springframework.web.filter.ForwardedHeaderFilter;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter;
 
 @Configuration
 @RequiredArgsConstructor
@@ -25,11 +26,19 @@ public FilterRegistrationBean securityFilterChain(
             @Qualifier(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME)
                     Filter securityFilter) {
         FilterRegistrationBean registration = new FilterRegistrationBean(securityFilter);
-        registration.setOrder(Integer.MAX_VALUE - 2);
+        registration.setOrder(Integer.MAX_VALUE - 3);
         registration.setName(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME);
         return registration;
     }
 
+    @Bean
+    public FilterRegistrationBean setResourceUrlEncodingFilter() {
+        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
+        registrationBean.setFilter(new ResourceUrlEncodingFilter());
+        registrationBean.setOrder(Integer.MAX_VALUE - 2);
+        return registrationBean;
+    }
+
     @Bean
     public FilterRegistrationBean setForwardedHeaderFilterOrder() {
         FilterRegistrationBean registrationBean = new FilterRegistrationBean();

DuDoong-Api/src/main/java/band/gosrock/api/config/security/SecurityConfig.java

@@ -37,6 +37,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .permitAll()
                 .mvcMatchers(HttpMethod.GET, "/v1/events/{eventId:[\\d+]}/ticketItems")
                 .permitAll()
+                .mvcMatchers(HttpMethod.POST, "/v1/coupons/campaigns")
+                .hasRole("SUPER_ADMIN")
                 .anyRequest()
                 .authenticated();
         http.apply(filterConfig);

DuDoong-Api/src/main/java/band/gosrock/api/coupon/dto/reqeust/CreateCouponCampaignRequest.java

@@ -5,10 +5,7 @@
 import band.gosrock.domain.domains.coupon.domain.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.LocalDateTime;
-import javax.validation.constraints.Future;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.lang.Nullable;
@@ -17,9 +14,6 @@
 @RequiredArgsConstructor
 public class CreateCouponCampaignRequest {
 
-    @NotNull(message = "host Id를 입력해주세요.")
-    private Long hostId;
-
     @NotNull(message = "discountType을 입력해주세요.")
     private DiscountType discountType;
 
@@ -54,4 +48,9 @@ public class CreateCouponCampaignRequest {
 
     @NotBlank(message = "couponCode를 입력해주세요.")
     private String couponCode;
+
+    @Schema(description = "쿠폰 사용 가능한 최소 결제 금액(원단위, 10000원 이상부터 입력 가능)")
+    @NotNull(message = "minimumCost(원 단위)를 입력해주세요.")
+    @Min(value = 10000, message = "10000원 이상부터 입력 가능합니다.")
+    private Long minimumCost;
 }

DuDoong-Api/src/main/java/band/gosrock/api/coupon/dto/response/CreateCouponCampaignResponse.java

@@ -9,4 +9,4 @@ public record CreateCouponCampaignResponse(
         @Schema(description = "쿠폰 캠페인 ID") Long couponCampaignId,
         @Schema(description = "쿠폰 코드") String couponCode,
         @Schema(description = "생성한 쿠폰 총 매수") Long issuedAmount,
-        @Schema(description = "쿠폰 생성한 호스트 ID") Long hostId) {}
+        @Schema(description = "쿠폰 생성한 슈퍼 어드민 user ID") Long userId) {}

DuDoong-Api/src/main/java/band/gosrock/api/coupon/mapper/CouponCampaignMapper.java

@@ -15,12 +15,12 @@
 public class CouponCampaignMapper {
 
     public static CreateCouponCampaignResponse toCreateCouponCampaignResponse(
-            CouponCampaign couponCampaign, Long hostId) {
+            CouponCampaign couponCampaign, Long userId) {
         return CreateCouponCampaignResponse.builder()
                 .couponCampaignId(couponCampaign.getId())
                 .couponCode(couponCampaign.getCouponCode())
                 .issuedAmount(couponCampaign.getCouponStockInfo().getIssuedAmount())
-                .hostId(hostId)
+                .userId(userId)
                 .build();
     }
 
@@ -35,7 +35,8 @@ public static DateTimePeriod toDateTimePeriod(LocalDateTime startAt, LocalDateTi
         return DateTimePeriod.builder().startAt(startAt).endAt(endAt).build();
     }
 
-    public CouponCampaign toEntity(CreateCouponCampaignRequest createCouponCampaignRequest) {
+    public CouponCampaign toEntity(
+            CreateCouponCampaignRequest createCouponCampaignRequest, Long userId) {
 
         CouponStockInfo couponStockInfo =
                 toCouponStockInfo(createCouponCampaignRequest.getIssuedAmount());
@@ -45,14 +46,15 @@ public CouponCampaign toEntity(CreateCouponCampaignRequest createCouponCampaignR
                         createCouponCampaignRequest.getEndAt());
 
         return CouponCampaign.builder()
-                .hostId(createCouponCampaignRequest.getHostId())
+                .userId(userId)
                 .discountType(createCouponCampaignRequest.getDiscountType())
                 .applyTarget(createCouponCampaignRequest.getApplyTarget())
                 .validTerm(createCouponCampaignRequest.getValidTerm())
                 .dateTimePeriod(dateTimePeriod)
                 .couponStockInfo(couponStockInfo)
                 .discountAmount(createCouponCampaignRequest.getDiscountAmount())
                 .couponCode(createCouponCampaignRequest.getCouponCode())
+                .minimumCost(createCouponCampaignRequest.getMinimumCost())
                 .build();
     }
 }

DuDoong-Api/src/main/java/band/gosrock/api/coupon/service/CreateCouponUseCase.java

@@ -27,16 +27,13 @@ public CreateCouponCampaignResponse execute(
             CreateCouponCampaignRequest createCouponCampaignRequest) {
         // 존재하는 유저인지 검증
         User user = userUtils.getCurrentUser();
-        // 슈퍼 호스트인지 검증
-        hostService.validateManagerHostUser(createCouponCampaignRequest.getHostId(), user.getId());
         // 이미 생성된 쿠폰 코드인지 검증
         createCouponCampaignDomainService.checkCouponCodeExists(
                 createCouponCampaignRequest.getCouponCode());
         // 쿠폰 생성
         CouponCampaign couponCampaign =
                 createCouponCampaignDomainService.createCouponCampaign(
-                        couponCampaignMapper.toEntity(createCouponCampaignRequest));
-        return CouponCampaignMapper.toCreateCouponCampaignResponse(
-                couponCampaign, couponCampaign.getHostId());
+                        couponCampaignMapper.toEntity(createCouponCampaignRequest, user.getId()));
+        return CouponCampaignMapper.toCreateCouponCampaignResponse(couponCampaign, user.getId());
     }
 }

DuDoong-Api/src/main/java/band/gosrock/api/email/dto/OrderMailDto.java

@@ -0,0 +1,16 @@
+package band.gosrock.api.email.dto;
+
+
+import band.gosrock.infrastructure.config.mail.dto.EmailEventInfo;
+import band.gosrock.infrastructure.config.mail.dto.EmailOrderInfo;
+import band.gosrock.infrastructure.config.mail.dto.EmailUserInfo;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public class OrderMailDto {
+    private final EmailUserInfo userInfo;
+    private final EmailOrderInfo orderInfo;
+    private final EmailEventInfo eventInfo;
+}

DuDoong-Api/src/main/java/band/gosrock/api/email/handler/CreateOrderEventEmailHandler.java

@@ -0,0 +1,38 @@
+package band.gosrock.api.email.handler;
+
+
+import band.gosrock.api.email.service.OrderApproveRequestEmailService;
+import band.gosrock.api.email.service.OrderMailInfoHelper;
+import band.gosrock.domain.common.events.order.CreateOrderEvent;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class CreateOrderEventEmailHandler {
+
+    private final OrderApproveRequestEmailService orderApproveRequestEmailService;
+
+    private final OrderMailInfoHelper orderMailInfoHelper;
+
+    @Async
+    @TransactionalEventListener(
+            classes = CreateOrderEvent.class,
+            phase = TransactionPhase.AFTER_COMMIT)
+    public void handleDoneOrderFailEvent(CreateOrderEvent createOrderEvent) {
+        log.info(createOrderEvent.getOrderUuid() + "주문 생성 이메일 요청");
+
+        // 승인 주문만 생성시에 이메일을 보낸다.
+        if (createOrderEvent.getOrderMethod().isPayment()) {
+            return;
+        }
+
+        orderApproveRequestEmailService.execute(
+                orderMailInfoHelper.execute(createOrderEvent.getOrderUuid()));
+    }
+}

DuDoong-Api/src/main/java/band/gosrock/api/email/handler/DoneOrderEventEmailHandler.java

@@ -0,0 +1,43 @@
+package band.gosrock.api.email.handler;
+
+
+import band.gosrock.api.email.dto.OrderMailDto;
+import band.gosrock.api.email.service.OrderApproveConfirmEmailService;
+import band.gosrock.api.email.service.OrderMailInfoHelper;
+import band.gosrock.api.email.service.OrderPaymentDoneEmailService;
+import band.gosrock.domain.common.events.order.DoneOrderEvent;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class DoneOrderEventEmailHandler {
+
+    private final OrderMailInfoHelper orderMailInfoHelper;
+
+    private final OrderApproveConfirmEmailService orderApproveConfirmEmailService;
+    private final OrderPaymentDoneEmailService orderPaymentDoneEmailService;
+
+    @Async
+    @TransactionalEventListener(
+            classes = DoneOrderEvent.class,
+            phase = TransactionPhase.AFTER_COMMIT)
+    public void handleDoneOrderEvent(DoneOrderEvent doneOrderEvent) {
+        log.info(doneOrderEvent.getOrderUuid() + "주문 상태 완료, 이메일 보내기");
+        OrderMailDto orderMailDto = orderMailInfoHelper.execute(doneOrderEvent.getOrderUuid());
+
+        // 결제용
+        if (doneOrderEvent.getOrderMethod().isPayment()) {
+            orderPaymentDoneEmailService.execute(orderMailDto);
+            return;
+        }
+        // 승인용
+        orderApproveConfirmEmailService.execute(orderMailDto);
+        log.info(doneOrderEvent.getOrderUuid() + "주문 상태 완료, 이메일 보내기 완료");
+    }
+}

DuDoong-Api/src/main/java/band/gosrock/api/email/handler/RegisterUserEventHandler.java → DuDoong-Api/src/main/java/band/gosrock/api/email/handler/RegisterUserEventEmailHandler.java

@@ -16,7 +16,7 @@
 @Component
 @RequiredArgsConstructor
 @Slf4j
-public class RegisterUserEventHandler {
+public class RegisterUserEventEmailHandler {
 
     private final UserAdaptor userAdaptor;
 

DuDoong-Api/src/main/java/band/gosrock/api/email/handler/WithDrawOrderEventEmailHandler.java

@@ -0,0 +1,42 @@
+package band.gosrock.api.email.handler;
+
+
+import band.gosrock.api.email.dto.OrderMailDto;
+import band.gosrock.api.email.service.OrderMailInfoHelper;
+import band.gosrock.api.email.service.OrderWithDrawCancelEmailService;
+import band.gosrock.api.email.service.OrderWithDrawRefundEmailService;
+import band.gosrock.domain.common.events.order.WithDrawOrderEvent;
+import band.gosrock.domain.domains.order.domain.OrderStatus;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class WithDrawOrderEventEmailHandler {
+
+    private final OrderWithDrawRefundEmailService orderWithDrawRefundEmailService;
+    private final OrderWithDrawCancelEmailService orderWithDrawCancelEmailService;
+    private final OrderMailInfoHelper orderMailInfoHelper;
+
+    @Async
+    @TransactionalEventListener(
+            classes = WithDrawOrderEvent.class,
+            phase = TransactionPhase.AFTER_COMMIT)
+    public void handleWithDrawOrderEvent(WithDrawOrderEvent withDrawOrderEvent) {
+        OrderStatus orderStatus = withDrawOrderEvent.getOrderStatus();
+        OrderMailDto orderMailDto = orderMailInfoHelper.execute(withDrawOrderEvent.getOrderUuid());
+
+        // 관리자에 의한 취소
+        if (orderStatus == OrderStatus.CANCELED) {
+            orderWithDrawCancelEmailService.execute(orderMailDto);
+            return;
+        }
+        // 구매자에의한 환불 요청
+        orderWithDrawRefundEmailService.execute(orderMailDto);
+    }
+}

DuDoong-Api/src/main/java/band/gosrock/api/email/service/HostInviteEmailService.java

@@ -0,0 +1,24 @@
+package band.gosrock.api.email.service;
+
+
+import band.gosrock.domain.domains.host.domain.HostRole;
+import band.gosrock.infrastructure.config.mail.dto.EmailUserInfo;
+import band.gosrock.infrastructure.config.ses.AwsSesUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.thymeleaf.context.Context;
+
+@Service
+@RequiredArgsConstructor
+public class HostInviteEmailService {
+    private final AwsSesUtils awsSesUtils;
+
+    public void execute(EmailUserInfo userInfo, String hostName, HostRole hostRole) {
+        Context context = new Context();
+        context.setVariable("userInfo", userInfo);
+        context.setVariable("hostName", hostName);
+        context.setVariable("role", hostRole.getValue());
+        awsSesUtils.singleEmailRequest(
+                userInfo.getEmail(), "두둥" + hostName + " 호스트 초대 알림 드립니다.", "hostInvite", context);
+    }
+}

DuDoong-Api/src/main/java/band/gosrock/api/email/service/OrderApproveConfirmEmailService.java

@@ -0,0 +1,25 @@
+package band.gosrock.api.email.service;
+
+
+import band.gosrock.api.email.dto.OrderMailDto;
+import band.gosrock.infrastructure.config.mail.dto.EmailUserInfo;
+import band.gosrock.infrastructure.config.ses.AwsSesUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.thymeleaf.context.Context;
+
+@Service
+@RequiredArgsConstructor
+public class OrderApproveConfirmEmailService {
+    private final AwsSesUtils awsSesUtils;
+
+    public void execute(OrderMailDto orderMailDto) {
+        Context context = new Context();
+        EmailUserInfo userInfo = orderMailDto.getUserInfo();
+        context.setVariable("userInfo", userInfo);
+        context.setVariable("orderInfo", orderMailDto.getOrderInfo());
+        context.setVariable("eventInfo", orderMailDto.getEventInfo());
+        awsSesUtils.singleEmailRequest(
+                userInfo.getEmail(), "두둥 주문승인 완료 알림드립니다.", "orderApproveConfirm", context);
+    }
+}

DuDoong-Api/src/main/java/band/gosrock/api/email/service/OrderApproveRequestEmailService.java

@@ -0,0 +1,25 @@
+package band.gosrock.api.email.service;
+
+
+import band.gosrock.api.email.dto.OrderMailDto;
+import band.gosrock.infrastructure.config.mail.dto.EmailUserInfo;
+import band.gosrock.infrastructure.config.ses.AwsSesUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.thymeleaf.context.Context;
+
+@Service
+@RequiredArgsConstructor
+public class OrderApproveRequestEmailService {
+    private final AwsSesUtils awsSesUtils;
+
+    public void execute(OrderMailDto orderMailDto) {
+        Context context = new Context();
+        EmailUserInfo userInfo = orderMailDto.getUserInfo();
+        context.setVariable("userInfo", userInfo);
+        context.setVariable("orderInfo", orderMailDto.getOrderInfo());
+        context.setVariable("eventInfo", orderMailDto.getEventInfo());
+        awsSesUtils.singleEmailRequest(
+                userInfo.getEmail(), "두둥 주문승인 요청 알림드립니다.", "orderApproveRequest", context);
+    }
+}