Merge branch 'backend2' into 'master'

Backend2

See merge request !14

pom.xml

@@ -80,6 +80,11 @@
 			<artifactId>google-api-client</artifactId>
 			<version>1.31.2</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/ascendfinalproject/warehouse/controllers/WarehouseController.java

 package com.ascendfinalproject.warehouse.controllers;
 
-import com.ascendfinalproject.warehouse.models.OrderResponse;
-import com.ascendfinalproject.warehouse.models.Session;
-import com.ascendfinalproject.warehouse.models.WarehouseOrder;
-import com.ascendfinalproject.warehouse.services.SessionService;
+import com.ascendfinalproject.warehouse.models.WarehouseOrderRequest;
+import com.ascendfinalproject.warehouse.models.WarehouseOrderResponse;
 import com.ascendfinalproject.warehouse.services.WarehouseOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import javax.validation.Valid;
+
 @RestController
 @RequestMapping(value = "/api")
 public class WarehouseController {
@@ -23,7 +21,7 @@ public class WarehouseController {
 
   @CrossOrigin
   @GetMapping(value = "/orders")
-  public Flux<WarehouseOrder> getOrders() {
+  public Flux<WarehouseOrderResponse> getOrders() {
     return orderService.getOrders();
   }
 
@@ -38,14 +36,17 @@ public class WarehouseController {
 
   @CrossOrigin
   @PostMapping(value = "/orders")
-  public Mono<WarehouseOrder> createOrder(@RequestBody WarehouseOrder order) {
+  public Mono<WarehouseOrderResponse> createOrder(@Valid @RequestBody WarehouseOrderRequest order) {
     return orderService.createOrder(order);
   }
 
   @CrossOrigin
   @PutMapping(value = "/orders/{id}")
-  public Mono<WarehouseOrder> updateOrder(@RequestBody WarehouseOrder order, @PathVariable(value = "id") String id) {
-    return orderService.updateOrder(order, id);
+  public Mono<ResponseEntity> updateOrder(@RequestBody WarehouseOrderResponse order, @PathVariable(value = "id") String id) {
+    return orderService.updateOrder(order, id)
+            .map(updatedOrder -> (ResponseEntity.status(HttpStatus.OK).body(order)))
+            .cast(ResponseEntity.class)
+            .defaultIfEmpty(ResponseEntity.status(HttpStatus.NOT_FOUND).body(null));
   }
 
   @CrossOrigin

src/main/java/com/ascendfinalproject/warehouse/exceptions/NotFoundException.java

+package com.ascendfinalproject.warehouse.exceptions;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
+public class NotFoundException extends RuntimeException {
+    public NotFoundException() {
+        super();
+    }
+    public NotFoundException(String message) {
+        super(message);
+    }
+}

src/main/java/com/ascendfinalproject/warehouse/models/Address.java

+package com.ascendfinalproject.warehouse.models;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class Address {
+
+    private String street;
+    private String city;
+    private String state;
+    private String zip;
+
+    public Address(String street, String city, String state, String zip) {
+        this.street = street;
+        this.city = city;
+        this.state = state;
+        this.zip = zip;
+    }
+}

src/main/java/com/ascendfinalproject/warehouse/models/OrderResponse.java

-package com.ascendfinalproject.warehouse.models;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Getter
-@Setter
-public class OrderResponse {
-
-    private List<String> allIds = new ArrayList<>();
-    private Map<String, WarehouseOrder> byId = new HashMap<>();
-
-    public void appendId(String id) {
-        allIds.add(id);
-    }
-
-    public void addOrder(WarehouseOrder order) {
-        byId.put(order.getId(), order);
-    }
-
-    @Override
-    public String toString() {
-        return "OrderResponse{" +
-                "allIds=" + allIds +
-                ", byId=" + byId +
-                '}';
-    }
-}

src/main/java/com/ascendfinalproject/warehouse/models/WarehouseOrderRequest.java

+package com.ascendfinalproject.warehouse.models;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.data.annotation.Id;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class WarehouseOrderRequest {
+
+    @Id
+    private String id;
+    private String orderTrackingCode;
+    private String orderStatus;
+    private long orderCreatedAt;
+    private long orderUpdatedAt;
+    private String customerId;
+    private String customerEmailAddress;
+    private List<Item> orderItems;
+    private Address customerAddress;
+}

src/main/java/com/ascendfinalproject/warehouse/models/WarehouseOrder.java → src/main/java/com/ascendfinalproject/warehouse/models/WarehouseOrderResponse.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 @Getter
 @Setter
-public class WarehouseOrder {
+public class WarehouseOrderResponse {
   @Id
   private String id;
   private String orderId;
@@ -19,6 +19,6 @@ public class WarehouseOrder {
   private List<Item> orderItems;
   private String address;
 
-  public WarehouseOrder() {
+  public WarehouseOrderResponse() {
   }
 }

src/main/java/com/ascendfinalproject/warehouse/repositories/SessionRepository.java

-package com.ascendfinalproject.warehouse.repositories;
-
-import com.ascendfinalproject.warehouse.models.Session;
-import org.springframework.data.repository.CrudRepository;
-
-public interface SessionRepository extends CrudRepository<Session, String> {
-
-
-}

src/main/java/com/ascendfinalproject/warehouse/repositories/WarehouseOrderRepository.java

 package com.ascendfinalproject.warehouse.repositories;
 
-import com.ascendfinalproject.warehouse.models.WarehouseOrder;
+import com.ascendfinalproject.warehouse.models.WarehouseOrderResponse;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 
-public interface WarehouseOrderRepository extends ReactiveMongoRepository<WarehouseOrder, String> {
+public interface WarehouseOrderRepository extends ReactiveMongoRepository<WarehouseOrderResponse, String> {
 }

src/main/java/com/ascendfinalproject/warehouse/services/SessionService.java

@@ -7,7 +7,6 @@ import org.springframework.stereotype.Service;
 
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.util.Scanner;
 
 @Service
 public class SessionService {

src/main/java/com/ascendfinalproject/warehouse/services/WarehouseOrderService.java

 package com.ascendfinalproject.warehouse.services;
 
-import com.ascendfinalproject.warehouse.models.Item;
-import com.ascendfinalproject.warehouse.models.OrderResponse;
-import com.ascendfinalproject.warehouse.models.WarehouseOrder;
+import com.ascendfinalproject.warehouse.exceptions.NotFoundException;
+import com.ascendfinalproject.warehouse.models.Address;
+import com.ascendfinalproject.warehouse.models.WarehouseOrderRequest;
+import com.ascendfinalproject.warehouse.models.WarehouseOrderResponse;
 import com.ascendfinalproject.warehouse.repositories.WarehouseOrderRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import reactor.core.CoreSubscriber;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
-import java.util.List;
 
 @Service
 public class WarehouseOrderService {
@@ -21,27 +19,31 @@ public class WarehouseOrderService {
   @Autowired
   WarehouseOrderRepository orderRepository;
 
-  public Mono<WarehouseOrder> getById(String id) {
+  public Mono<WarehouseOrderResponse> getById(String id) {
     return orderRepository.findById(id);
   }
 
-  public Flux<WarehouseOrder> getOrders() {
+  public Flux<WarehouseOrderResponse> getOrders() {
     return orderRepository.findAll();
   }
 
-  public Mono<WarehouseOrder> createOrder(WarehouseOrder order) {
-      order.setStatus("RECEIVED");
-      order.setCreatedAt(new Date(System.currentTimeMillis()));
-      List<Item> itemList = Arrays.asList(
-              new Item("3", "Hamburger", 3, 3, 33),
-              new Item("4", "Sausage", 4, 5, 66),
-              new Item("5", "Fries", 3, 4, 33));
-      order.setOrderItems(itemList);
-      order.setAddress("123 apple st");
-      return orderRepository.save(order);
+  public Mono<WarehouseOrderResponse> createOrder(WarehouseOrderRequest order) {
+      WarehouseOrderResponse response = new WarehouseOrderResponse();
+      response.setOrderId(order.getId());
+      response.setStatus("RECEIVED");
+      response.setCreatedAt(new Date(order.getOrderCreatedAt()));
+      response.setModifiedAt(new Date(order.getOrderUpdatedAt()));
+      response.setOrderItems(order.getOrderItems());
+      Address address = order.getCustomerAddress();
+      response.setAddress(address.getStreet() + ", " +
+                          address.getCity() + ", " +
+                          address.getState() + ", " +
+                          address.getZip()
+      );
+      return orderRepository.save(response);
   }
 
-  public Mono<WarehouseOrder> updateOrder(WarehouseOrder order, String id) {
+  public Mono<WarehouseOrderResponse> updateOrder(WarehouseOrderResponse order, String id) {
     return orderRepository.findById(id)
         .flatMap(existingOrder -> {
           existingOrder.setStatus(order.getStatus());