Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OpenClassrooms-Student-Center/JavaPathENProject8
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: leonardminot/JavaPathENProject8
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 10 commits
  • 11 files changed
  • 1 contributor

Commits on Mar 18, 2024

  1. Bugfix: User.Java - List<VisitedLocation>

    This list is updated continuously by the tracker and read by other services such as RewardsService, causing ConcurrentModificationException. This list is now :
    private List<VisitedLocation> visitedLocations = new CopyOnWriteArrayList<>();
    leonardminot committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    f44b28b View commit details
    Browse the repository at this point in the history
  2. add .gitignore file

    leonardminot committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    6fbae27 View commit details
    Browse the repository at this point in the history
  3. bugfix: User::addUserReward had an issue with the filter.

    Correction done:
    if(userRewards.stream()
    				.filter(ur -> ur.attraction.attractionName.equals(userReward.attraction.attractionName))
    				.toList().isEmpty())
    Now check thatthe list is empty and not the stream
    leonardminot committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    f3b98eb View commit details
    Browse the repository at this point in the history
  4. New Feature: getNearbyAttraction

    Implementation of TourGuideService::getNearByAttractions: all attraction locations are compared to user location. Return five closest attractions to user with given reward points.
    
    RewardsService::getRewardPoints is now a public method instead of private because used in TourGuideService::getNearByAttractions
    leonardminot committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    6091d24 View commit details
    Browse the repository at this point in the history
  5. Bugfix: in test, TestTourGuideService::getTripDeals, assertEquals set…

    … to 10 but the api return a list with a size of 5.
    leonardminot committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    bec91af View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. RewardsService::calculateRewards returns now CompletableFuture<void>

    Tests update to handle asynchronicity
    leonardminot committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    989273e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    db40e8b View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Minor update

    leonardminot committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    21bff36 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. TestRewardsService::nearAllAttractions : replacement of await() with …

    …a CompletableFuture .get() to improve quality of test
    leonardminot committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    ad035bb View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. TestRewardsService::nearAllAttractions : replacement of await() with …

    …a CompletableFuture .get() to improve quality of test
    leonardminot committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    5d4f331 View commit details
    Browse the repository at this point in the history
Loading