From ccbe5968da7542edbcd97791953a609aad1cf983 Mon Sep 17 00:00:00 2001
From: Merel Steenbergen <m.a.steenbergen@student.tudelft.nl>
Date: Fri, 5 Apr 2019 20:21:42 +0200
Subject: [PATCH] EDIT::Finding bugs in tests and try to fix them

---
 .../server/service/AchievementService.java     | 10 ++++++----
 .../greenify/server/service/UserService.java   | 18 ++++++++----------
 .../server/service/AchievementServiceTest.java |  4 +++-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/Server/src/main/java/greenify/server/service/AchievementService.java b/src/Server/src/main/java/greenify/server/service/AchievementService.java
index aee6918..a23618a 100644
--- a/src/Server/src/main/java/greenify/server/service/AchievementService.java
+++ b/src/Server/src/main/java/greenify/server/service/AchievementService.java
@@ -13,8 +13,8 @@ public class AchievementService {
     @Autowired
     UserService userService;
 
-    @Autowired
-    UserRepository userRepository;
+//    @Autowired
+//    UserRepository userRepository;
 
     private Logger logger = LoggerFactory.getLogger(UserService.class);
 
@@ -24,7 +24,8 @@ public class AchievementService {
      */
     public void updateAchievements(User user) {
         achieveGettingStarted(user);
-        userRepository.save(user);
+        System.out.println("\n\nI GOT HERE \n\n");
+//        userRepository.save(user);
     }
 
     /**
@@ -32,9 +33,10 @@ public class AchievementService {
      * @param user user for whom achiev1 changes
      */
     public void achieveGettingStarted(User user) {
+//        System.out.print("\n\nUSERNAME:" + userRepository.findByName(user.getName()) );
         if (!user.getFootPrintInputs().equals(InputValidator.getDefaultValues())) {
             userService.setAchievement(user.getName(), "Starting off", true);
-            userRepository.save(user);
+//            userRepository.save(user);
         }
     }
 
diff --git a/src/Server/src/main/java/greenify/server/service/UserService.java b/src/Server/src/main/java/greenify/server/service/UserService.java
index 29a6b55..0f0394a 100644
--- a/src/Server/src/main/java/greenify/server/service/UserService.java
+++ b/src/Server/src/main/java/greenify/server/service/UserService.java
@@ -114,8 +114,8 @@ public class UserService {
             if (InputValidator.isValidItem(inputName)
                     && InputValidator.isValidItemValue(inputName, value)) {
                 user.getFootPrintInputs().put(inputName, value);
-                userRepository.save(user);
                 achievementService.updateAchievements(user);
+                userRepository.save(user);
             } else {
                 throw new ApplicationException("Invalid input");
             }
@@ -242,16 +242,14 @@ public class UserService {
         User user = userRepository.findByName(name);
         if (user == null) {
             throw new ApplicationException("User does not exist");
-        } else {
-            if (AllAchievements.isValidAchievement(achievement)) {
-                Map<String, Boolean> temp = user.getAchievements();
-                temp.put(achievement, achieved);
-                user.setAchievements(temp);
-                userRepository.save(user);
-            } else {
-                throw new ApplicationException("Invalid achievement");
-            }
         }
+        if (!AllAchievements.isValidAchievement(achievement)) {
+            throw new ApplicationException("Invalid achievement");
+        }
+        Map<String, Boolean> temp = user.getAchievements();
+        temp.put(achievement, achieved);
+        user.setAchievements(temp);
+        userRepository.save(user);
     }
 
     /**
diff --git a/src/Server/src/test/java/greenify/server/service/AchievementServiceTest.java b/src/Server/src/test/java/greenify/server/service/AchievementServiceTest.java
index 5a8b9ec..e9da1ce 100644
--- a/src/Server/src/test/java/greenify/server/service/AchievementServiceTest.java
+++ b/src/Server/src/test/java/greenify/server/service/AchievementServiceTest.java
@@ -6,6 +6,7 @@ import static org.mockito.Mockito.when;
 import greenify.server.InputValidator;
 import greenify.server.data.model.User;
 import greenify.server.data.repository.UserRepository;
+import jdk.internal.util.xml.impl.Input;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -54,7 +55,8 @@ public class AchievementServiceTest {
     public void updateAchievementsTest() {
         User alex = userRepository.findByName("alex");
         userService.setInput("alex","input_footprint_shopping_food_otherfood", "9.9");
-        achievementService.updateAchievements(alex);
+//        achievementService.updateAchievements(alex);
+        //Shouldn't even have to call updateAchievements, since it's called in setInput.
 //        userService.setAchievement(alex.getName(), "Starting off", true);
         // ^should not be here, does not work otherwise and I don't know why
         System.out.println("\n\n"+ alex.getAchievements() + "\n\n" + alex.getFootPrintInputs().equals(InputValidator.getDefaultValues()));