Просмотр исходного кода

Added API 'driverIdActionsGET'

Lukas Cerny 1 год назад
Родитель
Сommit
e29d0dd13d

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

@@ -339,6 +339,20 @@ public class MapLogRepository implements SensLogRepository {
     }
 
     @Override
+    public Future<List<Action>> findActionsByDriverId(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 dta.driver_id = $1")
+                .execute(Tuple.of(driverId))
+                .map(rs -> StreamSupport.stream(rs.spliterator(), false)
+                        .map(row -> Action.of(
+                                row.getInteger("id"),
+                                row.getString("name"))
+                        ).collect(toList()))
+                .onFailure(logger::catching);
+    }
+
+    @Override
     public Future<List<Unit>> findUnitsByDriverId(int driverId, OffsetDateTime from, OffsetDateTime to) {
         String whereTimestampClause;
         Tuple tupleParams;

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

@@ -181,6 +181,11 @@ public class MockMapLogRepository implements SensLogRepository {
     }
 
     @Override
+    public Future<List<Action>> findActionsByDriverId(int driverId) {
+        return Future.succeededFuture(Collections.emptyList());
+    }
+
+    @Override
     public Future<List<Unit>> findUnitsByDriverId(int driverId, OffsetDateTime from, OffsetDateTime to) {
         return Future.succeededFuture(Collections.emptyList());
     }

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

@@ -51,6 +51,7 @@ public interface SensLogRepository {
 
 
     Future<List<Action>> findActionsByDriverIdAndUnitId(int driverId, long unitId);
+    Future<List<Action>> findActionsByDriverId(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

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

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

@@ -912,4 +912,24 @@ public class OpenAPIHandler {
                 ).encode()))
                 .onFailure(th -> rc.fail(400, th));
     }
+
+    public void driverIdActionsGET(RoutingContext rc) {
+        String host =  hostURLFull(rc.request());
+
+        int driverId = Integer.parseInt(rc.pathParam("driverId"));
+
+        List<String> paramNavigationLinks = rc.queryParam("navigationLinks");
+        boolean navigationLinks = paramNavigationLinks.isEmpty() ? DEFAULT_NAVIGATION_LINKS : parseBoolean(paramNavigationLinks.get(0));
+
+        repo.findActionsByDriverId(driverId)
+                .onSuccess(actions -> rc.response().end(new JsonArray(
+                        actions.stream().map(a -> (navigationLinks ? JsonObject.of(
+                                "DriverAction@NavigationLink", String.format("%s/drivers/%d/actions/%d",host, driverId, a.getId())
+                        ) : JsonObject.of()).mergeIn(JsonObject.of(
+                                "id", a.getId(),
+                                "name", a.getName()
+                        ))).collect(toList())
+                ).encode()))
+                .onFailure(th -> rc.fail(400, th));
+    }
 }

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

@@ -610,7 +610,7 @@ paths:
                 $ref: '#/components/schemas/Error'
 
   /drivers/{driverId}/units/{unitId}/actions:
-    get:
+    get: # done
       operationId: driverIdUnitIdActionsGET
       summary: Publish basic info actions performed on the unit by the driver
       parameters: