From 7b61e3363e53ec465420e08893b8e495b40ca9cd Mon Sep 17 00:00:00 2001
From: BEAUVAIS ANTOINE <antoine.beauvais@etu.unistra.fr>
Date: Thu, 23 Sep 2021 19:04:06 +0200
Subject: [PATCH] Added quantity to transactions.
---
.../api/ApiSubmitTransactionController.java | 3 +--
.../unistra/sil/erp/back/model/Transaction.java | 17 ++++++++++++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/fr/unistra/sil/erp/back/controller/api/ApiSubmitTransactionController.java b/src/main/java/fr/unistra/sil/erp/back/controller/api/ApiSubmitTransactionController.java
index a249869..37189f0 100644
--- a/src/main/java/fr/unistra/sil/erp/back/controller/api/ApiSubmitTransactionController.java
+++ b/src/main/java/fr/unistra/sil/erp/back/controller/api/ApiSubmitTransactionController.java
@@ -60,8 +60,7 @@ public class ApiSubmitTransactionController
if(t == null)
throw new ApiBadRequestException("Missing JSON body.");
- if(t.getItem() == null || t.getType() == null ||
- t.getAmount() == null)
+ if(!t.checkIfValid())
throw new ApiBadRequestException("Invalid JSON schema.");
System.out.println("Transaction : " + t.getItem() +
diff --git a/src/main/java/fr/unistra/sil/erp/back/model/Transaction.java b/src/main/java/fr/unistra/sil/erp/back/model/Transaction.java
index 19dae4e..b4eadec 100644
--- a/src/main/java/fr/unistra/sil/erp/back/model/Transaction.java
+++ b/src/main/java/fr/unistra/sil/erp/back/model/Transaction.java
@@ -18,11 +18,15 @@ public class Transaction {
private final BigDecimal amount;
- public Transaction(Integer item, Integer type, BigDecimal amount)
+ private final Integer quantity;
+
+ public Transaction(Integer item, Integer type, BigDecimal amount,
+ Integer quantity)
{
this.item = item;
this.type = type;
this.amount = amount;
+ this.quantity = quantity;
}
public Integer getItem()
@@ -40,4 +44,15 @@ public class Transaction {
return this.amount;
}
+ public Integer getQuantity()
+ {
+ return this.quantity;
+ }
+
+ public boolean checkIfValid()
+ {
+ return (this.item != null && this.type != null
+ && this.amount != null && this.quantity != null);
+ }
+
}
--
GitLab