Przeglądaj źródła

Added API 'driverIdActionIdGET'

Lukas Cerny 1 rok temu
rodzic
commit
25e54364d8

+ 15 - 0
src/main/java/cz/senslog/telemetry/database/repository/MapLogRepository.java

@@ -352,6 +352,21 @@ public class MapLogRepository implements SensLogRepository {
                 .onFailure(logger::catching);
     }
 
+    private static final Function<Row, Action> ROW_TO_ACTION = (row) -> Action.of(
+            row.getInteger("id"),
+            row.getString("name")
+    );
+
+    @Override
+    public Future<Action> findActionByIdAndDriverId(int actionId, int driverId) {
+        return client.preparedQuery("SELECT a.id, a.name FROM maplog.action AS a " +
+                "JOIN maplog.driver_to_action AS dta ON a.id = dta.action_id " +
+                "WHERE a.id = $1 AND dta.driver_id = $2")
+                .execute(Tuple.of(actionId, driverId))
+                .map(RowSet::iterator)
+                .map(iterator -> iterator.hasNext() ? ROW_TO_ACTION.apply(iterator.next()) : null);
+    }
+
     @Override
     public Future<List<Unit>> findUnitsByDriverId(int driverId, OffsetDateTime from, OffsetDateTime to) {
         String whereTimestampClause;

+ 5 - 0
src/main/java/cz/senslog/telemetry/database/repository/MockMapLogRepository.java

@@ -186,6 +186,11 @@ public class MockMapLogRepository implements SensLogRepository {
     }
 
     @Override
+    public Future<Action> findActionByIdAndDriverId(int actionId, int driverId) {
+        return Future.succeededFuture(Action.of(actionId, "mock(name)"));
+    }
+
+    @Override
     public Future<List<Unit>> findUnitsByDriverId(int driverId, OffsetDateTime from, OffsetDateTime to) {
         return Future.succeededFuture(Collections.emptyList());
     }

+ 2 - 0
src/main/java/cz/senslog/telemetry/database/repository/SensLogRepository.java

@@ -52,6 +52,8 @@ public interface SensLogRepository {
 
     Future<List<Action>> findActionsByDriverIdAndUnitId(int driverId, long unitId);
     Future<List<Action>> findActionsByDriverId(int driverId);
+    Future<Action> findActionByIdAndDriverId(int actionId, int driverId);
+
 
     Future<List<Unit>> findUnitsByDriverId(int driverId, OffsetDateTime from, OffsetDateTime to);
     Future<List<UnitTelemetry>> findObservationsByCampaignId(long campaignId, OffsetDateTime from, OffsetDateTime to, ZoneId zone, int offset, int limit);

+ 1 - 0
src/main/java/cz/senslog/telemetry/server/HttpVertxServer.java

@@ -84,6 +84,7 @@ public final class HttpVertxServer extends AbstractVerticle {
                     openAPIRouterBuilder.operation("driverIdUnitIdGET").handler(apiHandler::driverIdUnitIdGET);
                     openAPIRouterBuilder.operation("driverIdUnitIdActionsGET").handler(apiHandler::driverIdUnitIdActionsGET);
                     openAPIRouterBuilder.operation("driverIdActionsGET").handler(apiHandler::driverIdActionsGET);
+                    openAPIRouterBuilder.operation("driverIdActionIdGET").handler(apiHandler::driverIdActionIdGET);
 
                     Router mainRouter = openAPIRouterBuilder.createRouter();
 //                    mainRouter.route().handler(LoggerHandler.create());

+ 21 - 0
src/main/java/cz/senslog/telemetry/server/OpenAPIHandler.java

@@ -932,4 +932,25 @@ public class OpenAPIHandler {
                 ).encode()))
                 .onFailure(th -> rc.fail(400, th));
     }
+
+    public void driverIdActionIdGET(RoutingContext rc) {
+        String host =  hostURLFull(rc.request());
+
+        int driverId = Integer.parseInt(rc.pathParam("driverId"));
+        int actionId = Integer.parseInt(rc.pathParam("actionId"));
+
+        List<String> paramNavigationLinks = rc.queryParam("navigationLinks");
+        boolean navigationLinks = paramNavigationLinks.isEmpty() ? DEFAULT_NAVIGATION_LINKS : parseBoolean(paramNavigationLinks.get(0));
+
+        repo.findActionByIdAndDriverId(actionId, driverId)
+                .onSuccess(a -> rc.response().end((navigationLinks ? JsonObject.of(
+                                "self@NavigationLink", String.format("%s/drivers/%d/actions/%d", host, driverId, a.getId()),
+                                "Driver@NavigationLink", String.format("%s/drivers/%d", host, driverId),
+                                "Units@NavigationLink", String.format("%s/drivers/%d/actions/%d/units", host, driverId, a.getId())
+                        ) : JsonObject.of()).mergeIn(JsonObject.of(
+                                "id", a.getId(),
+                                "name", a.getName()
+                        )).encode())
+                        .onFailure(th -> rc.fail(400, th)));
+    }
 }

+ 2 - 2
src/main/resources/openAPISpec.yaml

@@ -634,7 +634,7 @@ paths:
                 $ref: '#/components/schemas/Error'
 
   /drivers/{driverId}/actions:
-    get:
+    get: # done
       operationId: driverIdActionsGET
       summary: Publish basic info about driver's actions
       parameters:
@@ -657,7 +657,7 @@ paths:
                 $ref: '#/components/schemas/Error'
 
   /drivers/{driverId}/actions/{actionId}:
-    get:
+    get: # done
       operationId: driverIdActionIdGET
       summary: Publish detailed info about the driver's action
       parameters: