@internetderdinge/api 1.229.37 → 1.229.40

package/dist/src/admin/adminSearch.route.js

@@ -13,6 +13,7 @@ export const adminSearchRouteSpecs = [
         requestSchema: adminStatsSchema,
         responseSchema: adminStatsResponseSchema,
         handler: getStats,
+        privateDocs: true,
         summary: "Get admin stats",
         description: "Returns total counts for organizations, users, and devices.",
     },
@@ -24,6 +25,7 @@ export const adminSearchRouteSpecs = [
         responseSchema: adminSearchResponseSchema,
         handler: searchAdmin,
         summary: "Search organizations, users, and devices",
+        privateDocs: true,
         description: "Performs an admin-only global search over organizations, users, and devices.",
     },
     {
@@ -33,6 +35,7 @@ export const adminSearchRouteSpecs = [
         requestSchema: adminIotDevicesSchema,
         responseSchema: adminIotDevicesResponseSchema,
         handler: getIotDevices,
+        privateDocs: true,
         summary: "List IoT devices",
         description: "Returns the IoT device status list used for admin device/order sync workflows.",
     },
@@ -43,6 +46,7 @@ export const adminSearchRouteSpecs = [
         requestSchema: adminDevicesSchema,
         responseSchema: adminDevicesResponseSchema,
         handler: getDevices,
+        privateDocs: true,
         summary: "List MongoDB devices",
         description: "Returns all device documents from MongoDB for admin sync workflows.",
     },

package/dist/src/devices/devices.controller.js

@@ -107,6 +107,9 @@ const updateEntry = catchAsync(async (req, res) => {
 });
 const getEvents = catchAsync(async (req, res) => {
     const device = await devicesService.getById(req.params.deviceId);
+    if (!device) {
+        throw new ApiError(httpStatus.NOT_FOUND, "Device not found");
+    }
     const events = await iotDevicesService.getEvents({
         ...req.query,
         createdAt: device.createdAt,

package/dist/src/devices/devices.route.js

@@ -32,7 +32,7 @@ export const devicesRouteSpecs = [
         responseSchema: devicesResponseSchema,
         handler: devicesController.queryDevicesByUser,
         summary: "Query devices by user",
-        description: "Retrieve a paginated list of devices visible to the authenticated user.",
+        description: "Retrieve a paginated list of devices visible to the authenticated user. Either patient or organization is required.",
     },
     {
         method: "get",

package/dist/src/devices/devices.validation.js

@@ -1,6 +1,6 @@
 import { extendZodWithOpenApi } from "@asteasolutions/zod-to-openapi";
 import { z } from "zod";
-import { zGet, zObjectId, zObjectIdFor, zPatchBody, zUpdate, zDelete, zPagination, } from "../utils/zValidations.js";
+import { zGet, zObjectId, zObjectIdFor, zPatchBody, zUpdate, zDelete, zPagination, zTypeFilter, } from "../utils/zValidations.js";
 extendZodWithOpenApi(z);
 export const createEntrySchema = {
     body: z
@@ -58,9 +58,9 @@ export const getEventsSchema = {
     }),
     query: z
         .object({
-        DateStart: z.string(),
-        DateEnd: z.string(),
-        TypeFilter: z.string().optional(),
+        DateStart: z.string().datetime().optional(),
+        DateEnd: z.string().datetime().optional(),
+        TypeFilter: zTypeFilter,
     })
         .openapi({ description: "Fetch device events in a time range" }),
 };
@@ -144,9 +144,17 @@ export const registerDeviceSchema = {
 };
 export const queryDevicesSchema = {
     ...zPagination,
-    query: zPagination.query.extend({
-        patient: zObjectIdFor("patient").optional(),
-        organization: zObjectIdFor("organization").optional(),
+    query: zPagination.query
+        .extend({
+        patient: zObjectIdFor("patient").optional().openapi({
+            description: "Patient ObjectId. Required if organization is not provided.",
+        }),
+        organization: zObjectIdFor("organization").optional().openapi({
+            description: "Organization ObjectId. Required if patient is not provided.",
+        }),
+    })
+        .refine((data) => data.patient || data.organization, {
+        message: "Either patient or organization is required",
     }),
 };
 export const subscriptionSchema = {

package/dist/src/iotdevice/iotdevice.service.js

@@ -22,16 +22,16 @@ const iotDataClient = new IoTDataPlaneClient({
  */
 export const getEvents = async (params) => {
     const accessToken = await getAuth0Token();
+    // Keep the requested start date, but never query events before the device existed.
+    const dateStart = params.createdAt && new Date(params.DateStart) < new Date(params.createdAt)
+        ? params.createdAt
+        : params.DateStart;
     try {
         const response = await axios.get(`${process.env.IOT_API_URL}getevent`, {
             headers: { Authorization: `Bearer ${accessToken}` },
             params: {
                 DeviceId: params.DeviceId,
-                DateStart: !params.createdAt
-                    ? params.DateStart
-                    : params.DateStart < params.createdAt
-                        ? params.DateStart
-                        : params.createdAt,
+                DateStart: dateStart,
                 DateEnd: params.DateEnd,
                 TypeFilter: params.TypeFilter,
             },

package/dist/src/iotdevice/iotdevice.validation.js

@@ -1,6 +1,6 @@
 import { extendZodWithOpenApi } from '@asteasolutions/zod-to-openapi';
 import { z } from 'zod';
-import { zObjectId, zPagination } from '../utils/zValidations';
+import { zObjectId, zPagination, zTypeFilter } from '../utils/zValidations';
 extendZodWithOpenApi(z);
 export const getDevice = {
     params: z.object({
@@ -27,9 +27,17 @@ export const getEventsSchema = {
         deviceId: zObjectId.openapi({ description: 'Device ObjectId' }),
     }),
     query: z.object({
-        DateStart: z.string().openapi({ description: 'Start date (ISO‐string)', example: '2025-05-01T00:00:00Z' }),
-        DateEnd: z.string().openapi({ description: 'End date (ISO‐string)', example: '2025-05-31T23:59:59Z' }),
-        TypeFilter: z.string().openapi({ description: 'Optional type filter', example: '' }).optional().default(''),
+        DateStart: z
+            .string()
+            .datetime()
+            .openapi({ description: 'Start date (ISO‐string)', example: '2025-05-01T00:00:00Z' })
+            .optional(),
+        DateEnd: z
+            .string()
+            .datetime()
+            .openapi({ description: 'End date (ISO‐string)', example: '2025-05-31T23:59:59Z' })
+            .optional(),
+        TypeFilter: zTypeFilter.default(''),
     }),
 };
 export const updateEntrySchema = {};

package/dist/src/utils/zValidations.js

@@ -141,3 +141,10 @@ export const zDelete = (id) => ({
 });
 export const zObjectId = zObjectIdFor();
 export const zDate = () => z.string().pipe(z.coerce.date());
+export const zTypeFilter = z
+    .string()
+    .openapi({
+    description: "Event type filter. Common values include activate and state; any other string is accepted.",
+    example: "activate",
+})
+    .optional();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetderdinge/api",
-  "version": "1.229.37",
+  "version": "1.229.40",
   "description": "Shared OpenIoT API modules",
   "main": "dist/src/index.js",
   "type": "module",

package/src/admin/adminSearch.route.ts

@@ -31,6 +31,7 @@ export const adminSearchRouteSpecs: RouteSpec[] = [
     requestSchema: adminStatsSchema,
     responseSchema: adminStatsResponseSchema,
     handler: getStats,
+    privateDocs: true,
     summary: "Get admin stats",
     description: "Returns total counts for organizations, users, and devices.",
   },
@@ -42,6 +43,7 @@ export const adminSearchRouteSpecs: RouteSpec[] = [
     responseSchema: adminSearchResponseSchema,
     handler: searchAdmin,
     summary: "Search organizations, users, and devices",
+    privateDocs: true,
     description:
       "Performs an admin-only global search over organizations, users, and devices.",
   },
@@ -52,6 +54,7 @@ export const adminSearchRouteSpecs: RouteSpec[] = [
     requestSchema: adminIotDevicesSchema,
     responseSchema: adminIotDevicesResponseSchema,
     handler: getIotDevices,
+    privateDocs: true,
     summary: "List IoT devices",
     description:
       "Returns the IoT device status list used for admin device/order sync workflows.",
@@ -63,6 +66,7 @@ export const adminSearchRouteSpecs: RouteSpec[] = [
     requestSchema: adminDevicesSchema,
     responseSchema: adminDevicesResponseSchema,
     handler: getDevices,
+    privateDocs: true,
     summary: "List MongoDB devices",
     description:
       "Returns all device documents from MongoDB for admin sync workflows.",

package/src/devices/devices.controller.ts

@@ -159,6 +159,10 @@ const updateEntry = catchAsync(
 const getEvents = catchAsync(
   async (req: Request, res: Response): Promise<void> => {
     const device = await devicesService.getById(req.params.deviceId);
+    if (!device) {
+      throw new ApiError(httpStatus.NOT_FOUND, "Device not found");
+    }
+
     const events = await iotDevicesService.getEvents({
       ...req.query,
       createdAt: device.createdAt,

package/src/devices/devices.route.ts

@@ -60,7 +60,7 @@ export const devicesRouteSpecs: RouteSpec[] = [
     handler: devicesController.queryDevicesByUser,
     summary: "Query devices by user",
     description:
-      "Retrieve a paginated list of devices visible to the authenticated user.",
+      "Retrieve a paginated list of devices visible to the authenticated user. Either patient or organization is required.",
   },
   {
     method: "get",

package/src/devices/devices.validation.ts

@@ -9,6 +9,7 @@ import {
   zUpdate,
   zDelete,
   zPagination,
+  zTypeFilter,
 } from "../utils/zValidations.js";
 
 extendZodWithOpenApi(z);
@@ -73,9 +74,9 @@ export const getEventsSchema = {
   }),
   query: z
     .object({
-      DateStart: z.string(),
-      DateEnd: z.string(),
-      TypeFilter: z.string().optional(),
+      DateStart: z.string().datetime().optional(),
+      DateEnd: z.string().datetime().optional(),
+      TypeFilter: zTypeFilter,
     })
     .openapi({ description: "Fetch device events in a time range" }),
 };
@@ -168,16 +169,28 @@ export const registerDeviceSchema = {
 
 export const queryDevicesSchema = {
   ...zPagination,
-  query: zPagination.query.extend({
-    patient: zObjectIdFor("patient").optional(),
-    organization: zObjectIdFor("organization").optional(),
-  }),
+  query: zPagination.query
+    .extend({
+      patient: zObjectIdFor("patient").optional().openapi({
+        description:
+          "Patient ObjectId. Required if organization is not provided.",
+      }),
+      organization: zObjectIdFor("organization").optional().openapi({
+        description:
+          "Organization ObjectId. Required if patient is not provided.",
+      }),
+    })
+    .refine((data) => data.patient || data.organization, {
+      message: "Either patient or organization is required",
+    }),
 };
+
 export const subscriptionSchema = {
   params: z.object({
     deviceId: zObjectId.openapi({ description: "Device ObjectId" }),
   }),
 };
+
 export const uploadSingleImageFromWebsiteSchema = {};
 export const updateDeviceSchema = {
   ...zUpdate("deviceId"),

package/src/iotdevice/iotdevice.service.ts

@@ -39,12 +39,17 @@ const iotDataClient = new IoTDataPlaneClient({
  */
 export const getEvents = async (params: {
   DeviceId: string;
-  DateStart: string;
-  DateEnd: string;
+  DateStart?: string;
+  DateEnd?: string;
   TypeFilter?: string;
   createdAt?: string;
 }): Promise<any> => {
   const accessToken = await getAuth0Token();
+  // Keep the requested start date, but never query events before the device existed.
+  const dateStart =
+    params.createdAt && new Date(params.DateStart) < new Date(params.createdAt)
+      ? params.createdAt
+      : params.DateStart;
   try {
     const response: AxiosResponse = await axios.get(
       `${process.env.IOT_API_URL}getevent`,
@@ -52,11 +57,7 @@ export const getEvents = async (params: {
         headers: { Authorization: `Bearer ${accessToken}` },
         params: {
           DeviceId: params.DeviceId,
-          DateStart: !params.createdAt
-            ? params.DateStart
-            : params.DateStart < params.createdAt
-              ? params.DateStart
-              : params.createdAt,
+          DateStart: dateStart,
           DateEnd: params.DateEnd,
           TypeFilter: params.TypeFilter,
         },

package/src/iotdevice/iotdevice.validation.ts

@@ -1,7 +1,7 @@
 import { extendZodWithOpenApi } from '@asteasolutions/zod-to-openapi';
 import { z } from 'zod';
 import { objectId } from '../validations/custom.validation';
-import { zGet, zObjectId, zPagination } from '../utils/zValidations';
+import { zGet, zObjectId, zPagination, zTypeFilter } from '../utils/zValidations';
 
 extendZodWithOpenApi(z);
 
@@ -31,9 +31,17 @@ export const getEventsSchema = {
     deviceId: zObjectId.openapi({ description: 'Device ObjectId' }),
   }),
   query: z.object({
-    DateStart: z.string().openapi({ description: 'Start date (ISO‐string)', example: '2025-05-01T00:00:00Z' }),
-    DateEnd: z.string().openapi({ description: 'End date (ISO‐string)', example: '2025-05-31T23:59:59Z' }),
-    TypeFilter: z.string().openapi({ description: 'Optional type filter', example: '' }).optional().default(''),
+    DateStart: z
+      .string()
+      .datetime()
+      .openapi({ description: 'Start date (ISO‐string)', example: '2025-05-01T00:00:00Z' })
+      .optional(),
+    DateEnd: z
+      .string()
+      .datetime()
+      .openapi({ description: 'End date (ISO‐string)', example: '2025-05-31T23:59:59Z' })
+      .optional(),
+    TypeFilter: zTypeFilter.default(''),
   }),
 };
 export const updateEntrySchema = {};

package/src/utils/zValidations.ts

@@ -158,3 +158,11 @@ export const zDelete = (id: string) => ({
 export const zObjectId = zObjectIdFor();
 
 export const zDate = () => z.string().pipe(z.coerce.date());
+
+export const zTypeFilter = z
+  .string()
+  .openapi({
+    description: "Event type filter. Common values include activate and state; any other string is accepted.",
+    example: "activate",
+  })
+  .optional();