@autofleet/sadot 1.1.5-beta → 1.1.6-beta

package/dist/repository/validator.d.ts

@@ -22,6 +22,7 @@ export declare const findAll: (where?: {}, options?: FindOptions & {
 }) => Promise<CustomValidator[]>;
 export declare const findAllByModelType: (modelType: string, entityId: string, options?: FindOptions & {
     modelOptions?: ModelOptions;
+    withDisabled?: boolean;
 }) => Promise<CustomValidator[]>;
 export declare const update: (id: string, updates: Partial<ValidatorAttributes>, options?: Transactionable) => Promise<[number, CustomValidator[]]>;
 export declare const disable: (id: string, options?: Transactionable) => Promise<[number, CustomValidator[]]>;

package/dist/types/index.d.ts

@@ -14,7 +14,7 @@ export type ModelOptions = {
     /**
      * Include options for the model
      */
-    include?: (entityIds: string[] | string) => IncludeOptions[];
+    include?: (entityIds: string | string[]) => IncludeOptions[];
     /**
       * Custom association for the model
       * @param model - The model to associate with

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "1.1.5-beta",
+  "version": "1.1.6-beta",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/hooks/hooks.ts

@@ -169,10 +169,7 @@ const validateModel = async (
       {
         transaction: options.transaction,
         attributes: CUSTOM_VALIDATOR_ATTRIBUTES_TO_PULL,
-        ...(modelOptions.include && {
-          include: modelOptions.include?.(entityId),
-        }),
-        raw: true,
+        modelOptions,
       },
     );
     if (options.transaction) {

package/src/repository/validator.ts

@@ -1,6 +1,7 @@
-import type { IncludeOptions, Transactionable } from 'sequelize';
+import type { FindOptions, IncludeOptions, Transactionable } from 'sequelize';
 import logger from '../utils/logger';
 import { CustomValidator } from '../models';
+import type { ModelOptions } from '../types';
 
 export interface FindValidatorOptions extends Transactionable {
   withDisabled?: boolean;
@@ -33,11 +34,16 @@ export const create = async (
 
 export const findAll = async (
   where = {},
-  options: FindValidatorOptions = { withDisabled: false },
+  options: FindOptions & {
+    modelOptions?: ModelOptions,
+     withDisabled?: boolean
+    } = {},
 ): Promise<CustomValidator[]> => {
   logger.debug('custom-validator - find all validators');
 
-  const { transaction, withDisabled } = options;
+  const {
+    transaction, withDisabled, include, attributes, raw,
+  } = options;
 
   let validators;
   if (withDisabled) {
@@ -46,6 +52,9 @@ export const findAll = async (
     validators = await CustomValidator.unscoped().scope('userScope').findAll({
       where,
       transaction,
+      include,
+      attributes,
+      raw,
     });
   } else {
     // Use defaultScope and userScope to filter both disabled and by permissions
@@ -53,6 +62,9 @@ export const findAll = async (
     validators = await CustomValidator.scope(['defaultScope', 'userScope']).findAll({
       where,
       transaction,
+      include,
+      attributes,
+      raw,
     });
   }
 
@@ -62,18 +74,21 @@ export const findAll = async (
 export const findAllByModelType = async (
   modelType: string,
   entityId: string,
-  options: FindValidatorOptions = { withDisabled: false },
+  options: FindOptions & {
+    modelOptions?: ModelOptions,
+    withDisabled?: boolean
+  } = {},
 ): Promise<CustomValidator[]> => {
   logger.debug('custom-validator - find all validators by model type');
-
   return findAll(
     {
       modelType,
-      ...(!options.include && {
-        entityId,
-      }),
+      ...(!options?.modelOptions?.useEntityIdFromInclude && { entityId }),
+    },
+    {
+      ...options,
+      include: options?.modelOptions?.include?.(entityId),
     },
-    options,
   );
 };
 

package/src/types/index.ts

@@ -17,7 +17,7 @@ export type ModelOptions = {
   /**
    * Include options for the model
    */
-  include?: (entityIds: string[]) => IncludeOptions[];
+  include?: (entityIds: string | string[]) => IncludeOptions[];
   /**
     * Custom association for the model
     * @param model - The model to associate with

package/src/utils/init.ts

@@ -5,6 +5,7 @@ import { CUSTOM_FIELDS_SORT_SCOPE } from '@autofleet/common-types/lib/custom-fie
 import {
   CustomFieldDefinition,
   CustomFieldValue,
+  CustomValidator,
 } from '../models';
 import {
   beforeFind,
@@ -116,5 +117,6 @@ export const addScopes = (models: Models[], getModel: ModelFetcher, options: Pic
 export const applyCustomAssociation = (models: Models[]): void => {
   models.forEach(({ modelOptions }) => {
     modelOptions?.customAssociation?.(CustomFieldDefinition);
+    modelOptions?.customAssociation?.(CustomValidator);
   });
 };