From 38f9ec69aea6db12cf147141e84dbf73fa9fe941 Mon Sep 17 00:00:00 2001
From: Tim <47184194+imgde@users.noreply.github.com>
Date: Thu, 12 Jun 2025 08:22:00 +0200
Subject: [PATCH] Add StockExpected for Articles

---
 00-backend/datasource/database.sqlite         | Bin 2609152 -> 2613248 bytes
 .../htwsaar/webshop/model/ArticleModel.java   |   1 +
 .../webshop/repository/entities/Article.java  |   4 +++
 .../service/impl/ArticleServiceImpl.java      |   1 +
 00-backend/src/main/resources/db/initdb.sql   |  26 ++++++++++--------
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/00-backend/datasource/database.sqlite b/00-backend/datasource/database.sqlite
index 267538e5cff00a30410035345343224df86e3f2b..ca484756939723b4d6d8a54297ca8c4dd54e3e6c 100644
GIT binary patch
delta 495
zcmbu5&1w^26o$X=%VcKqH+{#Srm?2|+Nx1ZB~@G$gi>%6V~AjrjVsf1gx1<hXIi9%
z5URfDMvSu*ny%bRnH%T@2#R-6y#jY83+V-T7U#gr3y0_F9`<GTxGz7ByHz1nN1RTf
zSH4xMiW@uclfw|hr8>@jrkPqxP1+x<19Q|^Qh$soXSdf|NWYnrR=!x2?{3G+`7W>P
zAlz&}_g=m9+o8XrAJiM(eebcZKWgZDvsTl0y?cwzT0_rOD$$RT%F)Ra89!9NY(og?
z#q*hYX`8M&{3_zzY)9^ckc1)<gh3<;lduSzND*lwLu82@;SeLlpzjiAh_l2w;yf`*
z<cTq&KwKckiHk&$m>?zzO-vEf#0+tXxJ+F6g3|G)r^ZB1bVcr4?sK-DerE646{~N4
zO_mZX>W)f_?tuQ<DSg;lUiTNb!qxV=AN;$oE!WBy3i9o0w2=8}24O4Q4x$5RdaSHx
sXZ?-s7iAszzFuqXwDjhdt}aD~iH*orH;+!P4!!)g<Gq1|)c;BT3$ajt6#xJL

delta 266
zcmYL>JugF19EZ>UwD+ES+n)A!z4W54dOspU5QD^mp@Z-Z7({#siD)|ftVH6DHQB{*
z*KWo}#U?SAFJM%YCwaCfPqWjO=0jU<YEeTeeX0Jb-mYxAhFU%UvU*=x)mQe%zLYMC
zTj8NOHL*|cK3~=cs;{HFb)0yu<%)^3ot|5gw9s=K!Ql0$%Ff>0caYoj&GW9^mbCuv
zg6!zST}kMPiIYUGkDt0-NnbzRS_^~_n#d7(!Xtdb5CIVq1)@ll2uqZS3Nh#-Vu%<f
nMu<_OO2ot%F-}YnHDZ!Th$*5@OcOK2EHOvS6AQ%RBV6Yf*YQ8Z

diff --git a/00-backend/src/main/java/de/htwsaar/webshop/model/ArticleModel.java b/00-backend/src/main/java/de/htwsaar/webshop/model/ArticleModel.java
index f32e269..57fb700 100644
--- a/00-backend/src/main/java/de/htwsaar/webshop/model/ArticleModel.java
+++ b/00-backend/src/main/java/de/htwsaar/webshop/model/ArticleModel.java
@@ -20,6 +20,7 @@ public class ArticleModel {
     private int price100;
     private int discount100;
     private int stock;
+    private int stockExpected;
     private String category;
     private double rating;
 }
diff --git a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Article.java b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Article.java
index b056edf..84c9c76 100644
--- a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Article.java
+++ b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Article.java
@@ -29,6 +29,10 @@ public class Article {
     @Column(name = "stock", nullable = false)
     private Integer stock;
 
+    @Min(0)
+    @Column(name = "stockExpected", nullable = false)
+    private Integer stockExpected;
+
     @Column(name = "name", nullable = false)
     private String name;
 
diff --git a/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ArticleServiceImpl.java b/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ArticleServiceImpl.java
index d8fe19c..4bce015 100644
--- a/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ArticleServiceImpl.java
+++ b/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ArticleServiceImpl.java
@@ -90,6 +90,7 @@ public class ArticleServiceImpl implements ArticleService {
                 article.getPrice100(),
                 article.getDiscount100(),
                 article.getStock(),
+                article.getStockExpected(),
                 article.getCategory(),
                 calculateAverageRating(article.getReviews())
         );
diff --git a/00-backend/src/main/resources/db/initdb.sql b/00-backend/src/main/resources/db/initdb.sql
index b3f66ba..371c95c 100644
--- a/00-backend/src/main/resources/db/initdb.sql
+++ b/00-backend/src/main/resources/db/initdb.sql
@@ -4,13 +4,16 @@ CREATE TABLE IF NOT EXISTS Articles
     id          INTEGER PRIMARY KEY NOT NULL,
     uuid        TEXT UNIQUE         NOT NULL, -- UUID
     stock       INTEGER             NOT NULL DEFAULT 0,
+    stockExpected INTEGER NOT NULL DEFAULT 100,
     name        TEXT                NOT NULL,
     description TEXT                NULL,     --in html
     price100    INTEGER             NOT NULL, -- in cents
     discount100 INTEGER             NULL,     -- in percent
     category    TEXT                NULL,
 
-    CONSTRAINT c_stock CHECK ( stock >= 0 )
+    CONSTRAINT c_stock CHECK ( stock >= 0 ),
+    CONSTRAINT c_stockExpected CHECK ( stockExpected >= 0 ), --inactive in current version
+    CONSTRAINT c_discount100 CHECK ( discount100 IS NULL OR 0 <= discount100 AND discount100 <= 100 ) --inactive in current version
 );
 
 -- article images
@@ -43,16 +46,6 @@ CREATE TABLE IF NOT EXISTS Customers
     zip     TEXT                NOT NULL
 );
 
-CREATE TABLE IF NOT EXISTS Orders
-(
-    id          INTEGER PRIMARY KEY NOT NULL,
-    customer_id INTEGER             NOT NULL,
-    time        INTEGER             NOT NULL, --unix millis or epoch, TBD
-    FOREIGN KEY (customer_id) REFERENCES Customers (id)
-        ON DELETE CASCADE
-        ON UPDATE CASCADE
-);
-
 CREATE TABLE IF NOT EXISTS Accounts
 (
     id          INTEGER PRIMARY KEY NOT NULL,
@@ -66,6 +59,17 @@ CREATE TABLE IF NOT EXISTS Accounts
         ON UPDATE CASCADE
 );
 
+CREATE TABLE IF NOT EXISTS Orders
+(
+    id          INTEGER PRIMARY KEY NOT NULL,
+    customer_id INTEGER             NOT NULL,
+    time        INTEGER             NOT NULL, --unix millis or epoch, TBD
+    status      INTEGER             NOT NULL, --enum, see java or JS
+    FOREIGN KEY (customer_id) REFERENCES Customers (id)
+        ON DELETE CASCADE
+        ON UPDATE CASCADE
+);
+
 CREATE TABLE IF NOT EXISTS OrderItems
 (
     id         INTEGER NOT NULL PRIMARY KEY,