Finished recommendation system

src/main/java/com/example/clientproject/services/RecommendationGenerator.java

@@ -40,7 +40,7 @@ public class RecommendationGenerator {
         userStampBoardsRepo = usbr;
     }
 
-    public List<Shops> getRecommendations(HttpSession session) throws Exception {
+    public List<Shops> getRecommendations(HttpSession session, List<Shops> shopsToRecommend) throws Exception {
 
         Long userId = 1L;
         List<Tags> tags = new ArrayList<Tags>();
@@ -118,7 +118,7 @@ public class RecommendationGenerator {
         //Calculate weights for each shop, later do this based off a list of passed in shops
         //Ignore shops that have been starred or where the user has a stamp
         List<HashMap<Shops, Double>> weightedShops = new ArrayList<>();
-        for(Shops shop : shopsRepo.findAll()){
+        for(Shops shop : shopsToRecommend){
             //If the shop isn't starred or purchased from
             if(!purchasedFromShops.contains(shop.getShopId()) && !favoriteShops.contains(shop.getShopId())){
                 double weight = 0;

src/main/java/com/example/clientproject/web/controllers/HomeController.java

@@ -10,6 +10,7 @@ import com.example.clientproject.data.tags.TagsRepo;
 import com.example.clientproject.service.Utils.JWTUtils;
 import com.example.clientproject.service.searches.TagSearch;
 import com.example.clientproject.services.DashboardStampLoader;
+import com.example.clientproject.services.RecommendationGenerator;
 import com.example.clientproject.services.UserFavouriteDTO;
 import com.example.clientproject.services.UserFavouriteToggle;
 import com.example.clientproject.web.forms.UserFavouriteForm;
@@ -35,18 +36,21 @@ public class HomeController {
     private TagSearch tagsSearch;
     private TagsRepo tagsRepo;
     private DashboardStampLoader stampLoader;
+    private RecommendationGenerator recommendationGenerator;
 
     @Autowired
     public HomeController(ShopsRepo ashopsRepo,
                           UserFavouriteToggle uft, TagSearch aTagsSearch,
                           TagsRepo aTagsRepo, JWTUtils jwt,
-                          DashboardStampLoader aStampLoader) {
+                          DashboardStampLoader aStampLoader,
+                          RecommendationGenerator rg) {
         shopsRepo = ashopsRepo;
         toggleFavourite = uft;
         this.tagsSearch = aTagsSearch;
         this.tagsRepo = aTagsRepo;
         jwtUtils = jwt;
         stampLoader = aStampLoader;
+        recommendationGenerator = rg;
     }
 
     @GetMapping({"/", "dashboard"})
@@ -90,12 +94,10 @@ public class HomeController {
         model.addAttribute("allTags", Tags);
 
 
-
-
         model.addAttribute("favouriteShops", stampLoader.getData(userId).get("favourited"));
         model.addAttribute("activeShops",stampLoader.getData(userId).get("purchased"));
         model.addAttribute("loggedInUser", user.get());
-        model.addAttribute("normalShops", normalShops);
+        model.addAttribute("normalShops", recommendationGenerator.getRecommendations(session, normalShops));
         model.addAttribute("tags", new String[]{"Coffee", "Vegan", "Sustainable"});
         return "index";
     }

src/main/java/com/example/clientproject/web/restControllers/Recommendations.java

-package com.example.clientproject.web.restControllers;
-
-import com.example.clientproject.data.shops.Shops;
-import com.example.clientproject.data.tags.Tags;
-import com.example.clientproject.data.users.Users;
-import com.example.clientproject.exceptions.ForbiddenErrorException;
-import com.example.clientproject.service.Utils.JWTUtils;
-import com.example.clientproject.services.RecommendationGenerator;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpSession;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
-
-@RestController
-public class Recommendations {
-    public JWTUtils jwtUtils;
-    public RecommendationGenerator recommendationGenerator;
-
-    public Recommendations(JWTUtils jwt, RecommendationGenerator r){
-        jwtUtils = jwt;
-        recommendationGenerator = r;
-    }
-
-    @GetMapping("/recommend")
-    public String getRecommendationsForUser(HttpSession session){
-
-        try {
-            List<Shops> recommendations = recommendationGenerator.getRecommendations(session);
-            return recommendations.toString();
-        }catch (Exception e){
-            e.printStackTrace();
-            return "User Not Logged In";
-        }
-    }
-}