From ca11cd3c9a83d12d03356eeb7c96eeafac7d80e7 Mon Sep 17 00:00:00 2001
From: mlwauben <m.l.wauben@student.tudelft.nl>
Date: Sat, 30 Mar 2019 11:29:39 +0100
Subject: [PATCH] DEBUG:: achievement things (tests all work now)

---
 .../main/java/greenify/server/AllAchievements.java    | 11 ++++++++---
 .../main/java/greenify/server/data/model/User.java    |  8 +++-----
 .../java/greenify/server/data/model/UserTest.java     |  4 +++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Server/src/main/java/greenify/server/AllAchievements.java b/src/Server/src/main/java/greenify/server/AllAchievements.java
index 66e86a4..25c6a8a 100644
--- a/src/Server/src/main/java/greenify/server/AllAchievements.java
+++ b/src/Server/src/main/java/greenify/server/AllAchievements.java
@@ -3,8 +3,9 @@ package greenify.server;
 import greenify.server.data.model.Achievement;
 
 import java.util.Arrays;
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class AllAchievements {
     private static final List<Achievement> allAchievements = Arrays.asList(
@@ -16,8 +17,12 @@ public class AllAchievements {
      * This method gets default achievements.
      * @return the list of default achievements
      */
-    public static List<Achievement> getDefaults() {
-        return new ArrayList<>(allAchievements);
+    public static Map<String, Boolean> getDefaults() {
+        Map<String, Boolean> all = new HashMap<>();
+        for (Achievement achievement : allAchievements) {
+            all.put(achievement.getName(), achievement.isAchieved());
+        }
+        return all;
     }
 
 }
diff --git a/src/Server/src/main/java/greenify/server/data/model/User.java b/src/Server/src/main/java/greenify/server/data/model/User.java
index ed6f56f..e31bb11 100644
--- a/src/Server/src/main/java/greenify/server/data/model/User.java
+++ b/src/Server/src/main/java/greenify/server/data/model/User.java
@@ -8,7 +8,6 @@ import lombok.Data;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -19,7 +18,6 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToMany;
-
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
@@ -50,7 +48,7 @@ public class User {
     private Collection<User> friends;
 
     @ElementCollection
-    private List<Achievement> achievements;
+    private Map<String, Boolean> achievements;
 
     public User() {}
 
@@ -182,7 +180,7 @@ public class User {
      * This method sets the achievements of the user.
      * @param achievements achievements of the user
      */
-    public void setAchievements(List<Achievement> achievements) {
+    public void setAchievements(Map<String, Boolean> achievements) {
         this.achievements = achievements;
     }
 
@@ -190,7 +188,7 @@ public class User {
      * This method gets the achievements of the user.
      * @return achievements of the user
      */
-    public List<Achievement> getAchievements() {
+    public Map<String, Boolean> getAchievements() {
         return this.achievements;
     }
 
diff --git a/src/Server/src/test/java/greenify/server/data/model/UserTest.java b/src/Server/src/test/java/greenify/server/data/model/UserTest.java
index aba33e2..ad47984 100644
--- a/src/Server/src/test/java/greenify/server/data/model/UserTest.java
+++ b/src/Server/src/test/java/greenify/server/data/model/UserTest.java
@@ -1,6 +1,8 @@
 package greenify.server.data.model;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import greenify.common.ApplicationException;