test1

.github/workflows/ci.yml

@@ -0,0 +1,38 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '17'
+
+      - name: Install local dependencies
+        run: |
+          mvn install:install-file "-Dfile=libs/gpsUtil.jar" "-DgroupId=gpsUtil" "-DartifactId=gpsUtil" "-Dversion=1.0.0" "-Dpackaging=jar"
+          mvn install:install-file "-Dfile=libs/RewardCentral.jar" "-DgroupId=rewardCentral" "-DartifactId=rewardCentral" "-Dversion=1.0.0" "-Dpackaging=jar"
+          mvn install:install-file "-Dfile=libs/TripPricer.jar" "-DgroupId=tripPricer" "-DartifactId=tripPricer" "-Dversion=1.0.0" "-Dpackaging=jar"
+
+      - name: Build with Maven
+        run: mvn -B package
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: my-artifacts
+          path: target/

.gitignore

@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

TourGuide/.github/workflows/ci.yml

@@ -0,0 +1,38 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '17'
+
+      - name: Install local dependencies
+        run: |
+          mvn install:install-file "-Dfile=libs/gpsUtil.jar" "-DgroupId=gpsUtil" "-DartifactId=gpsUtil" "-Dversion=1.0.0" "-Dpackaging=jar"
+          mvn install:install-file "-Dfile=libs/RewardCentral.jar" "-DgroupId=rewardCentral" "-DartifactId=rewardCentral" "-Dversion=1.0.0" "-Dpackaging=jar"
+          mvn install:install-file "-Dfile=libs/TripPricer.jar" "-DgroupId=tripPricer" "-DartifactId=tripPricer" "-Dversion=1.0.0" "-Dpackaging=jar"
+
+      - name: Build with Maven
+        run: mvn -B package
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: my-artifacts
+          path: target/

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

@@ -1,19 +1,17 @@
 package com.openclassrooms.tourguide;
 
 import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-
 import gpsUtil.location.Attraction;
 import gpsUtil.location.VisitedLocation;
 
+import com.openclassrooms.tourguide.dto.AttractionInfo;
 import com.openclassrooms.tourguide.service.TourGuideService;
 import com.openclassrooms.tourguide.user.User;
 import com.openclassrooms.tourguide.user.UserReward;
-
 import tripPricer.Provider;
 
 @RestController
@@ -41,11 +39,20 @@ public VisitedLocation getLocation(@RequestParam String userName) {
         // The distance in miles between the user's location and each of the attractions.
         // 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);
     }
+    */
+
+    @RequestMapping("/getNearbyAttractions") 
+    public List<AttractionInfo> getNearbyAttractions(@RequestParam String userName) {
+    	VisitedLocation visitedLocation = tourGuideService.getUserLocation(getUser(userName));
+    	return tourGuideService.getNearByAttractions(visitedLocation, getUser(userName));
+    }
 
     @RequestMapping("/getRewards") 
     public List<UserReward> getRewards(@RequestParam String userName) {
@@ -60,6 +67,4 @@ public List<Provider> getTripDeals(@RequestParam String userName) {
     private User getUser(String userName) {
     	return tourGuideService.getUser(userName);
     }
-
-
-}
+}

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

@@ -0,0 +1,78 @@
+package com.openclassrooms.tourguide.dto;
+
+public class AttractionInfo {
+    private String name;
+    private double attractionLatitude;
+    private double attractionLongitude;
+    private double userLatitude;
+    private double userLongitude;
+    private double distance;
+    private int rewardPoints;
+
+    public AttractionInfo(String name, double attractionLatitude, double attractionLongitude,
+                          double userLatitude, double userLongitude, double distance, int rewardPoints) {
+        this.name = name;
+        this.attractionLatitude = attractionLatitude;
+        this.attractionLongitude = attractionLongitude;
+        this.userLatitude = userLatitude;
+        this.userLongitude = userLongitude;
+        this.distance = distance;
+        this.rewardPoints = rewardPoints;
+    }
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public double getAttractionLatitude() {
+		return attractionLatitude;
+	}
+
+	public void setAttractionLatitude(double attractionLatitude) {
+		this.attractionLatitude = attractionLatitude;
+	}
+
+	public double getAttractionLongitude() {
+		return attractionLongitude;
+	}
+
+	public void setAttractionLongitude(double attractionLongitude) {
+		this.attractionLongitude = attractionLongitude;
+	}
+
+	public double getUserLatitude() {
+		return userLatitude;
+	}
+
+	public void setUserLatitude(double userLatitude) {
+		this.userLatitude = userLatitude;
+	}
+
+	public double getUserLongitude() {
+		return userLongitude;
+	}
+
+	public void setUserLongitude(double userLongitude) {
+		this.userLongitude = userLongitude;
+	}
+
+	public double getDistance() {
+		return distance;
+	}
+
+	public void setDistance(double distance) {
+		this.distance = distance;
+	}
+
+	public int getRewardPoints() {
+		return rewardPoints;
+	}
+
+	public void setRewardPoints(int rewardPoints) {
+		this.rewardPoints = rewardPoints;
+	}
+}

TourGuide/src/main/java/com/openclassrooms/tourguide/service/RewardsService.java

@@ -1,16 +1,20 @@
 package com.openclassrooms.tourguide.service;
 
+import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
 
+import org.springframework.stereotype.Service;
 import gpsUtil.GpsUtil;
 import gpsUtil.location.Attraction;
 import gpsUtil.location.Location;
 import gpsUtil.location.VisitedLocation;
 import rewardCentral.RewardCentral;
 import com.openclassrooms.tourguide.user.User;
 import com.openclassrooms.tourguide.user.UserReward;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 @Service
 public class RewardsService {
@@ -23,6 +27,13 @@ public class RewardsService {
 	private final GpsUtil gpsUtil;
 	private final RewardCentral rewardsCentral;
 
+	private static final int THREAD_POOL_SIZE = 50;
+
+
+	public static int getThreadPoolSize() {
+		return THREAD_POOL_SIZE;
+	}
+
 	public RewardsService(GpsUtil gpsUtil, RewardCentral rewardCentral) {
 		this.gpsUtil = gpsUtil;
 		this.rewardsCentral = rewardCentral;
@@ -36,21 +47,94 @@ public void setDefaultProximityBuffer() {
 		proximityBuffer = defaultProximityBuffer;
 	}
 
+
+	// parcourir la liste des emplacements visités par l'utilisateur (userLocations) 
+	// et des attractions, tout en modifiant la liste des récompenses de l'utilisateur (user.getUserRewards())
+	// vous modifiez la liste user.getUserRewards() en ajoutant des éléments à l'intérieur de la boucle	\
+
+	/*
 	public void calculateRewards(User user) {
-		List<VisitedLocation> userLocations = user.getVisitedLocations();
+		// List<VisitedLocation> userLocations = user.getVisitedLocations();
+		List<VisitedLocation> userLocations = new ArrayList<>(user.getVisitedLocations());
 		List<Attraction> attractions = gpsUtil.getAttractions();
 
-		for(VisitedLocation visitedLocation : userLocations) {
-			for(Attraction attraction : attractions) {
-				if(user.getUserRewards().stream().filter(r -> r.attraction.attractionName.equals(attraction.attractionName)).count() == 0) {
-					if(nearAttraction(visitedLocation, attraction)) {
-						user.addUserReward(new UserReward(visitedLocation, attraction, getRewardPoints(attraction, user)));
+		List<UserReward> newRewards = new ArrayList<UserReward>();
+		for (VisitedLocation visitedLocation : userLocations) {
+
+			for (Attraction attraction : attractions) {
+			//if (user.getUserRewards().stream().filter(r -> r.attraction.attractionName.equals(attraction.attractionName)).count() == 0) {
+				if (newRewards.stream().filter(r -> r.attraction.attractionName.equals(attraction.attractionName)).count() == 0) {
+					if (nearAttraction(visitedLocation, attraction)) {
+						// user.addUserReward(new UserReward(visitedLocation, attraction, getRewardPoints(attraction, user)));
+						newRewards.add(new UserReward(visitedLocation, attraction, getRewardPoints(attraction, user)));
 					}
 				}
 			}
-		}
+		}	
+		user.setUserRewards(newRewards);
+	}
+
+
+	*/
+	public void calculateRewards(User user) {
+	    List<VisitedLocation> userLocations = new ArrayList<>(user.getVisitedLocations());
+	    List<Attraction> attractions = gpsUtil.getAttractions();
+
+	    List<UserReward> newRewards = new ArrayList<>();
+
+	    userLocations.stream()
+	        // Applique une fonction à chaque élément du flux (chaque VisitedLocation), produisant un flux interne
+	        // pour chaque VisitedLocation. Le flux interne est créé à partir des attractions
+	        // qui sont proches de la VisitedLocation actuelle
+	        .flatMap(visitedLocation ->
+	            attractions.stream()
+	                .filter(attraction -> nearAttraction(visitedLocation, attraction))
+	                .filter(attraction -> newRewards.stream()
+	                		// si aucun élément du flux newRewards correspond à l'attraction actuelle
+	                        .noneMatch(r -> r.attraction.attractionName.equals(attraction.attractionName)))
+	                // Transforme chaque attraction filtrée en un objet UserReward
+	                .map(attraction -> new UserReward(visitedLocation, attraction, getRewardPoints(attraction, user)))
+	        )
+	        // Ajoute chaque UserReward résultant à la liste newRewards
+	        .forEach(newRewards::add);
+
+	    user.setUserRewards(newRewards);
 	}
+
+
+
+	// Un pool de 50 threads est créé.
+	// Ensuite, une tâche est soumise à ce pool pour chaque utilisateur dans la liste users. 
+	// Ces tâches sont exécutées en parallèle, avec un maximum de 50 tâches simultanées 
+	// à un moment donné, grâce au pool de threads
 
+	public void calculateRewardsAsync(List<User> users) {
+        // Créez un ExecutorService avec le nombre souhaité de threads
+        ExecutorService executorService = Executors.newFixedThreadPool(THREAD_POOL_SIZE);
+
+        // Créez un CountDownLatch avec un compte égal au nombre d'utilisateurs
+        CountDownLatch countDownLatch = new CountDownLatch(users.size());
+
+        // Soumettez des tâches pour chaque utilisateur
+        for (User user : users) {
+            executorService.submit(() -> {
+            //	System.out.println(user.getEmailAddress()+" performed by "+ Thread.currentThread().getName()); 
+                calculateRewards(user);
+                countDownLatch.countDown(); // Diminuez le compte lorsque la tâche est terminée
+            });
+        }
+
+        // Attendez que toutes les tâches soient terminées (besoin du test)
+        try {
+            countDownLatch.await(); // Cela attend indéfiniment jusqu'à ce que toutes les tâches soient terminées
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        // Arrêtez l'ExecutorService
+        executorService.shutdown();
+    }
+
 	public boolean isWithinAttractionProximity(Attraction attraction, Location location) {
 		return getDistance(attraction, location) > attractionProximityRange ? false : true;
 	}
@@ -59,7 +143,7 @@ private boolean nearAttraction(VisitedLocation visitedLocation, Attraction attra
 		return getDistance(attraction, visitedLocation.location) > proximityBuffer ? false : true;
 	}
 
-	private int getRewardPoints(Attraction attraction, User user) {
+	public int getRewardPoints(Attraction attraction, User user) {
 		return rewardsCentral.getAttractionRewardPoints(attraction.attractionId, user.getUserId());
 	}
 
@@ -76,5 +160,4 @@ public double getDistance(Location loc1, Location loc2) {
         double statuteMiles = STATUTE_MILES_PER_NAUTICAL_MILE * nauticalMiles;
         return statuteMiles;
 	}
-
 }