Changed RouteOrigin to Follows and changed type back to Route instead…

… of String
UdL-EPS-SoftArch · Dec 21, 2023 · cd42bc5 · cd42bc5
1 parent 8220865
commit cd42bc5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/cat/udl/eps/softarch/myroutes/domain/RouteFollowed.java b/src/main/java/cat/udl/eps/softarch/myroutes/domain/RouteFollowed.java
@@ -40,6 +40,7 @@ public class RouteFollowed extends UriEntity<Long> {
 
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     @NotNull
-    public String follows;
+    @ManyToOne
+    public Route follows;
 
 }
diff --git a/src/main/java/cat/udl/eps/softarch/myroutes/handler/RouteFollowedEventHandler.java b/src/main/java/cat/udl/eps/softarch/myroutes/handler/RouteFollowedEventHandler.java
@@ -32,7 +32,7 @@ public void handleRouteFollowedPreCreate(RouteFollowed routeFollowed) {
         routeFollowed.setCreatedBy(user);
         List<Route> routeList = routeRepository.findByCreatedBy(user);
         if(!routeList.isEmpty())
-            routeFollowed.setFollows(routeList.get(0).getUri());
+            routeFollowed.setFollows(routeList.get(0));
         routeFollowed.setDate(ZonedDateTime.now());
         logger.info("Creation of new routeFollowed: {}", routeFollowed);
     }

diff --git a/src/main/java/cat/udl/eps/softarch/myroutes/repository/RouteFollowedRepository.java b/src/main/java/cat/udl/eps/softarch/myroutes/repository/RouteFollowedRepository.java
@@ -1,5 +1,6 @@
 package cat.udl.eps.softarch.myroutes.repository;
 
+import cat.udl.eps.softarch.myroutes.domain.Route;
 import cat.udl.eps.softarch.myroutes.domain.RouteFollowed;
 import cat.udl.eps.softarch.myroutes.domain.User;
 import org.springframework.data.repository.CrudRepository;
@@ -11,6 +12,6 @@
 public interface RouteFollowedRepository extends CrudRepository<RouteFollowed, Long>, PagingAndSortingRepository<RouteFollowed, Long> {
     List<RouteFollowed> findByIdContaining(@Param("long") Long id);
     List<String> findByCreatedBy(@Param("creator") User creator);
-    List<User> findByFollows(@Param("follows") String follows);
-    List<RouteFollowed> findByCreatedByAndFollows(@Param("creator") User creator, @Param("follows") String follows);
+    List<User> findByFollows(@Param("follows") Route follows);
+    List<RouteFollowed> findByCreatedByAndFollows(@Param("creator") User creator, @Param("follows") Route follows);
 }
diff --git a/src/test/java/cat/udl/eps/softarch/myroutes/steps/CreateRouteFollowedStepdefs.java b/src/test/java/cat/udl/eps/softarch/myroutes/steps/CreateRouteFollowedStepdefs.java
@@ -38,7 +38,7 @@ public void iCreateARouteFollowedWithDateDurationLevelUpAndALevelDown(String dat
         Iterable<User> usersList = userRepository.findAll();
         Route route = routesList.iterator().next();
         User user = usersList.iterator().next();
-        routeFollowed.setFollows(route.getUri());
+        routeFollowed.setFollows(route);
         routeFollowed.setCreatedBy(user);
         stepDefs.result = stepDefs.mockMvc.perform(
                         post("/routeFolloweds")
@@ -59,7 +59,7 @@ public void iDonTHaveAnyRouteFollowed() {
     public void thereIsARouteFollowedWithDateDurationLevelUpAndALevelDownByUserUsernameAndRouteTitle(String date, String duration, String levelUp, String levelDown, String user, String route) {
         RouteFollowed routeFollowed = RouteFollowedUtil.buildRoute(date,duration,levelUp,levelDown);
         routeFollowed.setCreatedBy(userRepository.findById(user).get());
-        routeFollowed.setFollows(routeRepository.findByTitle(route).get(0).getUri());
+        routeFollowed.setFollows(routeRepository.findByTitle(route).get(0));
         routeFollowedRepository.save(routeFollowed);
     }
 }
diff --git a/src/test/java/cat/udl/eps/softarch/myroutes/steps/RouteFollowedUtil.java b/src/test/java/cat/udl/eps/softarch/myroutes/steps/RouteFollowedUtil.java
@@ -40,7 +40,7 @@ public static RouteFollowed getRouteFollowed(RouteFollowedRepository rfRepo, Lon
 
 
     public static RouteFollowed getRouteFollowed(RouteFollowedRepository rfRepo, Route route, User user){
-        List<RouteFollowed> routeFollowedList = rfRepo.findByCreatedByAndFollows(user, route.getUri());
+        List<RouteFollowed> routeFollowedList = rfRepo.findByCreatedByAndFollows(user, route);
         if(routeFollowedList.isEmpty())
             return new RouteFollowed();
         return routeFollowedList.get(0);