2주차 : 줌터파크 과제 제출합니다.

README.md

@@ -18,18 +18,4 @@ Special Thanks to : Pir
 - 구매 또는 판매한 상품 조회
 - 전체 판매되고있는 상품 조회
 - 상품 구매 - 이미 동일한 거래 시간에 상품 구매 예정이 되어있다면 다른 상품은 구매가 불가
-- 상품 판매 - 상품을 등록, 수정, 삭제 할 수 있음
-
-
-# 2주차 
----
-
-## 단독) 한국에 드디어 상륙한 캣츠! 티켓 1000장을 잡아라! ( 3.10 ~ 3.22 ) [ Feat. 김의빈 ] 
-
-### 요구사항 
-- 하나의 예매 서비스에 다량의 유저들이 접속한다는걸 가정합니다.
-    - 유저들은 접속하는 환경이 다를겁니다 ( ex. 모바일 , 컴퓨터 ) 하나의 서버가 아닌 여러 서버를   가정합니다.
-- 뮤지컬의 경우 (날짜는 무관) 3일동안 1000장의 티켓이 발행됩니다.
-- 1000장의 수량이 떨어질 경우 1001번째 사람은 티켓을 구매할 수 없습니다.
-- 티켓을 이미 구매한 사람은 사제기의 요소를 방지하기 위해 더이상의 티켓을 구매할 순 없습니다.
-    - 티켓을 구매했을 경우 당일 뿐만이 아닌 다른날도 구매가 불가합니다.
+- 상품 판매 - 상품을 등록, 수정, 삭제 할 수 있음

build.gradle

@@ -38,11 +38,18 @@ dependencies {
     // 쿼리 파라미터 로그
     implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.5.8'
 
+    //Redisson
+    implementation 'org.redisson:redisson-spring-boot-starter:3.17.4'
+
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.mysql:mysql-connector-j'
     annotationProcessor 'org.projectlombok:lombok'
+
+    //test
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testCompileOnly 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
 }
 
 tasks.named('test') {

src/main/java/com/week/zumgnmarket/ZumgnmarketApplication.java → src/main/java/com/week/zumgnmarket/WeeklyStudyProject.java

@@ -4,10 +4,10 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class ZumgnmarketApplication {
+public class WeeklyStudyProject {
 
     public static void main(String[] args) {
-        SpringApplication.run(ZumgnmarketApplication.class, args);
+        SpringApplication.run(WeeklyStudyProject.class, args);
     }
 
 }

src/main/java/com/week/zumgnmarket/common/config/JpaConfig.java

@@ -0,0 +1,9 @@
+package com.week.zumgnmarket.common.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+
+@EnableJpaAuditing
+@Configuration
+public class JpaConfig {
+}

src/main/java/com/week/zumgnmarket/common/config/QuerydslConfig.java

@@ -0,0 +1,20 @@
+package com.week.zumgnmarket.common.config;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+@Configuration
+public class QuerydslConfig {
+	@PersistenceContext
+	private EntityManager entityManager;
+
+	@Bean
+	public JPAQueryFactory jpaQueryFactory() {
+		return new JPAQueryFactory(entityManager);
+	}
+}

src/main/java/com/week/zumgnmarket/common/domain/BaseEntity.java

@@ -0,0 +1,23 @@
+package com.week.zumgnmarket.common.domain;
+import java.time.LocalDateTime;
+
+import javax.persistence.EntityListeners;
+import javax.persistence.MappedSuperclass;
+
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import lombok.Getter;
+
+@Getter
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public class BaseEntity {
+	@CreatedDate
+	private LocalDateTime createdDate;
+
+	@LastModifiedDate
+	private LocalDateTime updatedDate;
+
+}

src/main/java/com/week/zumgnmarket/order/controller/OrderController.java

@@ -0,0 +1,26 @@
+package com.week.zumgnmarket.order.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.week.zumgnmarket.order.dto.OrderRequest;
+import com.week.zumgnmarket.order.dto.OrderResponse;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/orders")
+public class OrderController {
+
+	private final OrderFacade orderFacade;
+
+	@PostMapping("/tickets")
+	public ResponseEntity<OrderResponse> orderTickets(@RequestBody OrderRequest request) {
+		return ResponseEntity.ok(orderFacade.order(request));
+	}
+
+}

src/main/java/com/week/zumgnmarket/order/controller/OrderFacade.java

@@ -0,0 +1,79 @@
+package com.week.zumgnmarket.order.controller;
+
+import java.util.concurrent.TimeUnit;
+
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.week.zumgnmarket.order.dto.OrderRequest;
+import com.week.zumgnmarket.order.dto.OrderResponse;
+import com.week.zumgnmarket.order.entity.Order;
+import com.week.zumgnmarket.order.service.OrderService;
+import com.week.zumgnmarket.ticket.entity.Ticket;
+import com.week.zumgnmarket.ticket.service.TicketService;
+import com.week.zumgnmarket.user.entity.User;
+import com.week.zumgnmarket.user.service.UserService;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@Transactional
+@RequiredArgsConstructor
+public class OrderFacade {
+
+	private final UserService userService;
+	private final TicketService ticketService;
+	private final OrderService orderService;
+	private final RedissonClient redissonClient;
+
+	public OrderResponse order(OrderRequest request) {
+		User user = userService.getUser(request.getUserId());
+		Ticket ticket = ticketService.getTicket(request.getTicketId());
+		Order order = orderService.orderTicket(user, ticket, request.getQuantity());
+
+		return OrderResponse.of(order, user, ticket);
+	}
+
+	public OrderResponse orderWithPessimisticLock(OrderRequest request) {
+		User user = userService.getUser(request.getUserId());
+		Ticket ticket = ticketService.getTicketWithPessimisticLock(request.getTicketId());
+		Order order = orderService.orderTicket(user, ticket, request.getQuantity());
+
+		return OrderResponse.of(order, user, ticket);
+	}
+
+	public OrderResponse orderWithOptimisticLock(OrderRequest request) throws InterruptedException {
+		User user = userService.getUser(request.getUserId());
+
+		//OptimisticLock 같은 경우 실패했을 때 재시도를 위해 while 을 사용하였습니다.
+		while (true) {
+			try {
+				Ticket ticket = ticketService.getTicketWithOptimisticLock(request.getTicketId());
+				Order order = orderService.orderTicket(user, ticket, request.getQuantity());
+				return OrderResponse.of(order, user, ticket);
+			} catch (Exception e) {
+				Thread.sleep(10);
+			}
+		}
+	}
+
+	public OrderResponse orderWithRedisson(OrderRequest request) {
+		User user = userService.getUser(request.getUserId());
+		RLock lock = redissonClient.getLock(request.getTicketId().toString());
+
+		try {
+			if (!lock.tryLock(2, 1, TimeUnit.SECONDS)) {
+				return new OrderResponse();
+			}
+			Ticket ticket = ticketService.getTicket(request.getTicketId());
+			Order order = orderService.orderTicket(user, ticket, request.getQuantity());
+			return OrderResponse.of(order, user, ticket);
+		} catch (InterruptedException e) {
+			throw new RuntimeException(e);
+		} finally {
+			lock.unlock();
+		}
+	}
+}

src/main/java/com/week/zumgnmarket/order/dto/OrderRequest.java

@@ -0,0 +1,16 @@
+package com.week.zumgnmarket.order.dto;
+
+import lombok.Getter;
+
+@Getter
+public class OrderRequest {
+	public Long userId;
+	public Long ticketId;
+	public int quantity;
+
+	public OrderRequest(Long userId, Long ticketId, int quantity) {
+		this.userId = userId;
+		this.ticketId = ticketId;
+		this.quantity = quantity;
+	}
+}

src/main/java/com/week/zumgnmarket/order/dto/OrderResponse.java

@@ -0,0 +1,35 @@
+package com.week.zumgnmarket.order.dto;
+
+import com.week.zumgnmarket.order.entity.Order;
+import com.week.zumgnmarket.ticket.entity.Ticket;
+import com.week.zumgnmarket.user.entity.User;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class OrderResponse {
+	public Long orderId;
+	public Long userId;
+	public Long ticketId;
+	public int quantity;
+
+	@Builder
+	public OrderResponse(Long orderId, Long userId, Long ticketId, int quantity) {
+		this.orderId = orderId;
+		this.userId = userId;
+		this.ticketId = ticketId;
+		this.quantity = quantity;
+	}
+
+	public static OrderResponse of(Order order, User user, Ticket ticket) {
+		return OrderResponse.builder()
+			.orderId(order.getId())
+			.userId(user.getId())
+			.ticketId(ticket.getId())
+			.quantity(order.getTicketCount())
+			.build();
+	}
+}

src/main/java/com/week/zumgnmarket/order/entity/Order.java

@@ -0,0 +1,58 @@
+package com.week.zumgnmarket.order.entity;
+
+import static javax.persistence.FetchType.*;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import com.week.zumgnmarket.common.domain.BaseEntity;
+import com.week.zumgnmarket.ticket.entity.Ticket;
+import com.week.zumgnmarket.user.entity.User;
+
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Entity
+@Getter
+@ToString
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Table(name = "orders")
+public class Order extends BaseEntity {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "user_id")
+	private User user;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "ticket_id")
+	private Ticket ticket;
+
+	private int ticketCount;
+
+	@Builder
+	private Order(User user, Ticket ticket, int ticketCount) {
+		this.user = user;
+		this.ticket = ticket;
+		this.ticketCount = ticketCount;
+	}
+
+	public static Order of(User user, Ticket ticket, int ticketCount) {
+		return Order.builder()
+			.user(user)
+			.ticket(ticket)
+			.ticketCount(ticketCount)
+			.build();
+	}
+}

src/main/java/com/week/zumgnmarket/order/entity/OrderRepository.java

@@ -0,0 +1,6 @@
+package com.week.zumgnmarket.order.entity;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface OrderRepository extends JpaRepository<Order, Long> {
+}

src/main/java/com/week/zumgnmarket/order/entity/Orders.java

@@ -0,0 +1,18 @@
+package com.week.zumgnmarket.order.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Embeddable;
+import javax.persistence.OneToMany;
+
+import lombok.Getter;
+
+@Getter
+@Embeddable
+public class Orders {
+	@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+	List<Order> orders = new ArrayList<>();
+
+}

src/main/java/com/week/zumgnmarket/order/service/OptimisticLockOrderService.java

@@ -0,0 +1,27 @@
+package com.week.zumgnmarket.order.service;
+
+import org.springframework.stereotype.Service;
+
+import com.week.zumgnmarket.order.entity.Order;
+import com.week.zumgnmarket.ticket.entity.Ticket;
+import com.week.zumgnmarket.user.entity.User;
+
+import lombok.RequiredArgsConstructor;
+
+/**
+ * Optimistic Lock
+ * Lock 이 아니라 Version 을 통해 정합성을 맞추는 방법.
+ * 처음에 현재 데이터의 version 을 읽고,
+ * 이후 update 하는 시점에서 처음 읽은 버전과 동일한지 확인 후 update 수행.
+ * */
+
+@Service
+@RequiredArgsConstructor
+public class OptimisticLockOrderService implements OrderService{
+
+	@Override
+	public Order orderTicket(User user, Ticket ticket, int quantity) {
+		ticket.decreaseQuantity(quantity);
+		return Order.of(user, ticket, quantity);
+	}
+}

src/main/java/com/week/zumgnmarket/order/service/OrderService.java

@@ -0,0 +1,9 @@
+package com.week.zumgnmarket.order.service;
+
+import com.week.zumgnmarket.order.entity.Order;
+import com.week.zumgnmarket.ticket.entity.Ticket;
+import com.week.zumgnmarket.user.entity.User;
+
+public interface OrderService {
+	Order orderTicket(User user, Ticket ticket, int quantity);
+}