🚀 :: Api-v0.0.3-1

Gosrock · Jan 13, 2023 · 393bb5c · 393bb5c
2 parents 3caeb41 + 3ee9b8c
commit 393bb5c
Show file tree

Hide file tree

Showing 19 changed files with 193 additions and 73 deletions.
diff --git a/DuDoong-Api/src/main/java/band/gosrock/api/auth/controller/AuthController.java b/DuDoong-Api/src/main/java/band/gosrock/api/auth/controller/AuthController.java
@@ -95,10 +95,14 @@ public OauthTokenResponse getCredentialFromKaKao(
     @Tag(name = "카카오 oauth")
     @DevelopOnlyApi
     @GetMapping("/oauth/kakao/develop")
-    public ResponseEntity<TokenAndUserResponse> developUserSign(@RequestParam("code") String code) {
+    public ResponseEntity<TokenAndUserResponse> developUserSign(
+            @RequestParam("code") String code,
+            @RequestHeader(value = "referer", required = false, defaultValue = "localhost")
+                    String referer,
+            @RequestHeader(value = "host", required = false) String host) {
         TokenAndUserResponse tokenAndUserResponse = registerUseCase.upsertKakaoOauthUser(code);
         return ResponseEntity.ok()
-                .headers(cookieGenerateHelper.getTokenCookies(tokenAndUserResponse))
+                .headers(cookieGenerateHelper.getTokenCookies(tokenAndUserResponse, referer, host))
                 .body(tokenAndUserResponse);
     }
 
@@ -115,11 +119,13 @@ public AvailableRegisterResponse kakaoAuthCheckRegisterValid(
     @PostMapping("/oauth/kakao/register")
     public ResponseEntity<TokenAndUserResponse> kakaoAuthCheckRegisterValid(
             @RequestParam("id_token") String token,
-            @Valid @RequestBody RegisterRequest registerRequest) {
+            @Valid @RequestBody RegisterRequest registerRequest,
+            @RequestHeader(value = "referer", required = false) String referer,
+            @RequestHeader(value = "host", required = false) String host) {
         TokenAndUserResponse tokenAndUserResponse =
                 registerUseCase.registerUserByOCIDToken(token, registerRequest);
         return ResponseEntity.ok()
-                .headers(cookieGenerateHelper.getTokenCookies(tokenAndUserResponse))
+                .headers(cookieGenerateHelper.getTokenCookies(tokenAndUserResponse, referer, host))
                 .body(tokenAndUserResponse);
     }
 
@@ -128,10 +134,12 @@ public ResponseEntity<TokenAndUserResponse> kakaoAuthCheckRegisterValid(
     @Tag(name = "카카오 oauth")
     @PostMapping("/oauth/kakao/login")
     public ResponseEntity<TokenAndUserResponse> kakaoOauthUserLogin(
-            @RequestParam("id_token") String token) {
+            @RequestParam("id_token") String token,
+            @RequestHeader(value = "referer", required = false) String referer,
+            @RequestHeader(value = "host", required = false) String host) {
         TokenAndUserResponse tokenAndUserResponse = loginUseCase.execute(token);
         return ResponseEntity.ok()
-                .headers(cookieGenerateHelper.getTokenCookies(tokenAndUserResponse))
+                .headers(cookieGenerateHelper.getTokenCookies(tokenAndUserResponse, referer, host))
                 .body(tokenAndUserResponse);
     }
 

diff --git a/DuDoong-Api/src/main/java/band/gosrock/api/auth/service/helper/CookieGenerateHelper.java b/DuDoong-Api/src/main/java/band/gosrock/api/auth/service/helper/CookieGenerateHelper.java
@@ -14,26 +14,34 @@
 public class CookieGenerateHelper {
     private final Environment env;
 
-    public HttpHeaders getTokenCookies(TokenAndUserResponse tokenAndUserResponse) {
+    public HttpHeaders getTokenCookies(
+            TokenAndUserResponse tokenAndUserResponse, String referer, String host) {
         String[] activeProfiles = env.getActiveProfiles();
         String sameSite = "None";
 
         if (Arrays.stream(activeProfiles).toList().contains("prod")) {
             sameSite = "Strict";
         }
+        String domain = "localhost";
+        if (referer.contains(host)) {
+            domain = host;
+        }
+
         ResponseCookie accessToken =
                 ResponseCookie.from("accessToken", tokenAndUserResponse.getAccessToken())
                         .path("/")
                         .maxAge(tokenAndUserResponse.getAccessTokenAge())
                         .sameSite(sameSite)
                         .httpOnly(true)
+                        .domain(domain)
                         .secure(true)
                         .build();
         ResponseCookie refreshToken =
                 ResponseCookie.from("refreshToken", tokenAndUserResponse.getRefreshToken())
                         .path("/")
                         .maxAge(tokenAndUserResponse.getRefreshTokenAge())
                         .sameSite(sameSite)
+                        .domain(domain)
                         .httpOnly(true)
                         .secure(true)
                         .build();

diff --git a/...i/src/main/java/band/gosrock/api/issuedTicket/controller/AdminIssuedTicketController.java b/...i/src/main/java/band/gosrock/api/issuedTicket/controller/AdminIssuedTicketController.java
@@ -26,7 +26,8 @@ public class AdminIssuedTicketController {
     public RetrieveIssuedTicketListResponse getIssuedTickets(
             @RequestParam Long page,
             @RequestParam Long eventId,
-            @RequestParam(required = false) String userName) {
-        return readIssuedTicketsUseCase.execute(page, eventId, userName);
+            @RequestParam(required = false) String userName,
+            @RequestParam(required = false) String phoneNumber) {
+        return readIssuedTicketsUseCase.execute(page, eventId, userName, phoneNumber);
     }
 }
diff --git a/...Api/src/main/java/band/gosrock/api/issuedTicket/dto/response/RetrieveIssuedTicketDTO.java b/...Api/src/main/java/band/gosrock/api/issuedTicket/dto/response/RetrieveIssuedTicketDTO.java
@@ -15,7 +15,7 @@ public class RetrieveIssuedTicketDTO {
     private final UserInfoVo userInfo;
 
     public RetrieveIssuedTicketDTO(IssuedTicket issuedTicket, User user) {
-        this.issuedTicketInfo = new IssuedTicketInfoVo(issuedTicket);
-        this.userInfo = new UserInfoVo(user);
+        this.issuedTicketInfo = issuedTicket.toIssuedTicketInfoVo(issuedTicket);
+        this.userInfo = user.toUserInfoVo(user);
     }
 }
diff --git a/...ong-Api/src/main/java/band/gosrock/api/issuedTicket/service/ReadIssuedTicketsUseCase.java b/...ong-Api/src/main/java/band/gosrock/api/issuedTicket/service/ReadIssuedTicketsUseCase.java
@@ -26,12 +26,14 @@ public class ReadIssuedTicketsUseCase {
      * 로직이 너무 복잡해짐 => 일단 연관관계 매핑 걸어두고 나중에 QueryDsl 설정 들어오면 바꿔야 할 듯
      */
     @Transactional(readOnly = true)
-    public RetrieveIssuedTicketListResponse execute(Long page, Long eventId, String userName) {
+    public RetrieveIssuedTicketListResponse execute(
+            Long page, Long eventId, String userName, String phoneNumber) {
         Long currentUserId = SecurityUtils.getCurrentUserId();
         // 조회 유저 권한 인증
         eventService.checkEventHost(currentUserId, eventId);
         Page<IssuedTicket> issuedTickets =
-                issuedTicketDomainService.retrieveIssuedTickets(page, eventId, userName);
+                issuedTicketDomainService.retrieveIssuedTickets(
+                        page, eventId, userName, phoneNumber);
         return new RetrieveIssuedTicketListResponse(
                 page,
                 (long) issuedTickets.getTotalPages(),

diff --git a/DuDoong-Common/src/main/java/band/gosrock/common/exception/ErrorCode.java b/DuDoong-Common/src/main/java/band/gosrock/common/exception/ErrorCode.java
@@ -52,7 +52,7 @@ public enum ErrorCode implements BaseErrorCode {
     ORDER_CANNOT_CANCEL(BAD_REQUEST, "Order-404-3", "주문을 취소할 수 없는 상태입니다."),
     ORDER_CANNOT_REFUND(BAD_REQUEST, "Order-404-4", "주문을 환불할 수 없는 상태입니다."),
     EVENT_NOT_FOUND(NOT_FOUND, "Event-404-1", "Event Not Found"),
-    Host_NOT_AUTH_EVENT(FORBIDDEN, "Event-403-1", "Host Not Auth Event");
+    HOST_NOT_AUTH_EVENT(FORBIDDEN, "Event-403-1", "Host Not Auth Event");
     private int status;
     private String code;
     private String reason;

diff --git a/DuDoong-Domain/src/main/java/band/gosrock/domain/common/vo/IssuedTicketInfoVo.java b/DuDoong-Domain/src/main/java/band/gosrock/domain/common/vo/IssuedTicketInfoVo.java
@@ -5,9 +5,11 @@
 import band.gosrock.domain.domains.issuedTicket.domain.IssuedTicketStatus;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.time.LocalDateTime;
+import lombok.Builder;
 import lombok.Getter;
 
 @Getter
+@Builder
 public class IssuedTicketInfoVo {
 
     /*
@@ -54,14 +56,16 @@ public class IssuedTicketInfoVo {
      */
     private final Money optionPrice;
 
-    public IssuedTicketInfoVo(IssuedTicket issuedTicket) {
-        this.issuedTicketId = issuedTicket.getId();
-        this.issuedTicketNo = issuedTicket.getIssuedTicketNo();
-        this.uuid = issuedTicket.getUuid();
-        this.ticketName = issuedTicket.getTicketItem().getName();
-        this.ticketPrice = issuedTicket.getTicketItem().getPrice();
-        this.createdAt = issuedTicket.getCreatedAt();
-        this.issuedTicketStatus = issuedTicket.getIssuedTicketStatus();
-        this.optionPrice = issuedTicket.sumOptionPrice();
+    public static IssuedTicketInfoVo from(IssuedTicket issuedTicket) {
+        return IssuedTicketInfoVo.builder()
+                .issuedTicketId(issuedTicket.getId())
+                .issuedTicketNo(issuedTicket.getIssuedTicketNo())
+                .uuid(issuedTicket.getUuid())
+                .ticketName(issuedTicket.getTicketItem().getName())
+                .ticketPrice(issuedTicket.getPrice())
+                .createdAt(issuedTicket.getCreatedAt())
+                .issuedTicketStatus(issuedTicket.getIssuedTicketStatus())
+                .optionPrice(issuedTicket.sumOptionPrice())
+                .build();
     }
 }
diff --git a/DuDoong-Domain/src/main/java/band/gosrock/domain/common/vo/UserInfoVo.java b/DuDoong-Domain/src/main/java/band/gosrock/domain/common/vo/UserInfoVo.java
@@ -2,9 +2,11 @@
 
 
 import band.gosrock.domain.domains.user.domain.User;
+import lombok.Builder;
 import lombok.Getter;
 
 @Getter
+@Builder
 public class UserInfoVo {
 
     private final Long userId;
@@ -15,10 +17,15 @@ public class UserInfoVo {
 
     private final String phoneNumber;
 
-    public UserInfoVo(User user) {
-        this.userId = user.getId();
-        this.userName = user.getProfile().getName();
-        this.email = user.getProfile().getEmail();
-        this.phoneNumber = user.getProfile().getPhoneNumber();
+    private final String profileImage;
+
+    public static UserInfoVo from(User user) {
+        return UserInfoVo.builder()
+                .userId(user.getId())
+                .userName(user.getProfile().getName())
+                .email(user.getProfile().getEmail())
+                .profileImage(user.getProfile().getProfileImage())
+                .phoneNumber(user.getProfile().getPhoneNumber())
+                .build();
     }
 }
diff --git a/.../src/main/java/band/gosrock/domain/domains/event/exception/HostNotAuthEventException.java b/.../src/main/java/band/gosrock/domain/domains/event/exception/HostNotAuthEventException.java
@@ -9,6 +9,6 @@ public class HostNotAuthEventException extends DuDoongCodeException {
     public static final DuDoongCodeException EXCEPTION = new HostNotAuthEventException();
 
     private HostNotAuthEventException() {
-        super(ErrorCode.Host_NOT_AUTH_EVENT);
+        super(ErrorCode.HOST_NOT_AUTH_EVENT);
     }
 }
diff --git a/DuDoong-Domain/src/main/java/band/gosrock/domain/domains/event/service/EventService.java b/DuDoong-Domain/src/main/java/band/gosrock/domain/domains/event/service/EventService.java
@@ -6,7 +6,6 @@
 import band.gosrock.domain.domains.event.domain.Event;
 import band.gosrock.domain.domains.event.exception.HostNotAuthEventException;
 import band.gosrock.domain.domains.event.repository.EventRepository;
-import java.util.Objects;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -19,7 +18,7 @@ public class EventService {
 
     public void checkEventHost(Long hostId, Long eventId) {
         Event event = eventAdaptor.findById(eventId);
-        if (!Objects.equals(event.getHostId(), hostId)) {
+        if (!event.getHostId().equals(hostId)) {
             throw HostNotAuthEventException.EXCEPTION;
         }
     }

diff --git a/...n/src/main/java/band/gosrock/domain/domains/issuedTicket/adaptor/IssuedTicketAdaptor.java b/...n/src/main/java/band/gosrock/domain/domains/issuedTicket/adaptor/IssuedTicketAdaptor.java
@@ -20,6 +20,10 @@ public IssuedTicket save(IssuedTicket issuedTicket) {
         return issuedTicketRepository.save(issuedTicket);
     }
 
+    public void saveAll(List<IssuedTicket> issuedTickets) {
+        issuedTicketRepository.saveAll(issuedTickets);
+    }
+
     public List<IssuedTicket> findAllByOrderLineId(Long orderLineId) {
         return issuedTicketRepository.findAllByOrderLineId(orderLineId);
     }
@@ -39,4 +43,10 @@ public Page<IssuedTicket> findAllByEventAndUserName(
         return issuedTicketRepository.findAllByEvent_IdAndUser_Profile_NameContaining(
                 eventId, userName, pageRequest);
     }
+
+    public Page<IssuedTicket> findAllByEventAndUserPhoneNumber(
+            PageRequest pageRequest, Long eventId, String phoneNumber) {
+        return issuedTicketRepository.findAllByEvent_IdAndUser_Profile_PhoneNumberContaining(
+                eventId, phoneNumber, pageRequest);
+    }
 }
diff --git a/...ng-Domain/src/main/java/band/gosrock/domain/domains/issuedTicket/domain/IssuedTicket.java b/...ng-Domain/src/main/java/band/gosrock/domain/domains/issuedTicket/domain/IssuedTicket.java
@@ -2,9 +2,12 @@
 
 
 import band.gosrock.domain.common.model.BaseTimeEntity;
+import band.gosrock.domain.common.vo.IssuedTicketInfoVo;
 import band.gosrock.domain.common.vo.Money;
 import band.gosrock.domain.domains.event.domain.Event;
+import band.gosrock.domain.domains.issuedTicket.dto.request.CreateIssuedTicketDTO;
 import band.gosrock.domain.domains.issuedTicket.dto.request.CreateIssuedTicketRequest;
+import band.gosrock.domain.domains.issuedTicket.dto.response.CreateIssuedTicketResponse;
 import band.gosrock.domain.domains.ticket_item.domain.TicketItem;
 import band.gosrock.domain.domains.user.domain.User;
 import java.util.ArrayList;
@@ -87,7 +90,7 @@ public void addOptionAnswers(List<IssuedTicketOptionAnswer> answers) {
     /*
     발급 티켓 가격
      */
-    private Long price;
+    private Money price;
 
     /*
     상태
@@ -105,7 +108,7 @@ public IssuedTicket(
             User user,
             Long orderLineId,
             TicketItem ticketItem,
-            Long price,
+            Money price,
             IssuedTicketStatus issuedTicketStatus,
             List<IssuedTicketOptionAnswer> issuedTicketOptionAnswers) {
         this.event = event;
@@ -139,7 +142,6 @@ public void createIssuedTicketNo() {
         this.issuedTicketNo = "T" + this.id;
     }
 
-    // todo: 옵션 정리
     public Money sumOptionPrice() {
         //        issuedTicketOptionAnswers.forEach(issuedTicketOptionAnswer -> {
         //            this.optionPrice = this.optionPrice.plus(issuedTicketOptionAnswer.getOption()
@@ -151,4 +153,31 @@ public Money sumOptionPrice() {
                                 issuedTicketOptionAnswer.getOption().getAdditionalPrice())
                 .reduce(Money.ZERO, Money::plus);
     }
+
+    public IssuedTicketInfoVo toIssuedTicketInfoVo(IssuedTicket issuedTicket) {
+        return IssuedTicketInfoVo.from(issuedTicket);
+    }
+
+    public static CreateIssuedTicketResponse orderLineItemToIssuedTickets(
+            CreateIssuedTicketDTO dto) {
+        long quantity = dto.getOrderLineItem().getQuantity();
+        List<IssuedTicket> createIssuedTickets = new ArrayList<>();
+        List<IssuedTicketOptionAnswer> issuedTicketOptionAnswers =
+                dto.getOrderLineItem().getOrderOptionAnswer().stream()
+                        .map(IssuedTicketOptionAnswer::orderOptionAnswerToIssuedTicketOptionAnswer)
+                        .toList();
+        for (long i = 1; i <= quantity; i++) {
+            createIssuedTickets.add(
+                    IssuedTicket.builder()
+                            .event(dto.getOrderLineItem().getTicketItem().getEvent())
+                            .orderLineId(dto.getOrderLineItem().getId())
+                            .user(dto.getUser())
+                            .price(dto.getOrderLineItem().getTicketItem().getPrice())
+                            .ticketItem(dto.getOrderLineItem().getTicketItem())
+                            .issuedTicketStatus(IssuedTicketStatus.ENTRANCE_INCOMPLETE)
+                            .issuedTicketOptionAnswers(issuedTicketOptionAnswers)
+                            .build());
+        }
+        return new CreateIssuedTicketResponse(createIssuedTickets, issuedTicketOptionAnswers);
+    }
 }
diff --git a/...main/java/band/gosrock/domain/domains/issuedTicket/dto/request/CreateIssuedTicketDTO.java b/...main/java/band/gosrock/domain/domains/issuedTicket/dto/request/CreateIssuedTicketDTO.java
@@ -0,0 +1,19 @@
+package band.gosrock.domain.domains.issuedTicket.dto.request;
+
+
+import band.gosrock.domain.domains.order.domain.Order;
+import band.gosrock.domain.domains.order.domain.OrderLineItem;
+import band.gosrock.domain.domains.user.domain.User;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public class CreateIssuedTicketDTO {
+
+    private final Order order;
+
+    private final OrderLineItem orderLineItem;
+
+    private final User user;
+}
diff --git a/.../java/band/gosrock/domain/domains/issuedTicket/dto/request/CreateIssuedTicketRequest.java b/.../java/band/gosrock/domain/domains/issuedTicket/dto/request/CreateIssuedTicketRequest.java
@@ -1,6 +1,7 @@
 package band.gosrock.domain.domains.issuedTicket.dto.request;
 
 
+import band.gosrock.domain.common.vo.Money;
 import band.gosrock.domain.domains.event.domain.Event;
 import band.gosrock.domain.domains.order.domain.OrderOptionAnswer;
 import band.gosrock.domain.domains.ticket_item.domain.TicketItem;
@@ -21,7 +22,7 @@ public class CreateIssuedTicketRequest {
     /*
     발급 티켓의 orderline id
      */
-    private Long orderLineId;
+    private final Long orderLineId;
 
     /*
     티켓 발급한 유저 id
@@ -31,7 +32,7 @@ public class CreateIssuedTicketRequest {
     /*
     발급 티켓 가격
      */
-    private final Long price;
+    private final Money price;
 
     /*
     발급 티켓의 티켓 itemId (발급 티켓의 종류)

diff --git a/...ava/band/gosrock/domain/domains/issuedTicket/dto/response/CreateIssuedTicketResponse.java b/...ava/band/gosrock/domain/domains/issuedTicket/dto/response/CreateIssuedTicketResponse.java
@@ -1,15 +1,22 @@
 package band.gosrock.domain.domains.issuedTicket.dto.response;
 
 
+import band.gosrock.domain.domains.issuedTicket.domain.IssuedTicket;
+import band.gosrock.domain.domains.issuedTicket.domain.IssuedTicketOptionAnswer;
 import java.util.List;
 import lombok.Getter;
 
 @Getter
 public class CreateIssuedTicketResponse {
 
-    private final List<IssuedTicketDTO> issuedTickets;
+    private final List<IssuedTicket> issuedTickets;
 
-    public CreateIssuedTicketResponse(List<IssuedTicketDTO> issuedTickets) {
+    private final List<IssuedTicketOptionAnswer> issuedTicketOptionAnswers;
+
+    public CreateIssuedTicketResponse(
+            List<IssuedTicket> issuedTickets,
+            List<IssuedTicketOptionAnswer> issuedTicketOptionAnswers) {
         this.issuedTickets = issuedTickets;
+        this.issuedTicketOptionAnswers = issuedTicketOptionAnswers;
     }
 }
diff --git a/.../src/main/java/band/gosrock/domain/domains/issuedTicket/dto/response/IssuedTicketDTO.java b/.../src/main/java/band/gosrock/domain/domains/issuedTicket/dto/response/IssuedTicketDTO.java
@@ -14,7 +14,7 @@ public class IssuedTicketDTO {
     private final EventInfoVo eventInfo;
 
     public IssuedTicketDTO(IssuedTicket issuedTicket) {
-        this.issuedTicketInfo = new IssuedTicketInfoVo(issuedTicket);
+        this.issuedTicketInfo = issuedTicket.toIssuedTicketInfoVo(issuedTicket);
         this.eventInfo = new EventInfoVo(issuedTicket.getEvent());
     }
 }