zenon/distributed-systems-technologies
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Properly requeue on exception

Browse Source
This commit is contained in:
Tobias Eidelpes 2021-04-27 22:41:55 +02:00
parent 6d319cd378
commit 05d4c2ded6
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ass2-service/trip/src/main/java/dst/ass2/service/trip/impl/TripService.java
View File

@ -85,14 +85,20 @@ public class TripService implements ITripService {
public void match(Long tripId, MatchDTO match) throws EntityNotFoundException, DriverNotAvailableException, IllegalStateException { public void match(Long tripId, MatchDTO match) throws EntityNotFoundException, DriverNotAvailableException, IllegalStateException {
ITrip trip; ITrip trip;
IMatch newMatch; IMatch newMatch;
IDriver driver;
try { try {
trip = getTrip(tripId); trip = getTrip(tripId);
IDriver driver = getDriver(match.getDriverId()); driver = getDriver(match.getDriverId());
IMatchDAO matchDAO = daoFactory.createMatchDAO(); List<IMatch> matches = daoFactory.createMatchDAO().findAll();
for (IMatch m : matchDAO.findAll()) { for (IMatch existingMatch : matches) {
if (m.getDriver() != null && m.getDriver().getId().equals(driver.getId())) if (existingMatch.getDriver().getId().equals(match.getDriverId())) {
throw new DriverNotAvailableException("Driver with id " + driver.getId() + " is already busy"); throw new DriverNotAvailableException("Driver with id " + driver.getId() + " is already busy");
} }
}
} catch (Exception e) {
matchingService.queueTripForMatching(tripId);
throw e;
}
IVehicle vehicle = getVehicle(match.getVehicleId()); IVehicle vehicle = getVehicle(match.getVehicleId());
@ -109,11 +115,6 @@ public class TripService implements ITripService {
trip.setMatch(newMatch); trip.setMatch(newMatch);
trip.setState(TripState.MATCHED); trip.setState(TripState.MATCHED);
} catch (Exception e) {
// Requeue match
matchingService.queueTripForMatching(tripId);
throw e;
}
entityManager.merge(trip); entityManager.merge(trip);
entityManager.persist(newMatch); entityManager.persist(newMatch);