Merge branch 'race_extended_functionality' into 'milestone_2'

Race extended functionality

See merge request !41

race/pom.xml

@@ -32,24 +32,6 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>fi.muni</groupId>
-            <artifactId>car</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>fi.muni</groupId>
-            <artifactId>driver</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>fi.muni</groupId>
-            <artifactId>component</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

race/src/main/java/cz/muni/pa165/race/App.java

 package cz.muni.pa165.race;
 
-import cz.muni.pa165.car.data.model.Car;
+
 import cz.muni.pa165.common_library.client.ClientConfig;
 import cz.muni.pa165.common_library.exception.RestExceptionHandler;
-import cz.muni.pa165.component.data.model.CarComponent;
-import cz.muni.pa165.driver.data.model.Driver;
 import cz.muni.pa165.race.data.model.Race;
 import cz.muni.pa165.race.data.model.Season;
 import org.springframework.boot.SpringApplication;
@@ -20,8 +18,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 @EnableJpaRepositories(basePackages = "cz.muni.pa165.race.data.repository")
 @EnableTransactionManagement
-@EntityScan(basePackageClasses = {Race.class, Season.class, Car.class, Driver.class,
-    CarComponent.class})
+@EntityScan(basePackageClasses = {Race.class, Season.class})
 @Import({RestExceptionHandler.class, ClientConfig.class})
 public class App {
 

race/src/main/java/cz/muni/pa165/race/data/model/Race.java

 package cz.muni.pa165.race.data.model;
 
-import cz.muni.pa165.car.data.model.Car;
 import cz.muni.pa165.common_library.dtos.Location;
-import cz.muni.pa165.driver.data.model.Driver;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.Max;

race/src/main/java/cz/muni/pa165/race/data/repository/CarRepository.java

-package cz.muni.pa165.race.data.repository;
-
-import cz.muni.pa165.car.data.model.Car;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * Repository for car.
- */
-@Repository
-public interface CarRepository extends JpaRepository<Car, Long> {
-
-}

race/src/main/java/cz/muni/pa165/race/data/repository/DriverRepository.java

-package cz.muni.pa165.race.data.repository;
-
-
-import cz.muni.pa165.driver.data.model.Driver;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * Driver repository.
- */
-@Repository
-public interface DriverRepository extends JpaRepository<Driver, Long> {
-}

race/src/main/java/cz/muni/pa165/race/data/repository/RaceRepository.java

@@ -21,4 +21,9 @@ public interface RaceRepository extends JpaRepository<Race, Long> {
       + "WHERE ri.location = :location AND (do.id = :driverId OR dt.id = :driverId)")
   List<Race> findAllRacesOfDriverInLocation(@Param("location") Location raceLocation,
                                            @Param("driverId") long driverId);
+
+  @Query("SELECT r FROM Race r"
+      + " JOIN r.raceInfo ri "
+      + "WHERE ri.location = :location")
+  List<Race> findRacesByLocation(@Param("location") Location raceLocation);
 }

race/src/main/java/cz/muni/pa165/race/rest/RaceController.java

 package cz.muni.pa165.race.rest;
 
 
+import cz.muni.pa165.common_library.dtos.Location;
 import cz.muni.pa165.common_library.dtos.RaceDto;
-import cz.muni.pa165.race.service.RaceService;
+import cz.muni.pa165.race.service.RaceServiceI;
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.validation.Valid;
 import java.util.List;
+import java.util.Set;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -26,9 +28,9 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 public class RaceController {
 
-  RaceService raceService;
+  RaceServiceI raceService;
 
-  public RaceController(RaceService raceService) {
+  public RaceController(RaceServiceI raceService) {
     this.raceService = raceService;
   }
 
@@ -64,8 +66,8 @@ public class RaceController {
   @PatchMapping(path = "/assignDriverOne",
       produces = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<RaceDto> assignDriverOne(@RequestParam Long driverOneId,
-                                                @RequestParam Long raceId,
-                                                @RequestParam Long carId) {
+                                                 @RequestParam Long raceId,
+                                                 @RequestParam Long carId) {
     return ResponseEntity.ok(raceService.assignDriverOne(driverOneId, raceId, carId));
   }
 
@@ -73,8 +75,31 @@ public class RaceController {
   @PatchMapping(path = "/assignDriverTwo",
       produces = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<RaceDto> assignDriverTwo(@RequestParam Long driverTwoId,
-                                                @RequestParam Long raceId,
-                                                @RequestParam Long carId) {
+                                                 @RequestParam Long raceId,
+                                                 @RequestParam Long carId) {
     return ResponseEntity.ok(raceService.assignDriverTwo(driverTwoId, raceId, carId));
   }
+
+  @Operation(summary = "Assign position for driver two")
+  @PatchMapping(path = "/assignPointsDriverTwo",
+      produces = MediaType.APPLICATION_JSON_VALUE)
+  public ResponseEntity<RaceDto> assignPositionDriverTwo(@RequestParam Long raceId,
+                                                         @RequestParam Integer position) {
+    return ResponseEntity.ok(raceService.assignPositionForDriverTwo(raceId, position));
+  }
+
+  @Operation(summary = "Assign position for driver two")
+  @PatchMapping(path = "/assignPointsDriverOne",
+      produces = MediaType.APPLICATION_JSON_VALUE)
+  public ResponseEntity<RaceDto> assignPositionDriverOne(@RequestParam Long raceId,
+                                                         @RequestParam Integer position) {
+    return ResponseEntity.ok(raceService.assignPositionForDriverOne(raceId, position));
+  }
+
+  @Operation(summary = "get races")
+  @GetMapping(path = "/findMostSuitableDriversForLocation")
+  public ResponseEntity<Set<Long>> getMostSuitableDriversForLocation(
+      @RequestParam Location location) {
+    return ResponseEntity.ok(raceService.findMostSuitableDriver(location));
+  }
 }

race/src/main/java/cz/muni/pa165/race/rest/SeasonController.java

 package cz.muni.pa165.race.rest;
 
 import cz.muni.pa165.common_library.dtos.SeasonDto;
-import cz.muni.pa165.race.service.SeasonServiceInterface;
+import cz.muni.pa165.race.service.SeasonServiceI;
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.validation.Valid;
 import java.util.List;
@@ -25,9 +25,9 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 public class SeasonController {
 
-  SeasonServiceInterface seasonService;
+  SeasonServiceI seasonService;
 
-  public SeasonController(SeasonServiceInterface seasonService) {
+  public SeasonController(SeasonServiceI seasonService) {
     this.seasonService = seasonService;
   }
 

race/src/main/java/cz/muni/pa165/race/service/PointsUtil.java

+package cz.muni.pa165.race.service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Utility for points per position.
+ */
+public class PointsUtil {
+
+  /**
+   * Map with position and corresponding points.
+   */
+  public Map<Integer, Integer> points;
+
+  /**
+   * Constructor.
+   */
+  public PointsUtil() {
+    points = new HashMap<>();
+    points.put(1, 25);
+    points.put(2, 18);
+    points.put(3, 15);
+    points.put(4, 12);
+    points.put(5, 10);
+    points.put(6, 8);
+    points.put(7, 6);
+    points.put(8, 4);
+    points.put(9, 2);
+    points.put(10, 1);
+  }
+}

race/src/main/java/cz/muni/pa165/race/service/RaceService.java

 package cz.muni.pa165.race.service;
 
-import cz.muni.pa165.car.data.model.Car;
+import cz.muni.pa165.common_library.dtos.CarResponseDto;
+import cz.muni.pa165.common_library.dtos.DriverDto;
+import cz.muni.pa165.common_library.dtos.Location;
 import cz.muni.pa165.common_library.dtos.RaceDriverCarDto;
 import cz.muni.pa165.common_library.dtos.RaceDto;
 import cz.muni.pa165.common_library.exception.BadRequestException;
 import cz.muni.pa165.common_library.exception.DatabaseException;
-import cz.muni.pa165.driver.data.model.Driver;
 import cz.muni.pa165.race.data.model.Race;
-import cz.muni.pa165.race.data.repository.CarRepository;
-import cz.muni.pa165.race.data.repository.DriverRepository;
 import cz.muni.pa165.race.data.repository.RaceRepository;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
@@ -21,20 +25,17 @@ import org.springframework.web.client.RestTemplate;
  */
 // TODO chybnú hlášku spraviť konštantu
 @Service
-public class RaceService {
+public class RaceService implements RaceServiceI {
+
+  PointsUtil pointsUtil = new PointsUtil();
 
   RaceRepository raceRepository;
-  CarRepository carRepository;
-  DriverRepository driverRepository;
 
   @Autowired
   RestTemplate client;
 
-  RaceService(RaceRepository raceRepository, CarRepository carRepository,
-              DriverRepository driverRepository) {
+  RaceService(RaceRepository raceRepository) {
     this.raceRepository = raceRepository;
-    this.carRepository = carRepository;
-    this.driverRepository = driverRepository;
   }
 
   /**
@@ -97,7 +98,8 @@ public class RaceService {
 
     race.getDriver2().setDriverId(driver.getId());
     race.getDriver2().setCarId(car.getId());
-    return convertRace(raceRepository.save(race));
+    var a = convertRace(raceRepository.save(race));
+    return a;
   }
 
   /**
@@ -121,6 +123,75 @@ public class RaceService {
     return raceRepository.findAll().stream().map(this::convertRace).toList();
   }
 
+  /**
+   * Assigns positions for driver number two.
+   *
+   * @param raceId race id.
+   * @param position position of driver two.
+   * @return updated race.
+   */
+  public RaceDto assignPositionForDriverTwo(Long raceId, Integer position) {
+    var race =
+        raceRepository.findById(raceId).orElseThrow(() -> new DatabaseException("Race not found"));
+    race.getDriver2().setFinalPosition(position);
+    return convertRace(raceRepository.save(race));
+  }
+
+  /**
+   * Assigns positions for driver number one.
+   *
+   * @param raceId race id.
+   * @param position position of driver one.
+   * @return updated race.
+   */
+  public RaceDto assignPositionForDriverOne(Long raceId, Integer position) {
+    var race =
+        raceRepository.findById(raceId).orElseThrow(() -> new DatabaseException("Race not found"));
+    race.getDriver2().setFinalPosition(position);
+    return convertRace(raceRepository.save(race));
+  }
+
+  /**
+   * Finds most suitable drivers for given location.
+   *
+   * @param location location of the race.
+   * @return set if ids of most suitable drivers for given location.
+   */
+  public Set<Long> findMostSuitableDriver(Location location) {
+    var races = raceRepository.findRacesByLocation(location);
+    Map<Long, Integer> driverWithPoints = new HashMap<>();
+
+    for (Race race : races) {
+      updatePointsForDriver(race.getDriver1(), driverWithPoints);
+      updatePointsForDriver(race.getDriver2(), driverWithPoints);
+    }
+
+    var max = Collections.max(driverWithPoints.values());
+    Set<Long> drivers = new HashSet<>();
+    for (Map.Entry<Long, Integer> entry : driverWithPoints.entrySet()) {
+      if (Objects.equals(entry.getValue(), max)) {
+        drivers.add(entry.getKey());
+      }
+    }
+    return drivers;
+  }
+
+  private void updatePointsForDriver(Race.RaceDriverinfo driverinfo,
+                                     Map<Long, Integer> driverWithPoints) {
+    if (driverinfo == null || driverinfo.getDriverId() == null) {
+      return;
+    }
+
+    Integer points;
+    if (driverinfo.getFinalPosition() != null) {
+      points = pointsUtil.points.get(driverinfo.getFinalPosition());
+    } else {
+      points = 0;
+    }
+
+    driverWithPoints.merge(driverinfo.getDriverId(), points, Integer::sum);
+  }
+
   private Race convertRaceDto(RaceDto raceDto) {
     var race = Race.builder()
         .id(raceDto.getId())
@@ -176,20 +247,21 @@ public class RaceService {
     if (race.getDriver2() != null) {
       raceDto.setDriverTwo(RaceDriverCarDto.builder()
           .carId(race.getDriver2().getCarId())
-          .driverId(race.getDriver2().getCarId())
+          .driverId(race.getDriver2().getDriverId())
           .build());
     }
     return raceDto;
   }
 
-  private Driver getDriver(Long driverId) {
+  private DriverDto getDriver(Long driverId) {
     var response =
-        client.getForEntity("http://localhost:8083/driver/get/id=" + driverId, Driver.class);
+        client.getForEntity("http://localhost:8083/driver/get/id=" + driverId, DriverDto.class);
     return response.getBody();
   }
 
-  private Car getCar(Long carId) {
-    var response = client.getForEntity("http://localhost:8082/car/id=" + carId, Car.class);
+  private CarResponseDto getCar(Long carId) {
+    var response =
+        client.getForEntity("http://localhost:8082/car/?carId=" + carId, CarResponseDto.class);
     return response.getBody();
   }
 }

race/src/main/java/cz/muni/pa165/race/service/RaceServiceI.java

+package cz.muni.pa165.race.service;
+
+import cz.muni.pa165.common_library.dtos.Location;
+import cz.muni.pa165.common_library.dtos.RaceDto;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Race service interface.
+ */
+public interface RaceServiceI {
+
+  RaceDto postRace(RaceDto raceDto);
+
+  RaceDto findRaceById(Long raceId);
+
+  List<RaceDto> findRaces();
+
+  String deleteRace(Long raceId);
+
+  RaceDto assignDriverOne(Long driverId, Long raceId, Long carId);
+
+  RaceDto assignDriverTwo(Long driverId, Long raceId, Long carId);
+
+  Set<Long> findMostSuitableDriver(Location location);
+
+  RaceDto assignPositionForDriverTwo(Long raceId, Integer position);
+
+  RaceDto assignPositionForDriverOne(Long raceId, Integer position);
+}

race/src/main/java/cz/muni/pa165/race/service/SeasonService.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
  * Season service.
  */
 @Service
-public class SeasonService implements SeasonServiceInterface {
+public class SeasonService implements SeasonServiceI {
 
   @Autowired
   SeasonRepository seasonRepository;

race/src/main/java/cz/muni/pa165/race/service/SeasonServiceInterface.java → race/src/main/java/cz/muni/pa165/race/service/SeasonServiceI.java

@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * Interface for season service.
  */
-public interface SeasonServiceInterface {
+public interface SeasonServiceI {
 
   SeasonDto postSeason(SeasonDto seasonDto);