Feature/review unit tests

TourGuide/src/main/java/com/openclassrooms/tourguide/TourGuideController.java

@@ -1,6 +1,9 @@
 package com.openclassrooms.tourguide;
 
 import java.util.List;
+import java.util.stream.Collectors;
+import com.openclassrooms.tourguide.dto.NearbyAttractionDTO;
+import com.openclassrooms.tourguide.dto.NearbyAttractionsResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,9 +45,31 @@ public VisitedLocation getLocation(@RequestParam String userName) {
         // The reward points for visiting each Attraction.
         //    Note: Attraction reward points can be gathered from RewardsCentral
     @RequestMapping("/getNearbyAttractions") 
-    public List<Attraction> getNearbyAttractions(@RequestParam String userName) {
-    	VisitedLocation visitedLocation = tourGuideService.getUserLocation(getUser(userName));
-    	return tourGuideService.getNearByAttractions(visitedLocation);
+    public NearbyAttractionsResponse getNearbyAttractions(@RequestParam String userName) {
+        User user = getUser(userName);
+        VisitedLocation visitedLocation = tourGuideService.getUserLocation(user);
+
+        // On récupère les 5 attractions les plus proches (classement existant)
+        List<Attraction> closestFive = tourGuideService.getNearByAttractions(visitedLocation);
+
+        List<NearbyAttractionDTO> dtoList = closestFive.stream()
+                .map(attraction -> new NearbyAttractionDTO(
+                        attraction.attractionName,
+                        attraction.latitude,
+                        attraction.longitude,
+                        visitedLocation.location.latitude,
+                        visitedLocation.location.longitude,
+                        tourGuideService.getDistance(attraction, visitedLocation.location),
+                        tourGuideService.getRewardPoints(attraction, user)
+                ))
+                .collect(Collectors.toList());
+
+        return new NearbyAttractionsResponse(
+                user.getUserName(),
+                visitedLocation.location.latitude,
+                visitedLocation.location.longitude,
+                dtoList
+        );
     }
 
     @RequestMapping("/getRewards") 

TourGuide/src/main/java/com/openclassrooms/tourguide/dto/NearbyAttractionDTO.java

@@ -0,0 +1,35 @@
+package com.openclassrooms.tourguide.dto;
+
+public class NearbyAttractionDTO {
+    private String attractionName;
+    private double attractionLatitude;
+    private double attractionLongitude;
+    private double userLatitude;
+    private double userLongitude;
+    private double distanceInMiles;
+    private int rewardPoints;
+
+    public NearbyAttractionDTO(String attractionName,
+                               double attractionLatitude,
+                               double attractionLongitude,
+                               double userLatitude,
+                               double userLongitude,
+                               double distanceInMiles,
+                               int rewardPoints) {
+        this.attractionName = attractionName;
+        this.attractionLatitude = attractionLatitude;
+        this.attractionLongitude = attractionLongitude;
+        this.userLatitude = userLatitude;
+        this.userLongitude = userLongitude;
+        this.distanceInMiles = distanceInMiles;
+        this.rewardPoints = rewardPoints;
+    }
+
+    public String getAttractionName() { return attractionName; }
+    public double getAttractionLatitude() { return attractionLatitude; }
+    public double getAttractionLongitude() { return attractionLongitude; }
+    public double getUserLatitude() { return userLatitude; }
+    public double getUserLongitude() { return userLongitude; }
+    public double getDistanceMiles() { return distanceInMiles; }
+    public int getRewardPoints() { return rewardPoints; }
+}

TourGuide/src/main/java/com/openclassrooms/tourguide/dto/NearbyAttractionsResponse.java

@@ -0,0 +1,25 @@
+package com.openclassrooms.tourguide.dto;
+
+import java.util.List;
+
+public class NearbyAttractionsResponse {
+    private String userName;
+    private double userLatitude;
+    private double userLongitude;
+    private List<NearbyAttractionDTO> attractions;
+
+    public NearbyAttractionsResponse(String userName,
+                                     double userLatitude,
+                                     double userLongitude,
+                                     List<NearbyAttractionDTO> attractions) {
+        this.userName = userName;
+        this.userLatitude = userLatitude;
+        this.userLongitude = userLongitude;
+        this.attractions = attractions;
+    }
+
+    public String getUserName() { return userName; }
+    public double getUserLatitude() { return userLatitude; }
+    public double getUserLongitude() { return userLongitude; }
+    public List<NearbyAttractionDTO> getAttractions() { return attractions; }
+}