@autofleet/sadot 0.5.4-beta.3 → 0.5.4-beta.5

package/.env

@@ -0,0 +1,3 @@
+DB_USERNAME=emiltayeb
+DB_PASSWORD=123456
+NODE_ENV=test

package/dist/api/v1/definition/index.js

@@ -41,6 +41,7 @@ const toPascalCase = (str) => str.replace(/(^\w|-\w)/g, (subStr) => subStr.repla
 router.post('/', async (req, res) => {
     const { modelName } = req.params;
     const modelType = toPascalCase(modelName);
+    logger_1.default.info('sadot Creating custom field definition', { modelName });
     try {
         const validatedPayload = await (0, validations_1.validateCustomFieldDefinitionCreation)(req.body);
         const customFieldDefinition = await DefinitionRepo.create({
@@ -77,6 +78,7 @@ router.get('/:customFieldDefinitionId', async (req, res) => {
 router.get('/', async (req, res) => {
     const { modelName } = req.params;
     const { entityIds } = req.query;
+    logger_1.default.info('sadot Fetching custom field definitions', { modelName, entityIds });
     const modelType = toPascalCase(modelName);
     try {
         const where = { modelType };

package/dist/index.js

@@ -32,7 +32,7 @@ __exportStar(require("./utils/constants"), exports);
 const useCustomFields = async (app, getModel, options) => {
     const { models } = options;
     if (app) {
-        app.use('/api', api_1.default);
+        app.use('/api', options.middleware, api_1.default);
     }
     const sequelize = (0, db_1.default)(options.databaseConfig);
     if (process.env.NODE_ENV === 'test') {

package/dist/repository/value.js

@@ -73,12 +73,11 @@ exports.findValuesByModelIds = findValuesByModelIds;
  * Return the updated values
  */
 const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, options = {}) => {
+    logger_1.default.info(`custom-fields: updating values for ${modelType} ${modelId}`, { valuesToUpdate });
     const names = Object.keys(valuesToUpdate);
     const fieldDefinitions = await DefinitionRepo.findAll({ modelType, name: names, entityId: identifiers }, { withDisabled: true, transaction: options.transaction }) || [];
-    logger_1.default.info(`custom-fields: updating values for ${modelType} ${modelId}`, { valuesToUpdate, entityId: identifiers });
     const disabledDefinitions = fieldDefinitions.filter((def) => def.disabled);
     if (fieldDefinitions.length !== names.length) {
-        logger_1.default.info(`custom-fields: missing definitions for ${modelType} ${modelId}`, { names, fieldDefinitions });
         const missingDefinitions = names.filter((name) => !fieldDefinitions.some((def) => def.name === name));
         throw new errors_1.MissingDefinitionError(missingDefinitions);
     }

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
+import { RequestHandler } from 'express';
 export type ModelFetcher = (name: string) => any;
 export type ModelOptions = {
     name: string;
@@ -10,4 +11,5 @@ export type CustomFieldOptions = {
     models: ModelOptions[];
     databaseConfig: any;
     getUser: () => any;
+    middleware?: RequestHandler;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.5.4-beta.3",
+  "version": "0.5.4-beta.5",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -9,7 +9,24 @@
     "linter": "./node_modules/.bin/eslint .",
     "test": "jest --forceExit --runInBand",
     "coverage": "jest --coverage --forceExit --runInBand && rm -rf ./coverage",
-    "dev": "nodemon"
+    "build-to-local-repo": "npm run build && cp -r dist/* ../$REPO/node_modules/$npm_package_name/dist",
+    "dev": "nodemon",
+    "watch": "npm-watch build-to-local-repo"
+  },
+  "watch": {
+    "build-to-local-repo": {
+      "extensions": [
+        "js",
+        "jsx",
+        "ts",
+        "tsx",
+        "css"
+      ],
+      "patterns": [
+        "src"
+      ],
+      "quiet": false
+    }
   },
   "dependencies": {
     "@autofleet/common-types": "^1.7.29",
@@ -18,6 +35,7 @@
     "@autofleet/logger": "^2.0.5",
     "express": "^4.18.2",
     "joi": "^17.7.0",
+    "npm-watch": "^0.11.0",
     "pg": "^8.10.0",
     "reflect-metadata": "^0.1.13",
     "sequelize": "^6.31.1",

package/src/api/v1/definition/index.ts

@@ -18,6 +18,7 @@ const toPascalCase = (str: string): string => str.replace(/(^\w|-\w)/g, (subStr)
 router.post('/', async (req: Request, res: Response) => {
   const { modelName } = req.params as any;
   const modelType = toPascalCase(modelName);
+  logger.info('sadot Creating custom field definition', { modelName });
   try {
     const validatedPayload: CreateCustomFieldDefinition = await
     validateCustomFieldDefinitionCreation(req.body);
@@ -58,7 +59,7 @@ router.get('/:customFieldDefinitionId', async (req, res) => {
 router.get('/', async (req, res) => {
   const { modelName } = req.params as any;
   const { entityIds } = req.query as any;
-
+  logger.info('sadot Fetching custom field definitions', { modelName, entityIds });
   const modelType = toPascalCase(modelName);
   try {
     const where: any = { modelType };

package/src/index.ts

@@ -24,7 +24,7 @@ const useCustomFields = async (
 ): Promise<Sequelize> => {
   const { models } = options;
   if (app) {
-    app.use('/api', api);
+    app.use('/api', options.middleware, api);
   }
   const sequelize = initDB(options.databaseConfig);
   if (process.env.NODE_ENV === 'test') {

package/src/repository/value.ts

@@ -52,16 +52,16 @@ export const updateValues = async (
   valuesToUpdate: ValuesToUpdate,
   options: any = {},
 ): Promise<CustomFieldValue[]> => {
+  logger.info(`custom-fields: updating values for ${modelType} ${modelId}`, { valuesToUpdate });
+
   const names = Object.keys(valuesToUpdate);
   const fieldDefinitions = await DefinitionRepo.findAll(
     { modelType, name: names, entityId: identifiers },
     { withDisabled: true, transaction: options.transaction },
   ) || [];
 
-  logger.info(`custom-fields: updating values for ${modelType} ${modelId}`, { valuesToUpdate, entityId: identifiers });
   const disabledDefinitions = fieldDefinitions.filter((def) => def.disabled);
   if (fieldDefinitions.length !== names.length) {
-    logger.info(`custom-fields: missing definitions for ${modelType} ${modelId}`, { names, fieldDefinitions });
     const missingDefinitions = names.filter((name) => !fieldDefinitions.some((def) => def.name === name));
     throw new MissingDefinitionError(missingDefinitions);
   }

package/src/types/index.ts

@@ -1,3 +1,5 @@
+import { RequestHandler } from 'express';
+
 export type ModelFetcher = (name: string) => any;
 
 export type ModelOptions = {
@@ -8,8 +10,9 @@ export type ModelOptions = {
   deletionWebhookHandler?: (instance: any) => any;
 }
 
-export type CustomFieldOptions= {
+export type CustomFieldOptions = {
   models: ModelOptions[];
   databaseConfig: any;
   getUser: () => any;
+  middleware?: RequestHandler
 };