Commit 6a32dc2c authored by lemin's avatar lemin

Sales commit

parent 84664387
......@@ -8,11 +8,11 @@ import org.axonframework.eventsourcing.EventSourcingHandler;
import org.axonframework.modelling.command.AggregateIdentifier;
import org.axonframework.spring.stereotype.Aggregate;
import com.showcase.synapse.sales.command.ChangeQuantityCommand;
import com.showcase.synapse.sales.command.CreateProductCommand;
import com.showcase.synapse.sales.event.ProductCreatedEvent;
import com.showcase.synapse.sales.event.ProductQuantityChangedEvent;
import com.showcase.synapse.sales.saga.ProductSaga;
import com.showcase.synapse.sales.command.ChangeSalesQuantityCommand;
import com.showcase.synapse.sales.command.CreateSalesCommand;
import com.showcase.synapse.sales.event.SalesCreatedEvent;
import com.showcase.synapse.sales.event.SalesQuantityChangedEvent;
import com.showcase.synapse.sales.saga.SalesSaga;
import java.math.BigDecimal;
......@@ -21,7 +21,7 @@ import static org.axonframework.modelling.command.AggregateLifecycle.apply;
@Aggregate
@NoArgsConstructor
@Slf4j
public class ProductAggregate {
public class SalesAggregate {
@AggregateIdentifier
private String id;
......@@ -29,26 +29,26 @@ public class ProductAggregate {
@CommandHandler
public ProductAggregate(CreateProductCommand command) {
log.info("[ProductAggregate(CreateProductCommand) > apply new ProductCreatedEvent]");
apply(new ProductCreatedEvent(command.getId(), command.getName(), command.getComment(), command.getPrice()));
public SalesAggregate(CreateSalesCommand command) {
log.info("[SalesAggregate(CreateSalesCommand) > apply new SalesCreatedEvent]");
apply(new SalesCreatedEvent(command.getId(), command.getName(), command.getComment(), command.getPrice()));
}
@EventSourcingHandler
public void createProduct(ProductCreatedEvent event) {
public void createProduct(SalesCreatedEvent event) {
this.id = event.getProductId();
// this.quantiy = event.getQuantity();
}
@CommandHandler
public void changeQuantity(ChangeQuantityCommand command) {
public void changeQuantity(ChangeSalesQuantityCommand command) {
log.info("[@CommandHandler ProductchangeQuantity]");
// if(this.quantiy < command.getQuantity()) throw new IllegalArgumentException("tfy ");
// apply(new ProductQuantityChangedEvent(command.getProductId(), this.quantiy - command.getQuantity()));
// apply(new SalesQuantityChangedEvent(command.getProductId(), this.quantiy - command.getQuantity()));
}
@EventSourcingHandler
public void changeQuantity(ProductQuantityChangedEvent event) {
public void changeQuantity(SalesQuantityChangedEvent event) {
// this.quantiy = event.getQuantity();
}
......
......@@ -7,7 +7,7 @@ import lombok.Getter;
@AllArgsConstructor
@Getter
public class ChangeQuantityCommand {
public class ChangeSalesQuantityCommand {
@TargetAggregateIdentifier
private String productId;
......
......@@ -8,7 +8,7 @@ import java.math.BigDecimal;
@AllArgsConstructor
@Getter
public class CreateProductCommand {
public class CreateSalesCommand {
@TargetAggregateIdentifier
private final String id;
......
......@@ -3,9 +3,9 @@ package com.showcase.synapse.sales.controller;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import com.showcase.synapse.sales.dto.ProductCreateDto;
import com.showcase.synapse.sales.entity.ProductEntity;
import com.showcase.synapse.sales.service.ProductService;
import com.showcase.synapse.sales.dto.SalesCreateDto;
import com.showcase.synapse.sales.entity.SalesEntity;
import com.showcase.synapse.sales.service.SalesService;
import java.math.BigDecimal;
import java.util.HashMap;
......@@ -16,23 +16,23 @@ import java.util.concurrent.ExecutionException;
@RestController
@RequestMapping("/api/msa/product")
@CrossOrigin(origins = "*")
public class ProductController {
public class SalesController {
final ProductService productService;
final SalesService productService;
public ProductController(ProductService productService) {
public SalesController(SalesService productService) {
this.productService = productService;
}
@GetMapping("/")
public ResponseEntity<List<ProductEntity>> getProducts() throws ExecutionException, InterruptedException {
List<ProductEntity> productEntities = productService.getProducts();
public ResponseEntity<List<SalesEntity>> getProducts() throws ExecutionException, InterruptedException {
List<SalesEntity> productEntities = productService.getProducts();
return ResponseEntity.ok(productEntities);
}
@PostMapping("/")
public ResponseEntity<Map<String, String>> productCreate(@RequestBody ProductCreateDto productCreateDto) {
public ResponseEntity<Map<String, String>> productCreate(@RequestBody SalesCreateDto productCreateDto) {
String productId = productService.createProduct(productCreateDto.getName(),
productCreateDto.getComment(),
BigDecimal.valueOf(productCreateDto.getPrice()));
......
......@@ -5,7 +5,7 @@ import lombok.Setter;
@Getter
@Setter
public class ProductCreateDto {
public class SalesCreateDto {
private String name;
private String comment;
private int price;
......
......@@ -14,7 +14,7 @@ import java.math.BigDecimal;
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class ProductEntity {
public class SalesEntity {
@Id
private String id;
private String name;
......
package com.showcase.synapse.sales.enums;
public enum OrderStatus {
public enum SalesStatus {
CREATED, CANCELED
}
......@@ -7,7 +7,7 @@ import java.math.BigDecimal;
@AllArgsConstructor
@Getter
public class ProductCreatedEvent {
public class SalesCreatedEvent {
private String productId;
private String name;
private String comment;
......
......@@ -5,7 +5,7 @@ import lombok.Getter;
@AllArgsConstructor
@Getter
public class ProductQuantityChangedEvent {
public class SalesQuantityChangedEvent {
private String productId;
private int quantity;
}
......@@ -5,24 +5,24 @@ import lombok.extern.slf4j.Slf4j;
import org.axonframework.eventhandling.EventHandler;
import org.springframework.stereotype.Component;
import com.showcase.synapse.sales.entity.ProductEntity;
import com.showcase.synapse.sales.event.ProductCreatedEvent;
import com.showcase.synapse.sales.event.ProductQuantityChangedEvent;
import com.showcase.synapse.sales.repository.ProductRepository;
import com.showcase.synapse.sales.entity.SalesEntity;
import com.showcase.synapse.sales.event.SalesCreatedEvent;
import com.showcase.synapse.sales.event.SalesQuantityChangedEvent;
import com.showcase.synapse.sales.repository.SalesRepository;
@Component
@AllArgsConstructor
@Slf4j
public class ProductEventHandler {
public class SalesEventHandler {
private final ProductRepository productRepository;
private final SalesRepository productRepository;
@EventHandler
protected void saveProduct(ProductCreatedEvent productCreatedEvent) {
protected void saveProduct(SalesCreatedEvent productCreatedEvent) {
log.info("ProductCreatedEvent 이벤트 받음?");
log.info("ProductEventHandler > [ProductCreatedEvent] productCreatedEvent");
ProductEntity productEntity = new ProductEntity();
log.info("SalesCreatedEvent 이벤트 받음?");
log.info("SalesEventHandler > [SalesCreatedEvent] productCreatedEvent");
SalesEntity productEntity = new SalesEntity();
productEntity.setId(productCreatedEvent.getProductId());
productEntity.setName(productCreatedEvent.getName());
productEntity.setComment(productCreatedEvent.getComment());
......@@ -33,10 +33,10 @@ public class ProductEventHandler {
}
@EventHandler
protected void changeQuantity(ProductQuantityChangedEvent productQuantityChangedEvent) {
log.info("ProductQuantityChangedEvent 이벤트 받음?");
log.info("[ProductQuantityChangedEvent]");
ProductEntity productEntity = productRepository.findById(productQuantityChangedEvent.getProductId()).get();
protected void changeQuantity(SalesQuantityChangedEvent productQuantityChangedEvent) {
log.info("SalesQuantityChangedEvent 이벤트 받음?");
log.info("[SalesQuantityChangedEvent]");
SalesEntity productEntity = productRepository.findById(productQuantityChangedEvent.getProductId()).get();
// log.info("[{}] quantity:{}", productEntity.getName(), productEntity.getQuentity());
// productEntity.setQuentity(productQuantityChangedEvent.getQuantity());
productRepository.save(productEntity);
......
......@@ -5,9 +5,9 @@ import java.util.List;
import org.axonframework.queryhandling.QueryHandler;
import org.springframework.stereotype.Component;
import com.showcase.synapse.sales.entity.ProductEntity;
import com.showcase.synapse.sales.query.GetProductsQuery;
import com.showcase.synapse.sales.repository.ProductRepository;
import com.showcase.synapse.sales.entity.SalesEntity;
import com.showcase.synapse.sales.query.GetSalesQuery;
import com.showcase.synapse.sales.repository.SalesRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
......@@ -15,12 +15,12 @@ import lombok.extern.slf4j.Slf4j;
@Component
@RequiredArgsConstructor
@Slf4j
public class ProductQueryHandler {
public class SalesQueryHandler {
private final ProductRepository productRepository;
private final SalesRepository productRepository;
@QueryHandler
protected List<ProductEntity> on(GetProductsQuery query) {
protected List<SalesEntity> on(GetSalesQuery query) {
log.info("---product query---");
return productRepository.findAll();
}
......
package com.showcase.synapse.sales.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import com.showcase.synapse.sales.entity.ProductEntity;
import com.showcase.synapse.sales.entity.SalesEntity;
public interface ProductRepository extends JpaRepository<ProductEntity, String> {
public interface SalesRepository extends JpaRepository<SalesEntity, String> {
}
......@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
//@Saga
@Slf4j
public class ProductSaga {
public class SalesSaga {
@Autowired
private transient CommandGateway commandGateway;
......
......@@ -10,28 +10,28 @@ import org.axonframework.messaging.responsetypes.ResponseTypes;
import org.axonframework.queryhandling.QueryGateway;
import org.springframework.stereotype.Service;
import com.showcase.synapse.sales.command.CreateProductCommand;
import com.showcase.synapse.sales.entity.ProductEntity;
import com.showcase.synapse.sales.query.GetProductsQuery;
import com.showcase.synapse.sales.command.CreateSalesCommand;
import com.showcase.synapse.sales.entity.SalesEntity;
import com.showcase.synapse.sales.query.GetSalesQuery;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
public class ProductService {
public class SalesService {
private final CommandGateway commandGateway;
private final QueryGateway queryGateway;
public ProductService(CommandGateway commandGateway, QueryGateway queryGateway) {
public SalesService(CommandGateway commandGateway, QueryGateway queryGateway) {
this.commandGateway = commandGateway;
this.queryGateway = queryGateway;
}
public String createProduct(String name, String comment, BigDecimal price) {
log.info("[@Service createProduct] new CreateProductCommand");
log.info("[@Service createProduct] new CreateSalesCommand");
// command생성
CreateProductCommand createProductCommand = new CreateProductCommand(
CreateSalesCommand createProductCommand = new CreateSalesCommand(
UUID.randomUUID().toString(), name, comment, price
);
System.out.println("test");
......@@ -42,9 +42,9 @@ public class ProductService {
return returnValue;
}
public List<ProductEntity> getProducts() throws ExecutionException, InterruptedException {
return queryGateway.query(new GetProductsQuery(),
ResponseTypes.multipleInstancesOf(ProductEntity.class)).get();
public List<SalesEntity> getProducts() throws ExecutionException, InterruptedException {
return queryGateway.query(new GetSalesQuery(),
ResponseTypes.multipleInstancesOf(SalesEntity.class)).get();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment