@autofleet/sadot 0.5.4-beta.9 → 0.5.5-beta.0

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

@@ -41,7 +41,6 @@ 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({
@@ -84,9 +83,7 @@ router.get('/', async (req, res) => {
         if (entityIds?.length > 0) {
             where.entityId = entityIds;
         }
-        logger_1.default.info('sadot Fetching custom field definitions', { modelType, entityIds, where });
-        const customFieldDefinitions = await DefinitionRepo.findAll(where, { withDisabled: true });
-        logger_1.default.info('sadot Fetched custom field definitions customFieldDefinitions', { customFieldDefinitions });
+        const customFieldDefinitions = await DefinitionRepo.findAll({ ...where }, { withDisabled: true });
         return res.json(customFieldDefinitions);
     }
     catch (err) {

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import type { Application } from 'express';
 import { Sequelize } from 'sequelize-typescript';
+import { WhereOptions } from 'sequelize';
 import type { CustomFieldOptions, ModelFetcher } from './types';
 export * from './utils/validations/custom-fields';
 export * from './utils/constants';
@@ -10,3 +11,4 @@ export * from './utils/constants';
 declare const useCustomFields: (app: Application | null, getModel: ModelFetcher, options: CustomFieldOptions) => Promise<Sequelize>;
 export default useCustomFields;
 export declare const disableCustomFields: (models: any, getModel: any) => void;
+export declare const buildCustomFieldsSearchLiteral: (modelName: string, searchTerm: string) => WhereOptions;

package/dist/index.js

@@ -17,7 +17,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.disableCustomFields = void 0;
+exports.buildCustomFieldsSearchLiteral = exports.disableCustomFields = void 0;
+const sequelize_typescript_1 = require("sequelize-typescript");
 const models_1 = require("./models");
 const api_1 = __importDefault(require("./api"));
 const db_1 = __importDefault(require("./utils/db"));
@@ -32,7 +33,7 @@ __exportStar(require("./utils/constants"), exports);
 const useCustomFields = async (app, getModel, options) => {
     const { models } = options;
     if (app) {
-        app.use('/api', options.middleware, api_1.default);
+        app.use('/api', api_1.default);
     }
     const sequelize = (0, db_1.default)(options.databaseConfig);
     if (process.env.NODE_ENV === 'test') {
@@ -50,3 +51,8 @@ const disableCustomFields = (models, getModel) => {
     (0, init_1.removeHooks)(models, getModel);
 };
 exports.disableCustomFields = disableCustomFields;
+const buildCustomFieldsSearchLiteral = (modelName, searchTerm) => sequelize_typescript_1.Sequelize.literal(`EXISTS (SELECT 1 FROM "custom_field_values" AS "cv" 
+               WHERE "cv"."deleted_at" IS NULL 
+               AND "cv"."model_id" = "${modelName}"."id" 
+               AND CAST("cv"."value" AS TEXT) ILIKE '%${searchTerm}%')`);
+exports.buildCustomFieldsSearchLiteral = buildCustomFieldsSearchLiteral;

package/dist/models/index.js

@@ -31,7 +31,6 @@ const initTables = async (sequelize, getUser) => {
     CustomFieldDefinition_1.default.addScope('userScope', () => {
         const user = getUser();
         if (user?.permissions) {
-            console.log('custom fields scope added', { user, permissions: user.permissions });
             return {
                 where: {
                     entityId: [

package/dist/repository/definition.js

@@ -13,7 +13,6 @@ const findAll = (where, options = { withDisabled: false }) => {
         where,
         transaction: options.transaction,
         raw: true,
-        logging: console.log,
     });
 };
 exports.findAll = findAll;

package/dist/types/index.d.ts

@@ -1,4 +1,3 @@
-import { RequestHandler } from 'express';
 export type ModelFetcher = (name: string) => any;
 export type ModelOptions = {
     name: string;
@@ -11,5 +10,4 @@ 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.9",
+  "version": "0.5.5-beta.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -9,24 +9,7 @@
     "linter": "./node_modules/.bin/eslint .",
     "test": "jest --forceExit --runInBand",
     "coverage": "jest --coverage --forceExit --runInBand && rm -rf ./coverage",
-    "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
-    }
+    "dev": "nodemon"
   },
   "dependencies": {
     "@autofleet/common-types": "^1.7.29",
@@ -35,7 +18,6 @@
     "@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,7 +18,6 @@ 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);
@@ -59,17 +58,17 @@ router.get('/:customFieldDefinitionId', async (req, res) => {
 router.get('/', async (req, res) => {
   const { modelName } = req.params as any;
   const { entityIds } = req.query as any;
+
   const modelType = toPascalCase(modelName);
   try {
     const where: any = { modelType };
     if (entityIds?.length > 0) {
       where.entityId = entityIds;
     }
-
-    logger.info('sadot Fetching custom field definitions', { modelType, entityIds, where });
-    const customFieldDefinitions = await DefinitionRepo.findAll(where,
-      { withDisabled: true });
-    logger.info('sadot Fetched custom field definitions customFieldDefinitions', { customFieldDefinitions });
+    const customFieldDefinitions = await DefinitionRepo.findAll(
+      { ...where },
+      { withDisabled: true },
+    );
     return res.json(customFieldDefinitions);
   } catch (err) {
     logger.error('Failed to fetch custom field definitions', err);

package/src/index.ts

@@ -1,5 +1,6 @@
 import type { Application } from 'express';
 import { Sequelize } from 'sequelize-typescript';
+import { WhereOptions } from 'sequelize';
 import {
   initTables, initTestModels,
 } from './models';
@@ -24,7 +25,7 @@ const useCustomFields = async (
 ): Promise<Sequelize> => {
   const { models } = options;
   if (app) {
-    app.use('/api', options.middleware, api);
+    app.use('/api', api);
   }
   const sequelize = initDB(options.databaseConfig);
   if (process.env.NODE_ENV === 'test') {
@@ -43,3 +44,11 @@ export default useCustomFields;
 export const disableCustomFields = (models, getModel): void => {
   removeHooks(models, getModel);
 };
+
+export const buildCustomFieldsSearchLiteral = (
+  modelName: string,
+  searchTerm: string,
+) : WhereOptions => Sequelize.literal(`EXISTS (SELECT 1 FROM "custom_field_values" AS "cv" 
+               WHERE "cv"."deleted_at" IS NULL 
+               AND "cv"."model_id" = "${modelName}"."id" 
+               AND CAST("cv"."value" AS TEXT) ILIKE '%${searchTerm}%')`);

package/src/models/index.ts

@@ -26,7 +26,6 @@ const initTables = async (sequelize: Sequelize, getUser): Promise<void> => {
   CustomFieldDefinition.addScope('userScope', () => {
     const user = getUser();
     if (user?.permissions) {
-      console.log('custom fields scope added', { user, permissions: user.permissions });
       return {
         where: {
           entityId: [

package/src/repository/definition.ts

@@ -16,7 +16,6 @@ export const findAll = (
     where,
     transaction: options.transaction,
     raw: true,
-    logging: console.log,
   });
 };
 

package/src/types/index.ts

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

package/.env

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