From 6d9cb39c9ba69e1bcf484a2fc5dbe8983166d696 Mon Sep 17 00:00:00 2001
From: mmmchimps <mmmchimps@posteo.me>
Date: Tue, 31 Jan 2023 22:35:58 +0100
Subject: [PATCH] feat: send request to backend; refactor some things

---
 src/App.svelte                            |  4 +-
 src/{lib => components}/Drink.svelte      | 11 +++--
 src/{lib => components}/Finish.svelte     | 27 +++++++---
 src/{lib => components}/Info.svelte       |  4 +-
 src/{lib => components}/List.svelte       |  4 +-
 src/{lib => components}/Navbar.svelte     |  0
 src/{lib => components}/Success.svelte    |  0
 src/lib/api.ts                            | 60 +++++++++++++++++++++++
 src/stores/api.js                         | 14 ------
 src/stores/{inventory.js => inventory.ts} |  0
 10 files changed, 91 insertions(+), 33 deletions(-)
 rename src/{lib => components}/Drink.svelte (82%)
 rename src/{lib => components}/Finish.svelte (79%)
 rename src/{lib => components}/Info.svelte (83%)
 rename src/{lib => components}/List.svelte (93%)
 rename src/{lib => components}/Navbar.svelte (100%)
 rename src/{lib => components}/Success.svelte (100%)
 create mode 100644 src/lib/api.ts
 delete mode 100644 src/stores/api.js
 rename src/stores/{inventory.js => inventory.ts} (100%)

diff --git a/src/App.svelte b/src/App.svelte
index b78b90b..160c575 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -3,8 +3,8 @@
 
 <script lang="ts">
     import "../node_modules/bulma/css/bulma.min.css";
-    import List from "./lib/List.svelte";
-    import Navbar from "./lib/Navbar.svelte";
+    import List from "./components/List.svelte";
+    import Navbar from "./components/Navbar.svelte";
 </script>
 
 <main>
diff --git a/src/lib/Drink.svelte b/src/components/Drink.svelte
similarity index 82%
rename from src/lib/Drink.svelte
rename to src/components/Drink.svelte
index da96b97..7a65ce9 100644
--- a/src/lib/Drink.svelte
+++ b/src/components/Drink.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { onMount } from "svelte";
     import { inventory } from "../stores/inventory"
-    import inventoryApi from "../stores/api";
+    import inventoryApi from "../lib/api";
 
     export let drinkName: string;
 
@@ -9,13 +9,14 @@
     let amountBottles: number;
 
     const saveInventory = () => {
-        // If there is not a timestamp entry yet, create one.
-        if ( !$inventory.some(item => "timestamp" in item)) {
+        // If there is not a timestamp entry yet, create one. This one is only used to show an info window for the user
+        // to indicate when the inventory was started. It won't get processed by the backend.
+        if ( !$inventory.some(item => "inventoryStartedAt" in item)) {
             let _unixTime = Date.now();
             let _date = new Date(_unixTime).toLocaleDateString();
             let _time = new Date(_unixTime).toLocaleTimeString();
             $inventory = [{
-                timestamp: _date + " um " + _time
+                inventoryStartedAt: _date + " um " + _time
             }, ...$inventory];
         }
         // Check if a drink is already in the inventory. If yes, then update the amounts. If not, add it.
@@ -37,7 +38,7 @@
                 ...$inventory,
             ];
         }
-        inventoryApi.save($inventory);
+        inventoryApi.save("drinks", $inventory);
     };
 
     const loadAmountsFromInventory = () => {
diff --git a/src/lib/Finish.svelte b/src/components/Finish.svelte
similarity index 79%
rename from src/lib/Finish.svelte
rename to src/components/Finish.svelte
index cb76601..8cf7da3 100644
--- a/src/lib/Finish.svelte
+++ b/src/components/Finish.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import inventoryApi from "../stores/api";
-    import { inventory } from "../stores/inventory";
+    import inventoryApi from "../lib/api";
+    import { drinks, inventory } from "../stores/inventory";
     import Success from "./Success.svelte";
 
     export let finishKind = "";
@@ -14,7 +14,17 @@
 
     const closeWindow = () => {
         windowIsVisible = "";
-    };    
+    };
+    
+    // If the input field of a drink was not touched, interpret it as "0 containers, 0 bottles" and add it to the inventory
+    const fillInventoryWithZeroes = () => {
+        $drinks.forEach(drink => {
+            if (!$inventory.some(item => item.name === drink.name)) {
+               $inventory = [{name: drink.name, amountContainers: 0, amountBottles: 0 }, ...$inventory] 
+            }
+        });
+    }
+    
 </script>
 
 <div class="modal {windowIsVisible}">
@@ -58,10 +68,11 @@
                     <footer class="modal-card-foot">
                         {#if name.length > 0}
                             <button class="button is-primary" on:click={() => {
-                                // TODO: Hier muss dann der Request an das Backend rausgehen!
-                                closeWindow();
-                                successWindow.showWindow();
-                                setTimeout(() => inventoryApi.reset(), 2000);
+                                fillInventoryWithZeroes()
+                                inventoryApi.sendResultToBackend($inventory, name, comment)
+                                closeWindow()
+                                successWindow.showWindow()
+                                setTimeout(() => inventoryApi.reset(), 3000)
                         }}>Abschließen</button>
                         {:else}
                             <button class="button" disabled>Abschließen</button>
@@ -70,7 +81,7 @@
                     </footer>
                 {:else}
                 <section class="modal-card-body">
-                    <p>Du hast noch gar keine Daten erfasst... 🤓</p>
+                    <p>Du hast noch gar keine Daten erfasst. 🤓</p>
                 </section>
                 <footer class="modal-card-foot">
                     <button class="button" on:click={closeWindow}>Zurück</button>
diff --git a/src/lib/Info.svelte b/src/components/Info.svelte
similarity index 83%
rename from src/lib/Info.svelte
rename to src/components/Info.svelte
index e0ec9f0..f8ef593 100644
--- a/src/lib/Info.svelte
+++ b/src/components/Info.svelte
@@ -18,11 +18,11 @@
     </div>
 </article>
 
-{#if $inventory.some(item => "timestamp" in item)}
+{#if $inventory.some(item => "inventoryStartedAt" in item)}
 <article class="message is-link">
     <div class="message-body">
         <p>
-            Du hast <strong>am {$inventory.at(-1).timestamp}</strong> auf deinem aktuellen Gerät eine Inventur gestartet.
+            Du hast <strong>am {$inventory.at(-1).inventoryStartedAt}</strong> auf deinem aktuellen Gerät eine Inventur gestartet.
             <br>
             Klicke oben rechts auf <span class="tag is-danger"><strong>Reset</strong></span>, wenn du deinen Fortschritt löschen möchtest.
         </p>
diff --git a/src/lib/List.svelte b/src/components/List.svelte
similarity index 93%
rename from src/lib/List.svelte
rename to src/components/List.svelte
index 7910830..b7a375f 100644
--- a/src/lib/List.svelte
+++ b/src/components/List.svelte
@@ -6,12 +6,12 @@
     import Drink from "./Drink.svelte";
     import Info from "./Info.svelte";
     import { activeCategory, drinks, inventory } from "../stores/inventory.js";
-    import inventoryApi from "../stores/api";
+    import inventoryApi from "../lib/api";
 
     $: filteredDrinks = $drinks.filter(drink => drink.type == $activeCategory);
 
     onMount(async () => {
-        $inventory = await inventoryApi.load();
+        $inventory = await inventoryApi.load("drinks");
     })
 
 </script>
diff --git a/src/lib/Navbar.svelte b/src/components/Navbar.svelte
similarity index 100%
rename from src/lib/Navbar.svelte
rename to src/components/Navbar.svelte
diff --git a/src/lib/Success.svelte b/src/components/Success.svelte
similarity index 100%
rename from src/lib/Success.svelte
rename to src/components/Success.svelte
diff --git a/src/lib/api.ts b/src/lib/api.ts
new file mode 100644
index 0000000..94cb571
--- /dev/null
+++ b/src/lib/api.ts
@@ -0,0 +1,60 @@
+const backendProtocol = "http"
+const backendHost = "localhost"
+const backendPort = "8151"
+const backendEndpoint = "drinks"
+
+export default class inventoryApi {
+    static async save(key: string, value: any) {
+        localStorage.setItem(key, JSON.stringify(value));
+    }
+
+    static async load(key: string) {
+        return JSON.parse(localStorage.getItem(key) || "[]");
+    }
+
+    static async reset() {
+        localStorage.removeItem("drinks")
+        window.location.reload();
+    }
+
+    static async sendResultToBackend(inventory: any, name: string, comment: string) {
+        let result = {
+            inventory: inventory,
+            name: name,
+            comment: comment,
+            timestamp: await inventoryApi.createTimestamp()
+        }
+
+        try {
+            await fetch(backendProtocol+"://"+backendHost+":"+backendPort+"/"+backendEndpoint, {
+                method: "POST",
+                headers: {
+                    'Accept': 'application/json',
+                    'Content-Type': 'application/json'
+                  },
+                body: JSON.stringify(result),
+            })
+        } catch(err) {
+            console.log(err)
+            alert("Ergebnis konnte nicht abgeschickt werden. Check mal die Dev-Console und/oder gib bitte kurz in der Gastro-Gruppe Bescheid...")
+        }
+    }
+
+    static async createTimestamp() {
+        let _unixTime = Date.now();
+        let _date = new Date(_unixTime).toLocaleDateString();
+        let _time = new Date(_unixTime).toLocaleTimeString();
+
+        return _date + " um " + _time
+    }
+
+    static async saveNameAndComment(name: string, comment: string) {
+        let performingPerson = {
+            name: name,
+            comment: comment
+        }
+
+        inventoryApi.save("performingPerson", performingPerson)
+    }
+
+}
\ No newline at end of file
diff --git a/src/stores/api.js b/src/stores/api.js
deleted file mode 100644
index 73fed81..0000000
--- a/src/stores/api.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export default class inventoryApi {
-    static async save(drinks) {
-        localStorage.setItem("drinks", JSON.stringify(drinks));
-    }
-
-    static async load() {
-        return JSON.parse(localStorage.getItem("drinks") || "[]");
-    }
-
-    static async reset() {
-        localStorage.removeItem("drinks");
-        window.location.reload();
-    }
-}
\ No newline at end of file
diff --git a/src/stores/inventory.js b/src/stores/inventory.ts
similarity index 100%
rename from src/stores/inventory.js
rename to src/stores/inventory.ts