@autofleet/sadot 1.6.18-beta.20 → 1.6.18-beta.22

package/dist/api/v1/field-policies/index.cjs

@@ -1,7 +1,6 @@
 const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
 const require_index = require('../../../utils/logger/index.cjs');
 const require_errors = require('../errors.cjs');
-const require_mat_path_state = require('../../../mat-path-state.cjs');
 const require_field_policy = require('../../../repository/field-policy.cjs');
 let sequelize = require("sequelize");
 let _autofleet_node_common = require("@autofleet/node-common");
@@ -12,18 +11,7 @@ const router = (0, _autofleet_node_common.Router)({
 	mergeParams: true
 });
 router.get("/effective", async (req, res) => {
-	const { withMatPath } = require_mat_path_state.matPathState;
-	if (!withMatPath) return res.status(501).json({ error: "Effective field policy resolution is not configured" });
-	const entityType = req.params.entityType;
-	try {
-		const [policy] = await require_field_policy.findEffectivePolicy(entityType);
-		return res.status(200).json(policy ?? null);
-	} catch (err) {
-		return require_errors.default(err, res, {
-			logger: require_index.default,
-			message: "Error resolving effective field policy"
-		});
-	}
+	return res.status(200);
 });
 router.get("/", async (_req, res) => {
 	try {

package/dist/api/v1/field-policies/index.js

@@ -1,7 +1,6 @@
 import logger_default from "../../../utils/logger/index.js";
 import errors_default from "../errors.js";
-import { matPathState } from "../../../mat-path-state.js";
-import { create, findAll, findEffectivePolicy, remove, update } from "../../../repository/field-policy.js";
+import { create, findAll, remove, update } from "../../../repository/field-policy.js";
 import { UniqueConstraintError } from "sequelize";
 import { Router } from "@autofleet/node-common";
 
@@ -11,18 +10,7 @@ const router = Router({
 	mergeParams: true
 });
 router.get("/effective", async (req, res) => {
-	const { withMatPath } = matPathState;
-	if (!withMatPath) return res.status(501).json({ error: "Effective field policy resolution is not configured" });
-	const entityType = req.params.entityType;
-	try {
-		const [policy] = await findEffectivePolicy(entityType);
-		return res.status(200).json(policy ?? null);
-	} catch (err) {
-		return errors_default(err, res, {
-			logger: logger_default,
-			message: "Error resolving effective field policy"
-		});
-	}
+	return res.status(200);
 });
 router.get("/", async (_req, res) => {
 	try {

package/dist/api/v1/validator/index.cjs

@@ -57,7 +57,20 @@ router.get("/", async (req, res) => {
 /**
 * Effective
 */
-router.get("/effective", (_req, res) => res.status(http_status_codes.StatusCodes.OK).json({ ok: true }));
+router.get("/effective", async (req, res) => {
+	const { withMatPath } = require_mat_path_state.matPathState;
+	if (!withMatPath) return res.status(http_status_codes.StatusCodes.NOT_IMPLEMENTED).json({ error: "Effective validator resolution is not configured" });
+	try {
+		const { modelName } = req.params;
+		const [validator] = await require_validator.findEffective(modelName, "AF.1");
+		return res.status(http_status_codes.StatusCodes.OK).json(validator ?? null);
+	} catch (err) {
+		return require_errors.default(err, res, {
+			logger: require_index.default,
+			message: `Error resolving effective ${ENTITY}`
+		});
+	}
+});
 /**
 * Get by id
 */

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

@@ -1,7 +1,7 @@
 import logger_default from "../../../utils/logger/index.js";
 import errors_default from "../errors.js";
 import { matPathState } from "../../../mat-path-state.js";
-import { create, disable, findAll, update } from "../../../repository/validator.js";
+import { create, disable, findAll, findEffective, update } from "../../../repository/validator.js";
 import validations_default from "./validations.js";
 import { validateValidatorSchema } from "../../../utils/validations/schema/validator-schema.js";
 import { ResourceNotFoundError } from "@autofleet/errors";
@@ -56,7 +56,20 @@ router.get("/", async (req, res) => {
 /**
 * Effective
 */
-router.get("/effective", (_req, res) => res.status(StatusCodes.OK).json({ ok: true }));
+router.get("/effective", async (req, res) => {
+	const { withMatPath } = matPathState;
+	if (!withMatPath) return res.status(StatusCodes.NOT_IMPLEMENTED).json({ error: "Effective validator resolution is not configured" });
+	try {
+		const { modelName } = req.params;
+		const [validator] = await findEffective(modelName, "AF.1");
+		return res.status(StatusCodes.OK).json(validator ?? null);
+	} catch (err) {
+		return errors_default(err, res, {
+			logger: logger_default,
+			message: `Error resolving effective ${ENTITY}`
+		});
+	}
+});
 /**
 * Get by id
 */

package/dist/repository/field-policy.cjs

@@ -1,7 +1,5 @@
 const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
-const require_mat_path_state = require('../mat-path-state.cjs');
 const require_FieldPolicy = require('../models/FieldPolicy.cjs');
-let sequelize = require("sequelize");
 
 //#region src/repository/field-policy.ts
 var field_policy_exports = /* @__PURE__ */ require_rolldown_runtime.__export({
@@ -11,7 +9,6 @@ var field_policy_exports = /* @__PURE__ */ require_rolldown_runtime.__export({
 	findAllByContextIds: () => findAllByContextIds,
 	findByContextAndName: () => findByContextAndName,
 	findById: () => findById,
-	findEffectivePolicy: () => findEffectivePolicy,
 	remove: () => remove,
 	update: () => update
 });
@@ -36,24 +33,6 @@ const update = async (id, data) => {
 	return policy.update(data);
 };
 const remove = (id) => require_FieldPolicy.default.destroy({ where: { id } });
-const findEffectivePolicy = (entityType) => {
-	const tableName = require_FieldPolicy.default.getTableName();
-	const EFFECTIVE_POLICY_QUERY = `
-  SELECT fp.*
-  FROM "${tableName}" fp
-  LEFT JOIN context_entity_path cep ON cep.deleted_at IS NULL
-    AND cep.entity_id = fp.context_id
-    AND cep.entity_type = 'context'
-    AND cep.path @> ANY(current_setting('mat_path.paths', true)::ltree[])
-  WHERE fp.entity_type = $1
-  ORDER BY COALESCE(nlevel(cep.path), 0) DESC
-  LIMIT 1`;
-	return require_mat_path_state.matPathState.withMatPath(tableName, (transaction) => require_FieldPolicy.default.sequelize.query(EFFECTIVE_POLICY_QUERY, {
-		bind: [entityType],
-		type: sequelize.QueryTypes.SELECT,
-		transaction
-	}));
-};
 
 //#endregion
 exports.create = create;
@@ -64,6 +43,5 @@ Object.defineProperty(exports, 'field_policy_exports', {
   }
 });
 exports.findAll = findAll;
-exports.findEffectivePolicy = findEffectivePolicy;
 exports.remove = remove;
 exports.update = update;

package/dist/repository/field-policy.d.cts

@@ -2,7 +2,7 @@ import { EntityType, FieldPolicy, ModelInclusion } from "../models/FieldPolicy.c
 
 //#region src/repository/field-policy.d.ts
 declare namespace field_policy_d_exports {
-  export { CreateFieldPolicyData, UpdateFieldPolicyData, create, findAll, findAllByContext, findAllByContextIds, findByContextAndName, findById, findEffectivePolicy, remove, update };
+  export { CreateFieldPolicyData, UpdateFieldPolicyData, create, findAll, findAllByContext, findAllByContextIds, findByContextAndName, findById, remove, update };
 }
 interface CreateFieldPolicyData {
   contextId: string;
@@ -30,6 +30,5 @@ declare const create: ({
 }: CreateFieldPolicyData) => Promise<FieldPolicy>;
 declare const update: (id: string, data: UpdateFieldPolicyData) => Promise<FieldPolicy | null>;
 declare const remove: (id: string) => Promise<number>;
-declare const findEffectivePolicy: (entityType: string) => Promise<Record<string, unknown>[]>;
 //#endregion
 export { field_policy_d_exports };

package/dist/repository/field-policy.d.ts

@@ -2,7 +2,7 @@ import { EntityType, FieldPolicy, ModelInclusion } from "../models/FieldPolicy.j
 
 //#region src/repository/field-policy.d.ts
 declare namespace field_policy_d_exports {
-  export { CreateFieldPolicyData, UpdateFieldPolicyData, create, findAll, findAllByContext, findAllByContextIds, findByContextAndName, findById, findEffectivePolicy, remove, update };
+  export { CreateFieldPolicyData, UpdateFieldPolicyData, create, findAll, findAllByContext, findAllByContextIds, findByContextAndName, findById, remove, update };
 }
 interface CreateFieldPolicyData {
   contextId: string;
@@ -30,6 +30,5 @@ declare const create: ({
 }: CreateFieldPolicyData) => Promise<FieldPolicy>;
 declare const update: (id: string, data: UpdateFieldPolicyData) => Promise<FieldPolicy | null>;
 declare const remove: (id: string) => Promise<number>;
-declare const findEffectivePolicy: (entityType: string) => Promise<Record<string, unknown>[]>;
 //#endregion
 export { field_policy_d_exports };

package/dist/repository/field-policy.js

@@ -1,7 +1,5 @@
 import { __export } from "../_virtual/rolldown_runtime.js";
-import { matPathState } from "../mat-path-state.js";
 import FieldPolicy_default from "../models/FieldPolicy.js";
-import { QueryTypes } from "sequelize";
 
 //#region src/repository/field-policy.ts
 var field_policy_exports = /* @__PURE__ */ __export({
@@ -11,7 +9,6 @@ var field_policy_exports = /* @__PURE__ */ __export({
 	findAllByContextIds: () => findAllByContextIds,
 	findByContextAndName: () => findByContextAndName,
 	findById: () => findById,
-	findEffectivePolicy: () => findEffectivePolicy,
 	remove: () => remove,
 	update: () => update
 });
@@ -36,24 +33,6 @@ const update = async (id, data) => {
 	return policy.update(data);
 };
 const remove = (id) => FieldPolicy_default.destroy({ where: { id } });
-const findEffectivePolicy = (entityType) => {
-	const tableName = FieldPolicy_default.getTableName();
-	const EFFECTIVE_POLICY_QUERY = `
-  SELECT fp.*
-  FROM "${tableName}" fp
-  LEFT JOIN context_entity_path cep ON cep.deleted_at IS NULL
-    AND cep.entity_id = fp.context_id
-    AND cep.entity_type = 'context'
-    AND cep.path @> ANY(current_setting('mat_path.paths', true)::ltree[])
-  WHERE fp.entity_type = $1
-  ORDER BY COALESCE(nlevel(cep.path), 0) DESC
-  LIMIT 1`;
-	return matPathState.withMatPath(tableName, (transaction) => FieldPolicy_default.sequelize.query(EFFECTIVE_POLICY_QUERY, {
-		bind: [entityType],
-		type: QueryTypes.SELECT,
-		transaction
-	}));
-};
 
 //#endregion
-export { create, field_policy_exports, findAll, findEffectivePolicy, remove, update };
+export { create, field_policy_exports, findAll, remove, update };

package/dist/repository/validator.cjs

@@ -1,6 +1,10 @@
+const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
 const require_index = require('../utils/logger/index.cjs');
 const require_CustomValidator = require('../models/CustomValidator.cjs');
 require('../models/index.cjs');
+let sequelize = require("sequelize");
+let sequelize_lib_sequelize = require("sequelize/lib/sequelize");
+sequelize_lib_sequelize = require_rolldown_runtime.__toESM(sequelize_lib_sequelize);
 
 //#region src/repository/validator.ts
 const create = async (validatorAttributes, options = {}) => {
@@ -49,10 +53,34 @@ const disable = async (id, options) => {
 	require_index.default.debug("custom-validator - disable validator");
 	return update(id, { disabled: true }, options);
 };
+const findEffective = async (entityType = "Vehicle", requestPath) => {
+	const QUERY = `
+ 	SELECT DISTINCT ON (cv.model_type) cv.*, cep.path
+	FROM custom_validators cv
+	LEFT JOIN context_entity_path cep ON cep.deleted_at IS NULL
+ 	AND cep.entity_id = cv.entity_id
+ 	AND cep.entity_type = cv.entity_type
+ 	AND cep.path @> ANY(ARRAY['${requestPath}']::ltree[])
+	WHERE cv.model_type IN ($1) AND cv.disabled = false
+	ORDER BY cv.model_type, COALESCE(nlevel(cep.path), 0) DESC;`;
+	try {
+		await sequelize_lib_sequelize.default.query(QUERY, {
+			bind: [entityType],
+			type: sequelize.QueryTypes.SELECT
+		});
+		return {
+			...result.schema.properties.after,
+			path: result.path
+		};
+	} catch (err) {
+		throw err;
+	}
+};
 
 //#endregion
 exports.create = create;
 exports.disable = disable;
 exports.findAll = findAll;
 exports.findAllByModelType = findAllByModelType;
+exports.findEffective = findEffective;
 exports.update = update;

package/dist/repository/validator.js

@@ -1,6 +1,8 @@
 import logger_default from "../utils/logger/index.js";
 import CustomValidator_default from "../models/CustomValidator.js";
 import "../models/index.js";
+import { QueryTypes } from "sequelize";
+import sequelize from "sequelize/lib/sequelize";
 
 //#region src/repository/validator.ts
 const create = async (validatorAttributes, options = {}) => {
@@ -49,6 +51,29 @@ const disable = async (id, options) => {
 	logger_default.debug("custom-validator - disable validator");
 	return update(id, { disabled: true }, options);
 };
+const findEffective = async (entityType = "Vehicle", requestPath) => {
+	const QUERY = `
+ 	SELECT DISTINCT ON (cv.model_type) cv.*, cep.path
+	FROM custom_validators cv
+	LEFT JOIN context_entity_path cep ON cep.deleted_at IS NULL
+ 	AND cep.entity_id = cv.entity_id
+ 	AND cep.entity_type = cv.entity_type
+ 	AND cep.path @> ANY(ARRAY['${requestPath}']::ltree[])
+	WHERE cv.model_type IN ($1) AND cv.disabled = false
+	ORDER BY cv.model_type, COALESCE(nlevel(cep.path), 0) DESC;`;
+	try {
+		await sequelize.query(QUERY, {
+			bind: [entityType],
+			type: QueryTypes.SELECT
+		});
+		return {
+			...result.schema.properties.after,
+			path: result.path
+		};
+	} catch (err) {
+		throw err;
+	}
+};
 
 //#endregion
-export { create, disable, findAll, findAllByModelType, update };
+export { create, disable, findAll, findAllByModelType, findEffective, update };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "1.6.18-beta.20",
+  "version": "1.6.18-beta.22",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -53,10 +53,10 @@
     "express": "^4.21.2",
     "npm-watch": "^0.11.0",
     "supertest": "^7.0.0",
-    "@autofleet/node-common": "^4.3.22",
-    "@autofleet/errors": "^3.3.7",
+    "@autofleet/logger": "^4.7.0",
     "@autofleet/zehut": "^4.13.4",
-    "@autofleet/logger": "^4.7.0"
+    "@autofleet/errors": "^3.3.7",
+    "@autofleet/node-common": "^4.3.22"
   },
   "peerDependencies": {
     "@autofleet/errors": "^3",