Commit 01c286a1 authored by Alex Pinto's avatar Alex Pinto

updated models and create endpoint

parent 500c0908
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
"axios": "^0.21.1", "axios": "^0.21.1",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-google-login": "^5.2.2",
"react-icons": "^4.2.0", "react-icons": "^4.2.0",
"react-redux": "^7.2.4", "react-redux": "^7.2.4",
"react-scripts": "4.0.3", "react-scripts": "4.0.3",
...@@ -14938,6 +14939,19 @@ ...@@ -14938,6 +14939,19 @@
"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz", "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
"integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==" "integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew=="
}, },
"node_modules/react-google-login": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/react-google-login/-/react-google-login-5.2.2.tgz",
"integrity": "sha512-JUngfvaSMcOuV0lFff7+SzJ2qviuNMQdqlsDJkUM145xkGPVIfqWXq9Ui+2Dr6jdJWH5KYdynz9+4CzKjI5u6g==",
"dependencies": {
"@types/react": "*",
"prop-types": "^15.6.0"
},
"peerDependencies": {
"react": "^16 || ^17",
"react-dom": "^16 || ^17"
}
},
"node_modules/react-icons": { "node_modules/react-icons": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.2.0.tgz", "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.2.0.tgz",
import React from 'react'; import React from 'react';
import { GoogleLogin } from "react-google-login"; import { GoogleLogin } from "react-google-login";
import keys from '../../config/keys_dev' import keys from "../../config/keys_dev"
const clientId = keys.clientId; const clientId = keys.clientId;
......
package com.ascendfinalproject.warehouse.controllers; package com.ascendfinalproject.warehouse.controllers;
import com.ascendfinalproject.warehouse.models.OrderResponse;
import com.ascendfinalproject.warehouse.models.WarehouseOrder; import com.ascendfinalproject.warehouse.models.WarehouseOrder;
import com.ascendfinalproject.warehouse.services.WarehouseOrderService; import com.ascendfinalproject.warehouse.services.WarehouseOrderService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.Order;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
...@@ -22,7 +24,7 @@ public class WarehouseController { ...@@ -22,7 +24,7 @@ public class WarehouseController {
@CrossOrigin @CrossOrigin
@GetMapping("/orders/{id}") @GetMapping("/orders/{id}")
public Mono<WarehouseOrder> findStudent(@PathVariable String id){ public Mono<WarehouseOrder> findOrder(@PathVariable String id){
return orderService.findOrderById(id); return orderService.findOrderById(id);
} }
......
package com.ascendfinalproject.warehouse.models;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.annotation.Id;
@Getter
@Setter
public class Item {
@Id
private String id;
private String name;
private int quantity;
private int price;
private int sku;
}
...@@ -17,4 +17,11 @@ public class OrderResponse { ...@@ -17,4 +17,11 @@ public class OrderResponse {
allIds.add(id); allIds.add(id);
} }
@Override
public String toString() {
return "OrderResponse{" +
"allIds=" + allIds +
", byId=" + byId +
'}';
}
} }
...@@ -4,6 +4,9 @@ import lombok.Getter; ...@@ -4,6 +4,9 @@ import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
import java.util.Date;
import java.util.List;
@Getter @Getter
@Setter @Setter
public class WarehouseOrder { public class WarehouseOrder {
...@@ -11,6 +14,10 @@ public class WarehouseOrder { ...@@ -11,6 +14,10 @@ public class WarehouseOrder {
private String id; private String id;
private String orderId; private String orderId;
private String status; private String status;
private Date createdAt;
private Date modifiedAt;
private List<Item> orderItems;
private String address;
public WarehouseOrder() { public WarehouseOrder() {
} }
......
...@@ -19,18 +19,12 @@ public class WarehouseOrderService { ...@@ -19,18 +19,12 @@ public class WarehouseOrderService {
public Flux<WarehouseOrder> getOrders() { public Flux<WarehouseOrder> getOrders() {
return orderRepository.findAll(); return orderRepository.findAll();
// OrderResponse response = new OrderResponse();
// orderRepository.findAll()
// .flatMap(order -> {
// response.appendId(order.getId());
// response.getById().put(order.getId(), order);
// });
//
// return response;
} }
public Mono<WarehouseOrder> createOrder(WarehouseOrder order) { public Mono<WarehouseOrder> createOrder(WarehouseOrder order) {
return orderRepository.save(order); order.setStatus("RECEIVED");
return orderRepository.save(order);
} }
public Mono<WarehouseOrder> updateOrder(WarehouseOrder order, String id) { public Mono<WarehouseOrder> updateOrder(WarehouseOrder order, String id) {
......
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