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

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);
+		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);
+		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/models/index.d.ts

@@ -3,5 +3,9 @@ import { CustomFieldModelTypeMap } from "./CustomFieldModelTypeMap.js";
 import { CustomFieldDefinition } from "./CustomFieldDefinition.js";
 import { CustomValidator } from "./CustomValidator.js";
 import "../types/index.js";
+import "./tests/AssociatedTestModel.js";
+import "./tests/TestModel.js";
+import "./tests/contextAwareModels/ContextTestModel.js";
+import "./tests/contextAwareModels/ContextAwareTestModel.js";
 import { CustomFieldEntries } from "./CustomFieldEntries.js";
 import { Sequelize } from "sequelize-typescript";

package/dist/models/tests/AssociatedTestModel.d.ts

@@ -0,0 +1,2 @@
+import "./TestModel.js";
+import { Model } from "sequelize-typescript";

package/dist/models/tests/TestModel.d.ts

@@ -0,0 +1,2 @@
+import "./AssociatedTestModel.js";
+import { Model } from "sequelize-typescript";

package/dist/models/tests/contextAwareModels/ContextAwareTestModel.d.ts

@@ -0,0 +1,2 @@
+import "./ContextTestModel.js";
+import { Model } from "sequelize-typescript";

package/dist/models/tests/contextAwareModels/ContextTestModel.d.ts

@@ -0,0 +1 @@
+import { Model } from "sequelize-typescript";

package/dist/repository/validator.cjs

@@ -1,6 +1,9 @@
+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_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 +52,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_lib_sequelize.default.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,7 @@
 import logger_default from "../utils/logger/index.js";
 import CustomValidator_default from "../models/CustomValidator.js";
 import "../models/index.js";
+import sequelize from "sequelize/lib/sequelize";
 
 //#region src/repository/validator.ts
 const create = async (validatorAttributes, options = {}) => {
@@ -49,6 +50,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: sequelize.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.21",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -54,9 +54,9 @@
     "npm-watch": "^0.11.0",
     "supertest": "^7.0.0",
     "@autofleet/node-common": "^4.3.22",
+    "@autofleet/logger": "^4.7.0",
     "@autofleet/errors": "^3.3.7",
-    "@autofleet/zehut": "^4.13.4",
-    "@autofleet/logger": "^4.7.0"
+    "@autofleet/zehut": "^4.13.4"
   },
   "peerDependencies": {
     "@autofleet/errors": "^3",