@dynamatix/cat-shared 0.0.122 → 0.0.124

package/middlewares/audit.middleware.js

@@ -15,6 +15,8 @@ const customResolvers = {
 
 // Expression-based description resolver: resolves ${fieldName} in the expression using doc, and via Lookup if needed
 async function resolveExpressionDescription(doc, expression, resolverType) {
+    console.log("expression-", expression);
+    console.log("resolverType-", resolverType);
     const matches = [...expression.matchAll(/\$\{([^}]+)\}/g)];
     let result = expression;
     for (const match of matches) {
@@ -33,12 +35,14 @@ async function resolveExpressionDescription(doc, expression, resolverType) {
 async function resolveDescription(field, doc) {
     const modelName = doc.constructor.modelName;
     const config = await ValueReferenceMap.findOne({ field, model: modelName });
+    console.log("config-", config);
     if (!config) return field;
 
     if (config.descriptionField && config.descriptionField.includes('${')) {
+        console.log("config.descriptionField", config.descriptionField);
         return await resolveExpressionDescription(doc, config.descriptionField, config.descriptionResolverType);
     }
-
+    console.log("config.descriptionResolverType", config.descriptionResolverType);
     switch (config.descriptionResolverType) {
         case 'lookup': {
             const lookupId = doc[config.descriptionField];
@@ -71,7 +75,12 @@ async function resolveEntityDescription(doc, auditConfig) {
     const field = auditConfig.descriptionResolutorForExternalData;
     const value = doc[field];
     // Try to resolve via ValueReferenceMap
+    console.log("field-", field);
     const map = await ValueReferenceMap.findOne({ field });
+    console.log("map-", map);
+    if (map?.descriptionResolverType === 'displayFieldReturn') {
+        return map.descriptionField;
+    }
     if (map && map.descriptionField && map.descriptionField.includes('${')) {
         return await resolveExpressionDescription(doc, map.descriptionField, map.descriptionResolverType);
     }
@@ -206,9 +215,10 @@ function applyAuditMiddleware(schema, collectionName) {
         const entityDescription = await resolveEntityDescription(result, auditConfig);
 
         for (const field of auditConfig.fields) {
+            console.log("field", field);
             const hasChanged =
                 update?.$set?.hasOwnProperty(field) || update?.hasOwnProperty(field);
-
+            console.log("hasChanged", hasChanged);
             if (hasChanged) {
                 const newValue = update?.$set?.[field] ?? update?.[field];
                 const oldValue = this._originalDoc ? this._originalDoc[field] : '';
@@ -228,10 +238,11 @@ function applyAuditMiddleware(schema, collectionName) {
                         lookupOldName = '';
                     }
                 }
-
                 // Convert null/undefined to empty string for comparison
                 let displayOldValue = lookupOldName ?? oldValue ?? '';
                 let displayNewValue = lookupNewName ?? newValue ?? '';
+                console.log("displayOldValue", displayOldValue);
+                console.log("displayNewValue", displayNewValue);
                 // --- Add pound prefix if needed ---
                 const dataType = fieldTypeMap[field];
                 if (dataType === 'pound') {
@@ -240,6 +251,7 @@ function applyAuditMiddleware(schema, collectionName) {
                 }
                 if (displayOldValue !== displayNewValue) {
                     const fieldDescription = await resolveDescription(field, result);
+                    console.log("fieldDescription-", fieldDescription);
                     logs.push({
                         name: fieldDescription,
                         entity: entityDescription,
@@ -255,13 +267,16 @@ function applyAuditMiddleware(schema, collectionName) {
                 }
             }
         }
+        console.log("logs", logs);
         logs = logs.filter(log => {
             // Convert null/undefined to empty string for comparison
             const oldVal = log.oldValue ?? '';
             const newVal = log.newValue ?? '';
             return oldVal !== newVal;
         });
+        console.log("logs.length", logs.length);
         if (logs.length) {
+            console.log("logs.length", logs.length);
             await AuditLog.insertMany(logs);
             await updateContextAuditCount(contextId, logs.length);
             if (onAuditLogCreated) {

package/models/index.js

@@ -7,4 +7,5 @@ export { default as DocumentModel } from './document.model.js';
 export { default as WorkflowAlertModel } from './workflow-alert.model.js';
 export { default as WorkflowConfigModel } from './workflow-config.model.js';
 export { default as DocumentHistoryModel } from './document-history.model.js';
-export { default as MetaModel } from './meta.model.js';
+export { default as MetaModel } from './meta.model.js';
+export { default as PropertyMetaDataModel } from './property-metadata.model.js';

package/models/property-metadata.model.js

@@ -0,0 +1,57 @@
+import mongoose from "mongoose";
+import applyAuditMiddleware from "../middlewares/audit.middleware";
+
+const propertyMetadataSchema = new mongoose.Schema({
+    collectionName: {
+        type: String,
+        required: true,
+        index: true
+    },
+    propertyName: {
+        type: String,
+        required: true,
+        index: true
+    },
+    type: {
+        type: String,
+        required: true,
+        enum: ['String', 'Number', 'Boolean', 'Date', 'ObjectId', 'Array', 'Object', 'Mixed'],
+        index: true
+    },
+    aliasName: {
+        type: String,
+        required: false,
+        default: ""
+    },
+    referenceCollection: {
+        type: String,
+        required: false,
+        default: null
+    },
+    // Additional recommended fields
+    description: {
+        type: String,
+        required: false,
+        default: ""
+    },
+    isRequired: {
+        type: Boolean,
+        required: true,
+        default: false,
+        index: true
+    }
+}, {
+    timestamps: true
+});
+
+// Compound indexes for efficient querying
+propertyMetadataSchema.index({ collectionName: 1, propertyName: 1 }, { unique: true });
+propertyMetadataSchema.index({ collectionName: 1, isActive: 1 });
+propertyMetadataSchema.index({ type: 1, isActive: 1 });
+propertyMetadataSchema.index({ category: 1, isActive: 1 });
+
+// Apply audit middleware
+applyAuditMiddleware(propertyMetadataSchema, "PropertyMetaData");
+
+const PropertyMetaDataModel = mongoose.models.PropertyMetaData || mongoose.model('PropertyMetaData', propertyMetadataSchema);
+export default PropertyMetaDataModel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamatix/cat-shared",
-  "version": "0.0.122",
+  "version": "0.0.124",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"