From 50eec2d427f865c8d50b2ddebb5457924eda1b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20Gr=C3=B8nhaug?= <jakob@gronha.ug>
Date: Thu, 20 Apr 2023 14:59:07 +0200
Subject: [PATCH] Implementert Vare-klasse, funksjonalitet WIP
---
pom.xml | 6 ++++
.../matsvinnbackend/model/Item.java | 36 +++++++++++++++++++
.../matsvinnbackend/model/Nutrition.java | 3 ++
3 files changed, 45 insertions(+)
create mode 100644 src/main/java/edu/ntnu/idatt210602/matsvinnbackend/model/Item.java
create mode 100644 src/main/java/edu/ntnu/idatt210602/matsvinnbackend/model/Nutrition.java
diff --git a/pom.xml b/pom.xml
index 077c654..4bde348 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,12 @@
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.10.1</version>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/model/Item.java b/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/model/Item.java
new file mode 100644
index 0000000..7280b69
--- /dev/null
+++ b/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/model/Item.java
@@ -0,0 +1,36 @@
+package edu.ntnu.idatt210602.matsvinnbackend.model;
+
+import java.io.Serializable;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Value;
+
+import com.google.gson.Gson;
+
+import jakarta.persistence.Entity;
+import lombok.Getter;
+import lombok.Setter;
+
+public class Item implements Serializable {
+ @Value("${kassalapp.api-url}")
+ private static String KASSALAPP_API_URL;
+
+ Item() {}
+ Item(String name, String ean, String image_url, String store, List<String> allergens, List<Nutrition> nutrition) {
+ this.allergens = allergens;
+ this.ean = ean;
+ this.image_url = image_url;
+ this.name = name;
+ this.nutrition = nutrition;
+ this.store = store;
+ }
+
+ @Setter @Getter String name;
+ @Setter @Getter String ean;
+ @Setter @Getter String image_url;
+ @Setter @Getter String store;
+ @Setter @Getter List<String> allergens;
+ @Setter @Getter List<Nutrition> nutrition;
+}
diff --git a/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/model/Nutrition.java b/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/model/Nutrition.java
new file mode 100644
index 0000000..ff1e822
--- /dev/null
+++ b/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/model/Nutrition.java
@@ -0,0 +1,3 @@
+package edu.ntnu.idatt210602.matsvinnbackend.model;
+
+public record Nutrition(String code, String display_name, double amount, String unit) {}
--
GitLab