@vulog/aima-trip 1.2.13 → 1.2.15

package/dist/index.d.mts

@@ -1,6 +1,7 @@
 import { Client } from '@vulog/aima-client';
 import z from 'zod';
 import { UUID } from 'crypto';
+import { PaginableOptions, PaginableResponse } from '@vulog/aima-core';
 
 declare const addTripRelatedProduct: (client: Client, vehicleId: string, productId: string) => Promise<void>;
 declare const removeTripRelatedProduct: (client: Client, vehicleId: string, productId: string) => Promise<void>;
@@ -121,23 +122,6 @@ type EndTripInfo = {
     userId: string;
     orderId: string;
 };
-
-declare const endTrip: (client: Client, info: EndTripInfo) => Promise<void>;
-
-declare const optionsSchema: z.ZodObject<{
-    minDuration: z.ZodOptional<z.ZodNumber>;
-    boxStatus: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
-}, "strip", z.ZodTypeAny, {
-    minDuration?: number | undefined;
-    boxStatus?: number[] | undefined;
-}, {
-    minDuration?: number | undefined;
-    boxStatus?: number[] | undefined;
-}>;
-declare const getVehiclesBooked: (client: Client, options?: z.infer<typeof optionsSchema>) => Promise<FleetManagerBook[]>;
-declare const getVehiclesBookedByUserId: (client: Client, userId: string) => Promise<FleetManagerBook[]>;
-declare const getVehicleBookedByTripId: (client: Client, tripId: string) => Promise<FleetManagerBook | null>;
-
 type TripZone = {
     zoneId: string;
     version: number;
@@ -177,7 +161,7 @@ type TripAdditionalInfo = {
     ignoreOdometer: boolean;
     startTripEventDate: string;
 };
-type TripResponse = {
+type Trip = {
     id: string;
     tripId: string;
     fleetId: string;
@@ -204,7 +188,24 @@ type TripResponse = {
     tripEvents: TripEvent[];
     lastUpdateDate: string;
 };
-declare const getTripById: (client: Client, tripId: string) => Promise<TripResponse | Record<string, never>>;
+
+declare const endTrip: (client: Client, info: EndTripInfo) => Promise<void>;
+
+declare const optionsSchema: z.ZodObject<{
+    minDuration: z.ZodOptional<z.ZodNumber>;
+    boxStatus: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
+}, "strip", z.ZodTypeAny, {
+    minDuration?: number | undefined;
+    boxStatus?: number[] | undefined;
+}, {
+    minDuration?: number | undefined;
+    boxStatus?: number[] | undefined;
+}>;
+declare const getVehiclesBooked: (client: Client, options?: z.infer<typeof optionsSchema>) => Promise<FleetManagerBook[]>;
+declare const getVehiclesBookedByUserId: (client: Client, userId: string) => Promise<FleetManagerBook[]>;
+declare const getVehicleBookedByTripId: (client: Client, tripId: string) => Promise<FleetManagerBook | null>;
+
+declare const getTripById: (client: Client, tripId: string) => Promise<Trip | Record<string, never>>;
 
 type PaymentReceipt = {
     id: string;
@@ -235,4 +236,6 @@ type Payment = {
 };
 declare const getOngoingTripPaymentsByTripIds: (client: Client, tripIds: string[]) => Promise<Payment[]>;
 
-export { type EndTripInfo, type FleetManagerBook, type Payment, type PaymentReceipt, type TripAdditionalInfo, type TripEvent, type TripLocation, type TripOverriddenInfo, type TripResponse, type TripZone, type Zone, addTripRelatedProduct, endTrip, getOngoingTripPaymentsByTripIds, getTripById, getVehicleBookedByTripId, getVehiclesBooked, getVehiclesBookedByUserId, removeTripRelatedProduct };
+declare const getTripsByUserId: (client: Client, userId: string, options?: PaginableOptions<void, "date">) => Promise<PaginableResponse<Trip>>;
+
+export { type EndTripInfo, type FleetManagerBook, type Payment, type PaymentReceipt, type Trip, type TripAdditionalInfo, type TripEvent, type TripLocation, type TripOverriddenInfo, type TripZone, type Zone, addTripRelatedProduct, endTrip, getOngoingTripPaymentsByTripIds, getTripById, getTripsByUserId, getVehicleBookedByTripId, getVehiclesBooked, getVehiclesBookedByUserId, removeTripRelatedProduct };

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { Client } from '@vulog/aima-client';
 import z from 'zod';
 import { UUID } from 'crypto';
+import { PaginableOptions, PaginableResponse } from '@vulog/aima-core';
 
 declare const addTripRelatedProduct: (client: Client, vehicleId: string, productId: string) => Promise<void>;
 declare const removeTripRelatedProduct: (client: Client, vehicleId: string, productId: string) => Promise<void>;
@@ -121,23 +122,6 @@ type EndTripInfo = {
     userId: string;
     orderId: string;
 };
-
-declare const endTrip: (client: Client, info: EndTripInfo) => Promise<void>;
-
-declare const optionsSchema: z.ZodObject<{
-    minDuration: z.ZodOptional<z.ZodNumber>;
-    boxStatus: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
-}, "strip", z.ZodTypeAny, {
-    minDuration?: number | undefined;
-    boxStatus?: number[] | undefined;
-}, {
-    minDuration?: number | undefined;
-    boxStatus?: number[] | undefined;
-}>;
-declare const getVehiclesBooked: (client: Client, options?: z.infer<typeof optionsSchema>) => Promise<FleetManagerBook[]>;
-declare const getVehiclesBookedByUserId: (client: Client, userId: string) => Promise<FleetManagerBook[]>;
-declare const getVehicleBookedByTripId: (client: Client, tripId: string) => Promise<FleetManagerBook | null>;
-
 type TripZone = {
     zoneId: string;
     version: number;
@@ -177,7 +161,7 @@ type TripAdditionalInfo = {
     ignoreOdometer: boolean;
     startTripEventDate: string;
 };
-type TripResponse = {
+type Trip = {
     id: string;
     tripId: string;
     fleetId: string;
@@ -204,7 +188,24 @@ type TripResponse = {
     tripEvents: TripEvent[];
     lastUpdateDate: string;
 };
-declare const getTripById: (client: Client, tripId: string) => Promise<TripResponse | Record<string, never>>;
+
+declare const endTrip: (client: Client, info: EndTripInfo) => Promise<void>;
+
+declare const optionsSchema: z.ZodObject<{
+    minDuration: z.ZodOptional<z.ZodNumber>;
+    boxStatus: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
+}, "strip", z.ZodTypeAny, {
+    minDuration?: number | undefined;
+    boxStatus?: number[] | undefined;
+}, {
+    minDuration?: number | undefined;
+    boxStatus?: number[] | undefined;
+}>;
+declare const getVehiclesBooked: (client: Client, options?: z.infer<typeof optionsSchema>) => Promise<FleetManagerBook[]>;
+declare const getVehiclesBookedByUserId: (client: Client, userId: string) => Promise<FleetManagerBook[]>;
+declare const getVehicleBookedByTripId: (client: Client, tripId: string) => Promise<FleetManagerBook | null>;
+
+declare const getTripById: (client: Client, tripId: string) => Promise<Trip | Record<string, never>>;
 
 type PaymentReceipt = {
     id: string;
@@ -235,4 +236,6 @@ type Payment = {
 };
 declare const getOngoingTripPaymentsByTripIds: (client: Client, tripIds: string[]) => Promise<Payment[]>;
 
-export { type EndTripInfo, type FleetManagerBook, type Payment, type PaymentReceipt, type TripAdditionalInfo, type TripEvent, type TripLocation, type TripOverriddenInfo, type TripResponse, type TripZone, type Zone, addTripRelatedProduct, endTrip, getOngoingTripPaymentsByTripIds, getTripById, getVehicleBookedByTripId, getVehiclesBooked, getVehiclesBookedByUserId, removeTripRelatedProduct };
+declare const getTripsByUserId: (client: Client, userId: string, options?: PaginableOptions<void, "date">) => Promise<PaginableResponse<Trip>>;
+
+export { type EndTripInfo, type FleetManagerBook, type Payment, type PaymentReceipt, type Trip, type TripAdditionalInfo, type TripEvent, type TripLocation, type TripOverriddenInfo, type TripZone, type Zone, addTripRelatedProduct, endTrip, getOngoingTripPaymentsByTripIds, getTripById, getTripsByUserId, getVehicleBookedByTripId, getVehiclesBooked, getVehiclesBookedByUserId, removeTripRelatedProduct };

package/dist/index.js

@@ -34,6 +34,7 @@ __export(index_exports, {
   endTrip: () => endTrip,
   getOngoingTripPaymentsByTripIds: () => getOngoingTripPaymentsByTripIds,
   getTripById: () => getTripById,
+  getTripsByUserId: () => getTripsByUserId,
   getVehicleBookedByTripId: () => getVehicleBookedByTripId,
   getVehiclesBooked: () => getVehiclesBooked,
   getVehiclesBookedByUserId: () => getVehiclesBookedByUserId,
@@ -173,12 +174,52 @@ var getOngoingTripPaymentsByTripIds = async (client, tripIds) => {
   }
   return client.post(`/boapi/proxy/trip/fleets/${client.clientOptions.fleetId}/trips/ongoing`, { ids: tripIds }).then(({ data }) => data);
 };
+
+// src/getTrips.ts
+var import_aima_core = require("@vulog/aima-core");
+var import_zod5 = __toESM(require("zod"));
+var schemaByUserId2 = import_zod5.default.object({
+  userId: import_zod5.default.string().trim().min(1).uuid()
+});
+var getTripsByUserId = async (client, userId, options) => {
+  const result = schemaByUserId2.safeParse({ userId });
+  if (!result.success) {
+    throw new TypeError("Invalid userId", {
+      cause: result.error.issues
+    });
+  }
+  const PaginableOptionsSchema = (0, import_aima_core.createPaginableOptionsSchema)(
+    void 0,
+    import_zod5.default.enum(["date"]).optional().default("date")
+  ).default({});
+  const resultOptions = PaginableOptionsSchema.safeParse(options);
+  if (!resultOptions.success) {
+    throw new TypeError("Invalid options", {
+      cause: resultOptions.error.issues
+    });
+  }
+  const finalOptions = resultOptions.data;
+  const searchParams = new URLSearchParams();
+  searchParams.append("page", finalOptions.page.toString());
+  searchParams.append("size", finalOptions.pageSize.toString());
+  searchParams.append("sort", `${finalOptions.sort.toString()},${finalOptions.sortDirection.toString()}`);
+  return client.get(`/boapi/proxy/trip/fleets/${client.clientOptions.fleetId}/trips/users/${userId}?${searchParams.toString()}`).then(({ data, headers }) => {
+    return {
+      data,
+      page: headers.number,
+      pageSize: headers.size,
+      total: headers.totalelements,
+      totalPages: headers.totalpages
+    };
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addTripRelatedProduct,
   endTrip,
   getOngoingTripPaymentsByTripIds,
   getTripById,
+  getTripsByUserId,
   getVehicleBookedByTripId,
   getVehiclesBooked,
   getVehiclesBookedByUserId,

package/dist/index.mjs

@@ -130,11 +130,51 @@ var getOngoingTripPaymentsByTripIds = async (client, tripIds) => {
   }
   return client.post(`/boapi/proxy/trip/fleets/${client.clientOptions.fleetId}/trips/ongoing`, { ids: tripIds }).then(({ data }) => data);
 };
+
+// src/getTrips.ts
+import { createPaginableOptionsSchema } from "@vulog/aima-core";
+import z5 from "zod";
+var schemaByUserId2 = z5.object({
+  userId: z5.string().trim().min(1).uuid()
+});
+var getTripsByUserId = async (client, userId, options) => {
+  const result = schemaByUserId2.safeParse({ userId });
+  if (!result.success) {
+    throw new TypeError("Invalid userId", {
+      cause: result.error.issues
+    });
+  }
+  const PaginableOptionsSchema = createPaginableOptionsSchema(
+    void 0,
+    z5.enum(["date"]).optional().default("date")
+  ).default({});
+  const resultOptions = PaginableOptionsSchema.safeParse(options);
+  if (!resultOptions.success) {
+    throw new TypeError("Invalid options", {
+      cause: resultOptions.error.issues
+    });
+  }
+  const finalOptions = resultOptions.data;
+  const searchParams = new URLSearchParams();
+  searchParams.append("page", finalOptions.page.toString());
+  searchParams.append("size", finalOptions.pageSize.toString());
+  searchParams.append("sort", `${finalOptions.sort.toString()},${finalOptions.sortDirection.toString()}`);
+  return client.get(`/boapi/proxy/trip/fleets/${client.clientOptions.fleetId}/trips/users/${userId}?${searchParams.toString()}`).then(({ data, headers }) => {
+    return {
+      data,
+      page: headers.number,
+      pageSize: headers.size,
+      total: headers.totalelements,
+      totalPages: headers.totalpages
+    };
+  });
+};
 export {
   addTripRelatedProduct,
   endTrip,
   getOngoingTripPaymentsByTripIds,
   getTripById,
+  getTripsByUserId,
   getVehicleBookedByTripId,
   getVehiclesBooked,
   getVehiclesBookedByUserId,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vulog/aima-trip",
-    "version": "1.2.13",
+    "version": "1.2.15",
     "main": "dist/index.js",
     "module": "dist/index.mjs",
     "types": "dist/index.d.ts",
@@ -19,8 +19,8 @@
     "author": "Vulog",
     "license": "MIT",
     "dependencies": {
-        "@vulog/aima-client": "1.2.13",
-        "@vulog/aima-core": "1.2.13"
+        "@vulog/aima-client": "1.2.15",
+        "@vulog/aima-core": "1.2.15"
     },
     "peerDependencies": {
         "zod": "^3.25.76"

package/src/getTripById.ts

@@ -1,82 +1,11 @@
 import { Client } from '@vulog/aima-client';
 
-// DTO for the getTripById API response
-export type TripZone = {
-    zoneId: string;
-    version: number;
-    type: string;
-    sticky: boolean;
-};
-
-export type TripLocation = {
-    latitude: number;
-    longitude: number;
-};
-
-export type TripEvent = {
-    eventType: string;
-    timestamp: string;
-    parameters: string | null;
-};
-
-export type TripOverriddenInfo = {
-    duration: {
-        adjustedBookDuration: number;
-        adjustedPauseDuration: number;
-        adjustedDrivingDuration: number;
-    };
-};
-
-export type TripAdditionalInfo = {
-    firstDriveDelayMinutes: number;
-    bookDuration: number;
-    startZones: TripZone[];
-    endZones: TripZone[];
-    isAutolock: boolean;
-    isCancel: boolean;
-    isReleaseOnServer: boolean;
-    isBilled: boolean;
-    suspicious: boolean;
-    startLocation: TripLocation;
-    endLocation: TripLocation;
-    overriddenTripInfo: TripOverriddenInfo;
-    bypassBookingRequestCompleted: boolean;
-    ignoreOdometer: boolean;
-    startTripEventDate: string;
-};
-
-export type TripResponse = {
-    id: string;
-    tripId: string;
-    fleetId: string;
-    userId: string;
-    profileId: string;
-    profileType: string;
-    vehicleId: string;
-    length: number;
-    duration: number;
-    pauseDuration: number;
-    tripDuration: number;
-    bookingDuration: number;
-    drivingDuration: number;
-    date: string;
-    endDate: string;
-    additionalInfo: TripAdditionalInfo;
-    pricingId: string;
-    productIds: string[];
-    serviceId: string;
-    serviceType: string;
-    theorStartDate: string;
-    theorEndDate: string;
-    ticketInfo: any;
-    tripEvents: TripEvent[];
-    lastUpdateDate: string;
-};
+import { Trip } from './types';
 
-export const getTripById = async (client: Client, tripId: string): Promise<TripResponse | Record<string, never>> => {
+export const getTripById = async (client: Client, tripId: string): Promise<Trip | Record<string, never>> => {
     const { fleetId } = client.clientOptions;
     return client
-        .get<TripResponse>(`/boapi/proxy/trip/fleets/${fleetId}/trips/${tripId}`)
+        .get<Trip>(`/boapi/proxy/trip/fleets/${fleetId}/trips/${tripId}`)
         .then(({ data }) => data)
         .catch((error) => {
             if (error.formattedError?.status === 404) {

package/src/getTrips.ts

@@ -0,0 +1,55 @@
+import { Client } from '@vulog/aima-client';
+import { createPaginableOptionsSchema, PaginableOptions, PaginableResponse } from '@vulog/aima-core';
+import z from 'zod';
+
+import { Trip } from './types';
+
+const schemaByUserId = z.object({
+    userId: z.string().trim().min(1).uuid(),
+});
+
+export const getTripsByUserId = async (
+    client: Client,
+    userId: string,
+    options?: PaginableOptions<void, 'date'>
+): Promise<PaginableResponse<Trip>> => {
+    const result = schemaByUserId.safeParse({ userId });
+    if (!result.success) {
+        throw new TypeError('Invalid userId', {
+            cause: result.error.issues,
+        });
+    }
+
+    const PaginableOptionsSchema = createPaginableOptionsSchema(
+        undefined,
+        z.enum(['date']).optional().default('date')
+    ).default({});
+
+    const resultOptions = PaginableOptionsSchema.safeParse(options);
+    if (!resultOptions.success) {
+        throw new TypeError('Invalid options', {
+            cause: resultOptions.error.issues,
+        });
+    }
+
+    const finalOptions = resultOptions.data;
+
+    const searchParams = new URLSearchParams();
+    searchParams.append('page', finalOptions.page!.toString());
+    searchParams.append('size', finalOptions.pageSize!.toString());
+    searchParams.append('sort', `${finalOptions.sort!.toString()},${finalOptions.sortDirection!.toString()}`);
+
+    return client
+        .get<
+            Trip[]
+        >(`/boapi/proxy/trip/fleets/${client.clientOptions.fleetId}/trips/users/${userId}?${searchParams.toString()}`)
+        .then(({ data, headers }) => {
+            return {
+                data,
+                page: headers.number,
+                pageSize: headers.size,
+                total: headers.totalelements,
+                totalPages: headers.totalpages,
+            };
+        });
+};

package/src/index.ts

@@ -4,3 +4,4 @@ export * from './getVehiclesBooked';
 export * from './types';
 export * from './getTripById';
 export * from './getOngoingTripPaymentsByTripIds';
+export * from './getTrips';

package/src/types.ts

@@ -116,3 +116,75 @@ export type EndTripInfo = {
     userId: string;
     orderId: string;
 };
+
+export type TripZone = {
+    zoneId: string;
+    version: number;
+    type: string;
+    sticky: boolean;
+};
+
+export type TripLocation = {
+    latitude: number;
+    longitude: number;
+};
+
+export type TripEvent = {
+    eventType: string;
+    timestamp: string;
+    parameters: string | null;
+};
+
+export type TripOverriddenInfo = {
+    duration: {
+        adjustedBookDuration: number;
+        adjustedPauseDuration: number;
+        adjustedDrivingDuration: number;
+    };
+};
+
+export type TripAdditionalInfo = {
+    firstDriveDelayMinutes: number;
+    bookDuration: number;
+    startZones: TripZone[];
+    endZones: TripZone[];
+    isAutolock: boolean;
+    isCancel: boolean;
+    isReleaseOnServer: boolean;
+    isBilled: boolean;
+    suspicious: boolean;
+    startLocation: TripLocation;
+    endLocation: TripLocation;
+    overriddenTripInfo: TripOverriddenInfo;
+    bypassBookingRequestCompleted: boolean;
+    ignoreOdometer: boolean;
+    startTripEventDate: string;
+};
+
+export type Trip = {
+    id: string;
+    tripId: string;
+    fleetId: string;
+    userId: string;
+    profileId: string;
+    profileType: string;
+    vehicleId: string;
+    length: number;
+    duration: number;
+    pauseDuration: number;
+    tripDuration: number;
+    bookingDuration: number;
+    drivingDuration: number;
+    date: string;
+    endDate: string;
+    additionalInfo: TripAdditionalInfo;
+    pricingId: string;
+    productIds: string[];
+    serviceId: string;
+    serviceType: string;
+    theorStartDate: string;
+    theorEndDate: string;
+    ticketInfo: any;
+    tripEvents: TripEvent[];
+    lastUpdateDate: string;
+};