Merge pull request #10 from goeuropa/revert_to_pullrequest#9

revert to PR#9
opentransportro · May 14, 2024 · 048a0e9 · 048a0e9
2 parents ebf9e73 + b557b33
commit 048a0e9
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 22 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -212,6 +212,12 @@
             <artifactId>traccar-client</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.2.3</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/core/src/main/java/org/transitclock/core/avl/TraccarAVLModule.java b/core/src/main/java/org/transitclock/core/avl/TraccarAVLModule.java
@@ -16,22 +16,6 @@
  */
 package org.transitclock.core.avl;
 
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-import org.transitclock.domain.structs.AvlReport;
-import org.transitclock.extension.traccar.ApiClient;
-import org.transitclock.extension.traccar.ApiException;
-import org.transitclock.extension.traccar.api.DefaultApi;
-import org.transitclock.extension.traccar.model.DeviceDto;
-import org.transitclock.extension.traccar.model.PositionDto;
-import org.transitclock.extension.traccar.model.UserDto;
-
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hc.client5.http.auth.AuthCache;
@@ -42,11 +26,23 @@
 import org.apache.hc.client5.http.impl.auth.BasicScheme;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.core5.http.HttpHost;
+import org.transitclock.domain.structs.AvlReport;
+import org.transitclock.extension.traccar.ApiClient;
+import org.transitclock.extension.traccar.ApiException;
+import org.transitclock.extension.traccar.api.DefaultApi;
+import org.transitclock.extension.traccar.model.DeviceDto;
+import org.transitclock.extension.traccar.model.PositionDto;
+import org.transitclock.extension.traccar.model.UserDto;
+
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
 
-import static org.transitclock.config.data.TraccarConfig.TRACCARBASEURL;
-import static org.transitclock.config.data.TraccarConfig.TRACCAREMAIL;
-import static org.transitclock.config.data.TraccarConfig.TRACCARPASSWORD;
-import static org.transitclock.config.data.TraccarConfig.TRACCARSOURCE;
+import static org.transitclock.config.data.TraccarConfig.*;
 
 
 /**
@@ -141,4 +137,4 @@ protected Collection<AvlReport> processData(InputStream in) throws Exception {
         return null;
     }
 
-}
+}
diff --git a/core/src/main/java/org/transitclock/domain/structs/VehicleToBlockConfig.java b/core/src/main/java/org/transitclock/domain/structs/VehicleToBlockConfig.java
@@ -8,6 +8,9 @@
 import org.hibernate.Transaction;
 import org.hibernate.annotations.DynamicUpdate;
 import org.transitclock.Core;
+import org.transitclock.core.BlockAssignmentMethod;
+import org.transitclock.core.VehicleState;
+import org.transitclock.core.dataCache.VehicleStateManager;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -116,14 +119,21 @@ public static void updateVehicleToBlockConfig(VehicleToBlockConfig vehicleToBloc
     }
 
     public static void deleteVehicleToBlockConfig(long id, Session session) throws HibernateException {
+        String vehicleId = session
+                .createQuery("FROM VehicleToBlockConfig WHERE id = :id", VehicleToBlockConfig.class)
+                .setParameter("id", id).getSingleResult().getVehicleId();
+
         Transaction transaction = session.beginTransaction();
         try {
             session
                     .createMutationQuery("delete from VehicleToBlockConfig where id = :id")
                     .setParameter("id", id)
                     .executeUpdate();
-
             transaction.commit();
+            VehicleState vehicleState = VehicleStateManager.getInstance()
+                    .getVehicleState(vehicleId);
+            vehicleState.unsetBlock(BlockAssignmentMethod.ASSIGNMENT_TERMINATED);
+            vehicleState.setMatch(null);
         } catch (Throwable t) {
             transaction.rollback();
             throw t;