From dcb8404ae73ce26c79cbdcc8845c36938316064d Mon Sep 17 00:00:00 2001 From: Merel Steenbergen Date: Fri, 5 Apr 2019 20:37:54 +0200 Subject: [PATCH] ADD::Method for achievement social butterfly --- .../server/service/AchievementService.java | 22 ++++++++++++------- .../service/AchievementServiceTest.java | 2 ++ 2 files changed, 16 insertions(+), 8 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 a23618a..33824cc 100644 --- a/src/Server/src/main/java/greenify/server/service/AchievementService.java +++ b/src/Server/src/main/java/greenify/server/service/AchievementService.java @@ -13,9 +13,6 @@ public class AchievementService { @Autowired UserService userService; -// @Autowired -// UserRepository userRepository; - private Logger logger = LoggerFactory.getLogger(UserService.class); /** @@ -24,19 +21,28 @@ public class AchievementService { */ public void updateAchievements(User user) { achieveGettingStarted(user); - System.out.println("\n\nI GOT HERE \n\n"); -// userRepository.save(user); + achieveSocialButterfly(user); } /** - * This method changes achiev1 when this is the case. + * This method makes sure the user gets an achievement + * upon calculating their footprint for the first time. * @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); + } + } + + /** + * This method makes sure the user gets an achievement + * when they have added three friends. + * @param user user for whom achiev2 changes + */ + public void achieveSocialButterfly(User user) { + if (user.getFriends().size() == 3) { + userService.setAchievement(user.getName(), "Social butterfly", true); } } 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 3126db1..cb89366 100644 --- a/src/Server/src/test/java/greenify/server/service/AchievementServiceTest.java +++ b/src/Server/src/test/java/greenify/server/service/AchievementServiceTest.java @@ -69,5 +69,7 @@ public class AchievementServiceTest { User alex = userRepository.findByName("alex"); achievementService.achieveGettingStarted(alex); assertEquals(true, userService.getAchievement("alex", "Starting off")); + assertEquals(false, userService.getAchievement("alex", "Social butterfly")); + } }