Merge pull request #527 from leih-lokal/518-new-item-statuses

New item statuses
leih-lokal · Sep 8, 2024 · 7d48e06 · 7d48e06
2 parents 0d58ea8 + 6e9c3c0
commit 7d48e06
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 17 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -33,7 +33,7 @@ jobs:
         run: wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && sudo apt install ./google-chrome-stable_current_amd64.deb
 
       - name: Start CouchDB
-        run: docker-compose up -d couchdb
+        run: docker compose up -d couchdb
 
       - name: Wait for CouchDB
         uses: iFaxity/wait-on-action@v1
@@ -42,7 +42,7 @@ jobs:
           delay: 500
 
       - name: Insert Testdata
-        run: docker-compose up testdata_generator
+        run: docker compose up testdata_generator
 
       - name: Run cypress integration tests
         uses: cypress-io/github-action@v2

diff --git a/Frontend/src/data/item/columns.js b/Frontend/src/data/item/columns.js
@@ -87,6 +87,9 @@ export default [
       if (value === "outofstock") return "verliehen";
       if (value === "reserved") return "reserviert";
       if (value === "onbackorder") return "nicht verleihbar";
+      if (value === "lost") return "verschollen";
+      if (value === "repairing") return "in Reparatur";
+      if (value === "forsale") return "zu verkaufen";
     },
     backgroundColor: backgroundColorStatus,
   },

diff --git a/Frontend/src/data/item/filters.js b/Frontend/src/data/item/filters.js
@@ -48,6 +48,30 @@ export default {
         },
       },
     },
+    "verschollen": {
+      required_fields: ["status"],
+      selectors: {
+        status: {
+          $eq: "lost",
+        },
+      },
+    },
+    "in Reparatur": {
+      required_fields: ["status"],
+      selectors: {
+        status: {
+          $eq: "repairing",
+        },
+      },
+    },
+    "zu verkaufen": {
+      required_fields: ["status"],
+      selectors: {
+        status: {
+          $eq: "forsale",
+        },
+      },
+    },
     "Kategorie Küche": {
       required_fields: ["category"],
       selectors: {

diff --git a/Frontend/src/data/item/inputs.js b/Frontend/src/data/item/inputs.js
@@ -179,6 +179,9 @@ export default {
           { value: "outofstock", label: "verliehen" },
           { value: "onbackorder", label: "nicht verleihbar" },
           { value: "reserved", label: "reserviert" },
+          { value: "lost", label: "verschollen" },
+          { value: "repairing", label: "in Reparatur" },
+          { value: "forsale", label: "zu verkaufen" },
         ],
         isCreatable: false,
         isMulti: false,

diff --git a/Frontend/src/data/rental/inputs.js b/Frontend/src/data/rental/inputs.js
@@ -89,9 +89,12 @@ const showNotificationsForItem = async (item) => {
     outofstock: "verliehen",
     reserved: "reserviert",
     onbackorder: "temporär nicht verfügbar / in Reparatur",
+    lost: "verschollen",
+    repairing: "in Reparatur",
+    forsale: "zu verkaufen",
   };
   var status = statusMapping[item.status];
-  if (["outofstock", "reserved", "onbackorder"].includes(item.status)) {
+  if (["outofstock", "reserved", "onbackorder", "lost", "repairing", "forsale"].includes(item.status)) {
     notifier.danger(
       `${item.name} (${item.id}) ist nicht verfügbar, hat Status: ${status}`,
       10000

diff --git a/Frontend/src/database/WoocommerceClient.js b/Frontend/src/database/WoocommerceClient.js
@@ -53,8 +53,11 @@ class WoocommerceClient {
   }
 
   _translateItemAttributesForWc(item) {
-    const translateStatus = (status) =>
-      status === "reserved" ? "outofstock" : status;
+    const translateStatus = (status) => {
+      if (["reserved"].includes(status)) return "outofstock";
+      if (["lost", "repairing", "forsale"].includes(status)) return "onbackorder";
+      return status;
+    }
 
     const hasSynonyms = item.synonyms && item.synonyms.trim().length > 0;
     const isRentedAndHasReturnDateInFuture =

diff --git a/Frontend/test/integration_cypress/utils.js b/Frontend/test/integration_cypress/utils.js
@@ -8,7 +8,7 @@ const waitForPopupToClose = () =>
 const clearFilter = () => cy.get(".multiSelectItem_clear").click();
 
 const resetTestData = () =>
-  cy.exec("docker-compose up testdata_generator", {
+  cy.exec("docker compose up testdata_generator", {
     timeout: 120000,
   });