Skip to content

correction calculateRewards #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Djawad0 merged 1 commit into from
Jun 16, 2025
Merged

correction calculateRewards #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions TourGuide/src/main/java/com/openclassrooms/tourguide/service/RewardsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
package com.openclassrooms.tourguide.service;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService;
import java.util.stream.Collectors;

import org.springframework.stereotype.Service;

Expand Down Expand Up @@ -44,21 +49,16 @@ public CompletableFuture<Void> calculateRewardsAsync(User user, ExecutorService
}

public void calculateRewards(User user) {
List<VisitedLocation> userLocations = user.getVisitedLocations();
List<Attraction> attractions = gpsUtil.getAttractions();

for(int i = 0; i < userLocations.size(); i++) {
for(int j = 0; j < attractions.size(); j++) {
Attraction attraction = attractions.get(j);
VisitedLocation visitedLocation = userLocations.get(i);

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)));
}
}
}
}

for(VisitedLocation visitedLocation : new ArrayList<>(user.getVisitedLocations())) {
for(Attraction attraction : attractions) {
if(user.getUserRewards().stream().filter(r -> r.attraction.attractionName.equals(attraction.attractionName)).count() == 0
&& nearAttraction(visitedLocation, attraction)) {
user.addUserReward(new UserReward(visitedLocation, attraction, getRewardPoints(attraction, user)));
}
}
}
}

public boolean isWithinAttractionProximity(Attraction attraction, Location location) {
Expand Down