@internetderdinge/api 1.224.2 → 1.229.1

package/src/devicesNotifications/devicesNotifications.controller.ts

@@ -1,56 +1,85 @@
-import httpStatus from 'http-status';
+// @ts-nocheck
+import httpStatus from "http-status";
 
-import pick from '../../src/utils/pick';
-import ApiError from '../../src/utils/ApiError';
-import catchAsync from '../../src/utils/catchAsync';
-import devicesNotificationsService from './devicesNotifications.service';
+import pick from "../../src/utils/pick";
+import ApiError from "../../src/utils/ApiError";
+import catchAsync from "../../src/utils/catchAsync";
+import devicesNotificationsService from "./devicesNotifications.service";
 
-import type { Request, Response } from 'express';
+import type { Request, Response } from "express";
 
 export const createEntry = catchAsync(async (req: Request, res: Response) => {
-  const user = await devicesNotificationsService.createNotification({ user: res.req.auth.sub, token: req.body.token });
+  const user = await devicesNotificationsService.createNotification({
+    user: res.req.auth.sub,
+    token: req.body.token,
+  });
   res.status(httpStatus.CREATED).send(user);
 });
 
-export const setDeviceToken = catchAsync(async (req: Request, res: Response) => {
-  const user = await devicesNotificationsService.setDeviceToken({ user: res.req.auth.sub, body: req.body });
-  res.status(httpStatus.CREATED).send(user);
-});
+export const setDeviceToken = catchAsync(
+  async (req: Request, res: Response) => {
+    const user = await devicesNotificationsService.setDeviceToken({
+      user: res.req.auth.sub,
+      body: req.body,
+    });
+    res.status(httpStatus.CREATED).send(user);
+  },
+);
 
-export const removeDeviceToken = catchAsync(async (req: Request, res: Response) => {
-  const user = await devicesNotificationsService.removeDeviceToken({ user: res.req.auth.sub, body: req.body });
-  res.status(httpStatus.CREATED).send(user);
-});
+export const removeDeviceToken = catchAsync(
+  async (req: Request, res: Response) => {
+    const user = await devicesNotificationsService.removeDeviceToken({
+      user: res.req.auth.sub,
+      body: req.body,
+    });
+    res.status(httpStatus.CREATED).send(user);
+  },
+);
 
 export const getEntries = catchAsync(async (req: Request, res: Response) => {
-  const filter = pick(req.query, ['name', 'role']);
-  const options = pick(req.query, ['sortBy', 'limit', 'page']);
-  const result = await devicesNotificationsService.queryNotifications(filter, options);
+  const filter = pick(req.query, ["name", "role"]);
+  const options = pick(req.query, ["sortBy", "limit", "page"]);
+  const result = await devicesNotificationsService.queryNotifications(
+    filter,
+    options,
+  );
   res.send(result);
 });
 
-export const queryNotificationsByUser = catchAsync(async (req: Request, res: Response) => {
-  const filter = pick({ user: res.req.auth.sub }, ['user']);
-  const options = pick(req.query, ['sortBy', 'limit', 'page']);
-  const result = await devicesNotificationsService.queryNotificationsByUser(filter, options);
-  res.send(result);
-});
+export const queryNotificationsByUser = catchAsync(
+  async (req: Request, res: Response) => {
+    const filter = pick({ user: res.req.auth.sub }, ["user"]);
+    const options = pick(req.query, ["sortBy", "limit", "page"]);
+    const result = await devicesNotificationsService.queryNotificationsByUser(
+      filter,
+      options,
+    );
+    res.send(result);
+  },
+);
 
 export const getEntry = catchAsync(async (req: Request, res: Response) => {
-  const notification = await devicesNotificationsService.getById(req.params.notificationId);
+  const notification = await devicesNotificationsService.getById(
+    req.params.notificationId,
+  );
   if (!notification) {
-    throw new ApiError(httpStatus.NOT_FOUND, 'Notification not found');
+    throw new ApiError(httpStatus.NOT_FOUND, "Notification not found");
   }
   res.send(notification);
 });
 
 export const updateEntry = catchAsync(async (req: Request, res: Response) => {
-  const user = await devicesNotificationsService.updateById(req.params.notificationId, req.body);
+  const user = await devicesNotificationsService.updateById(
+    req.params.notificationId,
+    req.body,
+  );
   res.send(user);
 });
 
 export const deleteEntry = catchAsync(async (req: Request, res: Response) => {
-  const entry = await devicesNotificationsService.deleteById(req.params.notificationId);
+  const entry = await devicesNotificationsService.deleteById(
+    req.params.notificationId,
+  );
   res.send(entry);
 });
 

package/src/devicesNotifications/devicesNotifications.model.ts

@@ -1,6 +1,7 @@
-import mongoose, { Schema, Document, Model } from 'mongoose';
-import type { PaginateModel } from 'mongoose';
-import { toJSON, paginate } from '../../src/models/plugins/index';
+// @ts-nocheck
+import mongoose, { Schema, Document, Model } from "mongoose";
+import type { PaginateModel } from "mongoose";
+import { toJSON, paginate } from "../../src/models/plugins/index";
 
 interface Token {
   token: string;
@@ -11,7 +12,7 @@ interface Token {
 
 interface Settings {
   intake: { email: boolean; push: boolean };
-  'intake-reminder': { email: boolean; push: boolean };
+  "intake-reminder": { email: boolean; push: boolean };
   battery: { email: boolean; push: boolean };
 }
 
@@ -24,7 +25,8 @@ export interface DeviceNotificationDocument extends Document {
   updatedAt: Date;
 }
 
-export type DeviceNotificationModel = Model<DeviceNotificationDocument> & PaginateModel<DeviceNotificationDocument>;
+export type DeviceNotificationModel = Model<DeviceNotificationDocument> &
+  PaginateModel<DeviceNotificationDocument>;
 
 const deviceNotificationSchema = new Schema<DeviceNotificationDocument>(
   {
@@ -42,12 +44,18 @@ const deviceNotificationSchema = new Schema<DeviceNotificationDocument>(
     ],
     bounceEmail: { type: String },
     settings: {
-      intake: { email: { type: Boolean, default: true }, push: { type: Boolean, default: true } },
-      'intake-reminder': {
+      intake: {
+        email: { type: Boolean, default: true },
+        push: { type: Boolean, default: true },
+      },
+      "intake-reminder": {
+        email: { type: Boolean, default: true },
+        push: { type: Boolean, default: true },
+      },
+      battery: {
         email: { type: Boolean, default: true },
         push: { type: Boolean, default: true },
       },
-      battery: { email: { type: Boolean, default: true }, push: { type: Boolean, default: true } },
     },
   },
   {
@@ -59,9 +67,9 @@ const deviceNotificationSchema = new Schema<DeviceNotificationDocument>(
 deviceNotificationSchema.plugin(toJSON);
 deviceNotificationSchema.plugin(paginate);
 
-const DeviceNotifications = mongoose.model<DeviceNotificationDocument, DeviceNotificationModel>(
-  'DeviceNotification',
-  deviceNotificationSchema,
-);
+const DeviceNotifications = mongoose.model<
+  DeviceNotificationDocument,
+  DeviceNotificationModel
+>("DeviceNotification", deviceNotificationSchema);
 
 export default DeviceNotifications;

package/src/devicesNotifications/devicesNotifications.service.ts

@@ -1,20 +1,31 @@
-import httpStatus from 'http-status';
-import { SESv2Client, ListSuppressedDestinationsCommand } from '@aws-sdk/client-sesv2';
-import DeviceNotification from './devicesNotifications.model';
-import ApiError from '../../src/utils/ApiError';
-import { auth0 } from '../accounts/auth0.service';
-
-import type { Notification } from './devicesNotifications.model';
-import type { FilterQuery, PaginateOptions, QueryResult } from 'mongoose';
+// @ts-nocheck
+import httpStatus from "http-status";
+import {
+  SESv2Client,
+  ListSuppressedDestinationsCommand,
+} from "@aws-sdk/client-sesv2";
+import DeviceNotification from "./devicesNotifications.model";
+import ApiError from "../../src/utils/ApiError";
+import { auth0 } from "../accounts/auth0.service";
+import type { Notification } from "./devicesNotifications.model";
+import type { FilterQuery, PaginateOptions, QueryResult } from "mongoose";
 
 /**
  * Create a user
  * @param {Object} userBody
  * @returns {Promise<Notification>}
  */
-export const createNotificationUser = async ({ user }: { user: string }): Promise<Notification> => {
+export const createNotificationUser = async ({
+  user,
+}: {
+  user: string;
+}): Promise<Notification> => {
   const result = await DeviceNotification.findOne({ user });
-  if (result) throw new ApiError(httpStatus.NOT_FOUND, 'DevicesNotifications user existing');
+  if (result)
+    throw new ApiError(
+      httpStatus.NOT_FOUND,
+      "DevicesNotifications user existing",
+    );
   const devicesNotification = await DeviceNotification.create({ user });
   return devicesNotification;
 };
@@ -37,7 +48,9 @@ export const setDeviceToken = async ({
     result = await createNotificationUser({ user });
   }
 
-  result.tokens = [...new Map(result.tokens.map((m) => [m.deviceId, m])).values()];
+  result.tokens = [
+    ...new Map(result.tokens.map((m) => [m.deviceId, m])).values(),
+  ];
 
   if (result.tokens.find((t) => t.token === token)) return result;
 
@@ -120,7 +133,7 @@ const getByUser = async (user) => {
 const updateById = async (notificationId, updateBody) => {
   const user = await getById(notificationId);
   if (!user) {
-    throw new ApiError(httpStatus.NOT_FOUND, 'Notification not found');
+    throw new ApiError(httpStatus.NOT_FOUND, "Notification not found");
   }
   Object.assign(user, updateBody);
   await user.save();
@@ -148,7 +161,7 @@ const updateByUserId = async (user, updateBody) => {
 const deleteById = async (userId) => {
   const user = await getById(userId);
   if (!user) {
-    throw new ApiError(httpStatus.NOT_FOUND, 'Notification not found');
+    throw new ApiError(httpStatus.NOT_FOUND, "Notification not found");
   }
   await user.deleteOne();
   return user;
@@ -164,17 +177,22 @@ const cleanup = async () => {
 
   const auth0Users = await auth0.getUsers();
 
-  const sesV2 = new SESv2Client({ region: 'eu-central-1' });
+  const sesV2 = new SESv2Client({ region: "eu-central-1" });
   const input = {
-    Reasons: ['BOUNCE' || 'COMPLAINT'],
+    Reasons: ["BOUNCE" || "COMPLAINT"],
     PageSize: 300,
   };
 
   const command = new ListSuppressedDestinationsCommand(input);
   const suppressedDestinations = await sesV2.send(command);
 
-  const suppressedEmailList = suppressedDestinations.SuppressedDestinationSummaries.map((a) => a.EmailAddress);
-  const suppressedEmailAuth0Users = auth0Users.filter((a) => suppressedEmailList.includes(a.email));
+  const suppressedEmailList =
+    suppressedDestinations.SuppressedDestinationSummaries.map(
+      (a) => a.EmailAddress,
+    );
+  const suppressedEmailAuth0Users = auth0Users.filter((a) =>
+    suppressedEmailList.includes(a.email),
+  );
   await Promise.all(
     suppressedEmailAuth0Users.map(async (a) => {
       updateByUserId(a.user_id, { bounceEmail: a.email });

package/src/files/upload.service.ts

@@ -1,10 +1,11 @@
-import { S3Client, GetObjectCommand } from '@aws-sdk/client-s3';
-import { Upload } from '@aws-sdk/lib-storage';
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
-import multer from 'multer';
-import multerS3 from 'multer-s3';
-import fs from 'fs';
-import request from 'request';
+// @ts-nocheck
+import { S3Client, GetObjectCommand } from "@aws-sdk/client-s3";
+import { Upload } from "@aws-sdk/lib-storage";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+import multer from "multer";
+import multerS3 from "multer-s3";
+import fs from "fs";
+import request from "request";
 
 type GetSignedFileUrlParams = {
   fileName: string;
@@ -18,7 +19,7 @@ type UploadImageParams = {
 };
 
 const s3 = new S3Client({
-  region: 'eu-central-1',
+  region: "eu-central-1",
   credentials: {
     accessKeyId: process.env.AWS_ACCESS_KEY_ID!,
     secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY!,
@@ -39,7 +40,10 @@ export const getSignedFileUrl = async ({
   return result;
 };
 
-export const uploadImage = async ({ key, blob }: UploadImageParams): Promise<{ hello: string }> => {
+export const uploadImage = async ({
+  key,
+  blob,
+}: UploadImageParams): Promise<{ hello: string }> => {
   const target = {
     Bucket: process.env.AWS_S3_BUCKET_NAME!,
     Key: key,
@@ -54,7 +58,7 @@ export const uploadImage = async ({ key, blob }: UploadImageParams): Promise<{ h
       params: target,
     });
 
-    parallelUploads3.on('httpUploadProgress', (progress) => {
+    parallelUploads3.on("httpUploadProgress", (progress) => {
       // console.log(progress);
     });
 
@@ -63,14 +67,18 @@ export const uploadImage = async ({ key, blob }: UploadImageParams): Promise<{ h
     console.error(e);
   }
 
-  return { hello: 'xx' };
+  return { hello: "xx" };
 };
 
-export const fileFilter = (req: Express.Request, file: Express.Multer.File, cb: multer.FileFilterCallback): void => {
-  if (file.mimetype === 'image/jpeg' || file.mimetype === 'image/png') {
+export const fileFilter = (
+  req: Express.Request,
+  file: Express.Multer.File,
+  cb: multer.FileFilterCallback,
+): void => {
+  if (file.mimetype === "image/jpeg" || file.mimetype === "image/png") {
     cb(null, true);
   } else {
-    cb(new Error('Invalid file type, only JPEG and PNG is allowed!'), false);
+    cb(new Error("Invalid file type, only JPEG and PNG is allowed!"), false);
   }
 };
 
@@ -79,7 +87,7 @@ export const uploadFile = multer({
     s3: s3,
     bucket: process.env.AWS_S3_BUCKET_NAME!,
     contentType: multerS3.AUTO_CONTENT_TYPE,
-    acl: 'public-read',
+    acl: "public-read",
     metadata(req, file, cb) {
       cb(null, { fieldName: file.fieldname });
     },
@@ -89,7 +97,10 @@ export const uploadFile = multer({
   }),
 });
 
-const getPhoto = async (photoId: string, res: Express.Response): Promise<void> => {
+const getPhoto = async (
+  photoId: string,
+  res: Express.Response,
+): Promise<void> => {
   try {
     const params = {
       Bucket: process.env.AWS_S3_BUCKET_NAME!,
@@ -98,9 +109,9 @@ const getPhoto = async (photoId: string, res: Express.Response): Promise<void> =
 
     await s3
       .getObject(params)
-      .on('httpHeaders', function (statusCode, headers) {
-        res.set('Content-Length', headers['content-length']);
-        res.set('Content-Type', headers['content-type']);
+      .on("httpHeaders", function (statusCode, headers) {
+        res.set("Content-Length", headers["content-length"]);
+        res.set("Content-Type", headers["content-type"]);
         this.response.httpResponse.createUnbufferedStream().pipe(res);
       })
       .send();
@@ -109,20 +120,27 @@ const getPhoto = async (photoId: string, res: Express.Response): Promise<void> =
   }
 };
 
-const download = (uri: string, filename: string, callback: () => void): void => {
+const download = (
+  uri: string,
+  filename: string,
+  callback: () => void,
+): void => {
   request.head(uri, (err, res, body) => {
     if (err) {
       console.error(err);
       return;
     }
-    console.log('content-type:', res.headers['content-type']);
-    console.log('content-length:', res.headers['content-length']);
+    console.log("content-type:", res.headers["content-type"]);
+    console.log("content-length:", res.headers["content-length"]);
 
-    request(uri).pipe(fs.createWriteStream(filename)).on('close', callback);
+    request(uri).pipe(fs.createWriteStream(filename)).on("close", callback);
   });
 };
 
-const getPhotoFromUserImage = async (photoId: string, res: Express.Response): Promise<void> => {
+const getPhotoFromUserImage = async (
+  photoId: string,
+  res: Express.Response,
+): Promise<void> => {
   try {
     const params = {
       Bucket: process.env.AWS_S3_BUCKET_NAME!,
@@ -131,9 +149,9 @@ const getPhotoFromUserImage = async (photoId: string, res: Express.Response): Pr
 
     await s3
       .getObject(params)
-      .on('httpHeaders', function (statusCode, headers) {
-        res.set('Content-Length', headers['content-length']);
-        res.set('Content-Type', headers['content-type']);
+      .on("httpHeaders", function (statusCode, headers) {
+        res.set("Content-Length", headers["content-length"]);
+        res.set("Content-Type", headers["content-type"]);
         this.response.httpResponse.createUnbufferedStream().pipe(res);
       })
       .send();
@@ -142,4 +160,10 @@ const getPhotoFromUserImage = async (photoId: string, res: Express.Response): Pr
   }
 };
 
-export default { uploadFile, uploadImage, getPhoto, getPhotoFromUserImage, getSignedFileUrl };
+export default {
+  uploadFile,
+  uploadImage,
+  getPhoto,
+  getPhotoFromUserImage,
+  getSignedFileUrl,
+};

package/src/i18n/i18n.ts

@@ -5,7 +5,7 @@ import { existsSync, readdirSync } from "fs";
 import i18next from "i18next";
 import Backend, { setLocalesFolder } from "./saveMissingLocalJsonBackend";
 
-import config from "@wirewire/openiot-api/src/config/config";
+import config from "../config/config";
 
 // Fix for __dirname in ES modules
 const __filename = fileURLToPath(import.meta.url);
@@ -25,7 +25,7 @@ export function initI18n(options: InitI18nOptions = {}): typeof i18next {
   const hasLocalesFolder = existsSync(localesFolder);
 
   if (!i18next.isInitialized) {
-    i18next.use(Backend).init({
+    i18next.use(Backend as any).init({
       initImmediate: false, // setting initImmediate to false, will load the resources synchronously
       fallbackLng: "de",
       preload: hasLocalesFolder

package/src/i18n/types.ts

@@ -0,0 +1 @@
+export type Callback = (error: unknown, data?: unknown) => void;

package/src/index.ts

@@ -1,7 +1,54 @@
+export { default as config } from "../src/config/config";
+export { default as logger } from "../src/config/logger";
+export { default as morgan } from "../src/config/morgan";
+export { default as auth } from "../src/middlewares/auth";
+export { errorConverter, errorHandler } from "../src/middlewares/error";
+export { default as validate } from "../src/middlewares/validate";
+export {
+  validateDevice,
+  validateDeviceIsInOrganization,
+  validateDeviceOrOrganizationQuery,
+  validateDeviceQuery,
+} from "../src/middlewares/validateDevice";
+export { initI18n } from "../src/i18n/i18n";
 export { default as usersRoute } from "../src/users/users.route";
 export { default as accountsRoute } from "../src/accounts/accounts.route";
+export { default as accountsService } from "../src/accounts/accounts.service";
 export { default as organizationsRoute } from "../src/organizations/organizations.route";
+export { default as organizationsService } from "../src/organizations/organizations.service";
+export { default as Organization } from "../src/organizations/organizations.model";
 export { default as devicesRoute } from "../src/devices/devices.route";
+export { default as devicesService } from "../src/devices/devices.service";
+export { default as Device } from "../src/devices/devices.model";
+export * from "../src/devices/devices.validation";
 export { default as devicesNotificationsRoute } from "./devicesNotifications/devicesNotifications.route";
+export { default as devicesNotificationsService } from "../src/devicesNotifications/devicesNotifications.service";
+export { default as iotDevicesService } from "../src/iotdevice/iotdevice.service";
+export { SIMILARITY_THRESHOLD } from "../src/iotdevice/iotdevice.service";
 export { default as pdfRoute } from "../src/pdf/pdf.route";
 export { default as tokensRoute } from "../src/tokens/tokens.route";
+export * from "../src/tokens/tokens.service";
+export { default as Token } from "../src/tokens/tokens.model";
+export * as usersService from "../src/users/users.service";
+export { User } from "../src/users/users.model";
+export { isAdmin, validateAdmin } from "../src/middlewares/validateAdmin";
+export { sendEmail } from "../src/email/email.service";
+export { default as catchAsync } from "../src/utils/catchAsync";
+export { default as buildRouterAndDocs } from "../src/utils/buildRouterAndDocs";
+export type { RouteSpec } from "../src/utils/buildRouterAndDocs";
+export { default as pick } from "../src/utils/pick";
+export { paginate, toJSON } from "../src/models/plugins/index";
+export { compareImages } from "../src/utils/comparePapers.service";
+export { resolvePossiblyRelativeUrl } from "../src/utils/urlUtils";
+export { getSignedFileUrl } from "../src/files/upload.service";
+export * from "../src/utils/ApiError";
+export * from "../src/utils/buildRouterAndDocs";
+export * from "../src/utils/comparePapers.service";
+export * from "../src/utils/deviceUtils";
+export * from "../src/utils/filterOptions";
+export * from "../src/utils/medicationName";
+export * from "../src/utils/pick";
+export * from "../src/utils/registerOpenApi";
+export * from "../src/utils/urlUtils";
+export * from "../src/utils/userName";
+export * from "../src/utils/zValidations";

package/src/iotdevice/iotdevice.controller.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import type { Request, Response } from "express";
 import catchAsync from "../utils/catchAsync";
 import devicesService from "../devices/devices.service";

package/src/iotdevice/iotdevice.model.ts

@@ -1,5 +1,6 @@
-import mongoose, { Schema, Document, Model } from 'mongoose';
-import { toJSON, paginate } from '../models/plugins/index';
+// @ts-nocheck
+import mongoose, { Schema, Document, Model } from "mongoose";
+import { toJSON, paginate } from "../models/plugins/index";
 
 interface IotDeviceMeta {
   [key: string]: any;
@@ -27,6 +28,8 @@ const iotDeviceSchema: Schema<IotDevice> = new mongoose.Schema(
 iotDeviceSchema.plugin(toJSON);
 iotDeviceSchema.plugin(paginate);
 
-export const IotDevices: Model<IotDevice> = mongoose.model<IotDevice>('IotDevice', iotDeviceSchema);
+export const IotDevices: Model<IotDevice> =
+  (mongoose.models.IotDevice as Model<IotDevice>) ||
+  mongoose.model<IotDevice>("IotDevice", iotDeviceSchema);
 
 export default IotDevices;