@autofleet/sadot 0.3.0-beta.9 → 0.3.1

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

@@ -57,11 +57,18 @@ 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 customFieldDefinitions = await DefinitionRepo.findAll({
-      modelType,
-    }, { withDisabled: true });
+    const where: any = { modelType };
+    if (entityIds?.length > 0) {
+      where.entityId = entityIds;
+    }
+    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 { DataTypes } from 'sequelize';
+import { Sequelize } from 'sequelize-typescript';
 import { initTables, initTestModels } from './models';
 import api from './api';
 import {
@@ -55,7 +56,7 @@ const useCustomFields = async (
   app: Application | null,
   getModel: ModelFetcher,
   options: CustomFieldOptions,
-): Promise<void> => {
+): Promise<Sequelize> => {
   const { models } = options;
   if (app) {
     app.use('/api', api);
@@ -67,6 +68,7 @@ const useCustomFields = async (
   addHooks(models, getModel);
   await initTables(sequelize, options.getUser);
   logger.debug('sadot - custom fields finished initializing with models', models);
+  return sequelize;
 };
 
 export default useCustomFields;

package/src/models/index.ts

@@ -41,41 +41,35 @@ const initTables = async (sequelize: Sequelize, getUser): Promise<void> => {
 
   logger.info('custom-fields: models added');
 
-  try {
-    const SequelizeMeta = sequelize.define(
-      'SequelizeMeta',
-      {
-        name: {
-          type: DataTypes.STRING,
-          allowNull: false,
-          unique: true,
-          primaryKey: true,
-          autoIncrement: false,
-        },
-      },
-      {
-        tableName: 'SequelizeMeta',
-        timestamps: false,
-        schema: 'public',
+  const SequelizeMeta = sequelize.define(
+    'SequelizeMeta',
+    {
+      name: {
+        type: DataTypes.STRING,
+        allowNull: false,
+        unique: true,
+        primaryKey: true,
+        autoIncrement: false,
       },
-    );
-    const migrations = await SequelizeMeta.findAll();
-    const currentSadotSchemaVersion = migrations
-      .reverse().find((m: any) => m.name.includes(SADOT_MIGRATION_PREFIX));
+    },
+    {
+      tableName: 'SequelizeMeta',
+      timestamps: false,
+      schema: 'public',
+    },
+  );
+  const migrations = await SequelizeMeta.findAll({ raw: true });
+  const currentSadotSchemaVersion = migrations
+    .reverse().find((m: any) => m.name.includes(SADOT_MIGRATION_PREFIX));
 
-    console.log('ANKRI', migrations);
-    console.log('ANKRI2', currentSadotSchemaVersion);
-
-    if (
-      !currentSadotSchemaVersion
-      || (currentSadotSchemaVersion as any).name !== CUSTOM_FIELDS_SCHEMA_VERSION
-    ) {
-      await CustomFieldDefinition.sync({ alter: true });
-      await CustomFieldValue.sync({ alter: true });
-      logger.info('custom-fields: models synced');
-    }
-  } catch (err) {
-    console.log('ANKRI ERROR', err);
+  if (
+    !currentSadotSchemaVersion
+    || (currentSadotSchemaVersion as any).name !== CUSTOM_FIELDS_SCHEMA_VERSION
+  ) {
+    await CustomFieldDefinition.sync({ alter: true });
+    await CustomFieldValue.sync({ alter: true });
+    await SequelizeMeta.create({ name: CUSTOM_FIELDS_SCHEMA_VERSION });
+    logger.info('custom-fields: models synced');
   }
 };
 

package/src/repository/value.ts

@@ -79,20 +79,12 @@ export const updateValues = async (
     customFieldDefinitionId: fieldDefinitions.find((def) => def.name === name).id,
   }));
 
-  return CustomFieldValue.bulkCreate(values, {
-    fields: ['modelId', 'value', 'updatedAt', 'customFieldDefinitionId'],
-    updateOnDuplicate: ['value', 'updatedAt'],
-    transaction: options.transaction,
-  });
-
-  /*
   return Promise.all(values.map(async (value) => {
     const [cfv] = await CustomFieldValue.upsert(value, {
       transaction: options.transaction,
     });
     return cfv;
   }));
-  */
 };
 
 export const deleteValue = (

package/src/utils/constants/index.ts

@@ -0,0 +1,2 @@
+// eslint-disable-next-line import/prefer-default-export
+export const supportedEntities = ['businessModelId', 'fleetId', 'demandSourceId'];

package/src/utils/db/index.ts

@@ -1,4 +1,5 @@
 import { Sequelize } from 'sequelize-typescript';
+import { QueryTypes } from 'sequelize';
 
 export default (databaseConfig: any): Sequelize => {
   const ENV_DEV = 'test';
@@ -12,3 +13,9 @@ export default (databaseConfig: any): Sequelize => {
   }
   return sequelize;
 };
+
+export const createSequelizeMeta = (sequelize: Sequelize) => sequelize.query(`
+CREATE TABLE IF NOT EXISTS "SequelizeMeta" (
+  name character varying(255) PRIMARY KEY
+);
+`, { type: QueryTypes.SELECT });