From 30655dc5a89ccb86cd477a1e47447e9121ae9e7c Mon Sep 17 00:00:00 2001
From: dasha <amayashimizu89@gmail.com>
Date: Mon, 10 Apr 2023 15:37:07 +0400
Subject: [PATCH] order add feature

---
 front/src/pages/Orders.jsx                    | 23 +++++++++++++++++++
 .../src/pages/components/OrderSessionItem.jsx |  2 ++
 .../com/labwork1/app/WebConfiguration.java    | 23 +++++++++++++++++++
 .../student/controller/OrderController.java   |  4 +++-
 4 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/front/src/pages/Orders.jsx b/front/src/pages/Orders.jsx
index dffc089..e8baaf6 100644
--- a/front/src/pages/Orders.jsx
+++ b/front/src/pages/Orders.jsx
@@ -97,6 +97,7 @@ export default function Orders() {
             })
             .catch((error) => {
                 console.error('Error:', error);
+                alert('Не хватает билетов на сеанс')
             });
     };
 
@@ -139,6 +140,27 @@ export default function Orders() {
             .catch(e => { console.log('Error get orders') })
     }
 
+    async function handleDeleteOrderSession(id, sessionId) {
+        console.info('Start delete session');
+        console.info(id+'-order, session-'+sessionId)
+        const requestParams = {
+            method: "PUT",
+            headers: {
+                "Content-Type": "application/json"
+            }
+        };
+        const requestUrl = `http://localhost:8080/order/${id}?session=${sessionId}`
+        const response = await fetch(requestUrl, requestParams)
+        await response.json()
+            .then((data) => {
+                console.info('End delete session')
+                setOrderSessions(data.sessions)
+            })
+            .catch((error) => {
+                console.error('Error:', error);
+            });
+    }
+
     const Content = (
         <>
             <select required className="form-select" name="customer" id="customer" value={customer.value} onChange={e => {
@@ -211,6 +233,7 @@ export default function Orders() {
                                 <OrderSessionItem
                                     item={item}
                                     key={parseInt(item.sessionId+''+item.orderId)}
+                                    removeFunc={(e) => handleDeleteOrderSession(e, currEditItem, item.sessionId)}
                                 />
                             ) : null}
                         </tbody>
diff --git a/front/src/pages/components/OrderSessionItem.jsx b/front/src/pages/components/OrderSessionItem.jsx
index 343ed34..26f9af4 100644
--- a/front/src/pages/components/OrderSessionItem.jsx
+++ b/front/src/pages/components/OrderSessionItem.jsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from "react"
 import CinemaDto from "../models/CinemaDto";
 import Service from "../services/Service";
+import MyButton from "./MyButton";
 
 export default function OrderSessionItem(props) {
     const [item, setItem] = useState(new CinemaDto())
@@ -31,6 +32,7 @@ export default function OrderSessionItem(props) {
                     <td>{item.cinema.name}</td>
                     <td>{date}</td>
                     <td>{props.item.count}</td>
+                    <td><MyButton value={props} /></td>
                 </tr> : null}
         </>
     )
diff --git a/src/main/java/com/labwork1/app/WebConfiguration.java b/src/main/java/com/labwork1/app/WebConfiguration.java
index 637ed29..8b69823 100644
--- a/src/main/java/com/labwork1/app/WebConfiguration.java
+++ b/src/main/java/com/labwork1/app/WebConfiguration.java
@@ -1,7 +1,14 @@
 package com.labwork1.app;
 
+import org.springframework.boot.web.server.ErrorPage;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistration;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class WebConfiguration implements WebMvcConfigurer {
@@ -9,4 +16,20 @@ public class WebConfiguration implements WebMvcConfigurer {
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**").allowedMethods("*");
     }
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+        ViewControllerRegistration registration = registry.addViewController("/notFound");
+        registration.setViewName("forward:/index.html");
+        registration.setStatusCode(HttpStatus.OK);
+
+        // Alternative way (404 error hits the console):
+        // > registry.addViewController("/notFound").setViewName("forward:/index.html");
+    }
+
+    @Bean
+    public WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> containerCustomizer() {
+        return container -> {
+            container.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND, "/notFound"));
+        };
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labwork1/app/student/controller/OrderController.java b/src/main/java/com/labwork1/app/student/controller/OrderController.java
index 5f69da3..a0ecc5f 100644
--- a/src/main/java/com/labwork1/app/student/controller/OrderController.java
+++ b/src/main/java/com/labwork1/app/student/controller/OrderController.java
@@ -34,7 +34,9 @@ public class OrderController {
     @PutMapping("/{id}")
     public OrderDto updateOrder(@PathVariable Long id,
                                 @RequestParam("session") Long session,
-                                @RequestParam("count") Integer count) {
+                                @RequestParam(value = "count", required = false) Integer count) {
+        if (count == null)
+            return new OrderDto(orderService.deleteSessionInOrder(id, session, Integer.MAX_VALUE));
         if (count > 0)
             return new OrderDto(orderService.addSession(id, session, count));
         return new OrderDto(orderService.deleteSessionInOrder(id, session, -count));