From ac7592faaf5f5b3d605d6620e7a9c775feaf263e Mon Sep 17 00:00:00 2001
From: Gabriel Copat <copatg@cardiff.ac.uk>
Date: Tue, 5 Dec 2023 12:30:16 +0000
Subject: [PATCH] Added Object for Pack Removed "String pack" variable from
Object Sticker
---
.../java/team5/smartTowns/rewards/Pack.java | 27 +++++++++++++++++++
.../team5/smartTowns/rewards/Sticker.java | 3 +--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 src/main/java/team5/smartTowns/rewards/Pack.java
diff --git a/src/main/java/team5/smartTowns/rewards/Pack.java b/src/main/java/team5/smartTowns/rewards/Pack.java
new file mode 100644
index 00000000..2c06025b
--- /dev/null
+++ b/src/main/java/team5/smartTowns/rewards/Pack.java
@@ -0,0 +1,27 @@
+package team5.smartTowns.rewards;
+
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+public class Pack extends Reward{
+
+ int progression; //0-100%;
+
+ public Pack(int id, String name, String description) {
+ super(id, name, description);
+ }
+
+ public void setProgression(List<Sticker> packStickers, List<Sticker> userStickers){
+ /* Takes in a list with all stickers in the pack and a list with all userStickers from the pack
+ * These lists are taken from database in the Controllers via SQL query*/
+ int totalAmount = packStickers.size();
+ int hasAmount = userStickers.size();
+ progression = (int) ((totalAmount/hasAmount) * 100);
+ }
+ @Override
+ public String getImgFolder() {
+ return "packs";
+ }
+}
diff --git a/src/main/java/team5/smartTowns/rewards/Sticker.java b/src/main/java/team5/smartTowns/rewards/Sticker.java
index 426b2d93..6aa4e0c9 100644
--- a/src/main/java/team5/smartTowns/rewards/Sticker.java
+++ b/src/main/java/team5/smartTowns/rewards/Sticker.java
@@ -10,9 +10,8 @@ public class Sticker extends Reward{
int rarity; //1-5
boolean hasSticker;
- String pack;
- public Sticker(int id, String name, String description, int rarity, String pack) {
+ public Sticker(int id, String name, String description, int rarity) {
super(id, name, description);
this.rarity = rarity;
}
--
GitLab