@monorise/core 4.0.0 → 4.2.0

package/dist/index.js

@@ -311,13 +311,14 @@ var Repository = class {
 
 // data/Entity.ts
 var Entity = class _Entity extends Item {
-  constructor(entityType, entityId, data = {}, _createdAt, _updatedAt) {
+  constructor(entityType, entityId, data = {}, _createdAt, _updatedAt, _expiresAt) {
     super();
     this.entityType = entityType;
     this.entityId = entityId;
     this.data = data;
     this._createdAt = _createdAt;
     this._updatedAt = _updatedAt;
+    this._expiresAt = _expiresAt;
     this.fullId = this.pk;
   }
   static fromItem(item) {
@@ -332,7 +333,9 @@ var Entity = class _Entity extends Item {
       parsedItem.entityId,
       parsedItem.data,
       parsedItem.createdAt ? new Date(parsedItem.createdAt) : void 0,
-      parsedItem.updatedAt ? new Date(parsedItem.updatedAt) : void 0
+      parsedItem.updatedAt ? new Date(parsedItem.updatedAt) : void 0,
+      // expiresAt is stored as epoch seconds (DynamoDB TTL requires type N)
+      parsedItem.expiresAt ? new Date(parsedItem.expiresAt * 1e3) : void 0
     );
   }
   get pk() {
@@ -362,6 +365,9 @@ var Entity = class _Entity extends Item {
     var _a;
     return (_a = this._updatedAt) == null ? void 0 : _a.toISOString();
   }
+  get expiresAt() {
+    return this._expiresAt ? Math.floor(this._expiresAt.getTime() / 1e3) : void 0;
+  }
   toItem() {
     return __spreadValues(__spreadValues({}, marshall2(this.toJSON(), { removeUndefinedValues: true })), this.keys());
   }
@@ -371,7 +377,8 @@ var Entity = class _Entity extends Item {
       entityId: this.entityId,
       data: this.data,
       createdAt: this.createdAt,
-      updatedAt: this.updatedAt
+      updatedAt: this.updatedAt,
+      expiresAt: this.expiresAt
     };
   }
 };
@@ -383,6 +390,46 @@ var EntityRepository = class extends Repository {
     this.dynamodbClient = dynamodbClient;
     this.EmailAuthEnabledEntities = EmailAuthEnabledEntities;
   }
+  /**
+   * Computes the `expiresAt` Date for an entity via its `ttl.processor` config, if any.
+   * When `mergeWithExisting` is true, the processor receives the previous entity's data
+   * merged with `incomingData` (falls back to `incomingData` alone if no previous entity
+   * exists yet, eg. an upsert-as-create).
+   */
+  computeExpiresAt(entityType, entityId, incomingData, updatedAt, opts) {
+    return __async(this, null, function* () {
+      var _a, _b;
+      const processor = (_b = (_a = this.EntityConfig[entityType]) == null ? void 0 : _a.ttl) == null ? void 0 : _b.processor;
+      if (!processor) return void 0;
+      let data = incomingData;
+      let createdAt = updatedAt;
+      if (opts.mergeWithExisting) {
+        let previous = opts.previousEntity;
+        if (!previous) {
+          try {
+            previous = yield this.getEntity(entityType, entityId);
+          } catch (err) {
+            if (!(err instanceof StandardError && err.code === StandardErrorCode.ENTITY_IS_UNDEFINED)) {
+              throw err;
+            }
+          }
+        }
+        if (previous) {
+          data = __spreadValues(__spreadValues({}, previous.data), incomingData);
+          createdAt = previous.createdAt || updatedAt;
+        }
+      }
+      const result = processor({
+        entityId,
+        entityType,
+        data,
+        createdAt,
+        updatedAt
+      });
+      if (result === void 0) return void 0;
+      return result instanceof Date ? result : new Date(result * 1e3);
+    });
+  }
   listEntities(_0) {
     return __async(this, arguments, function* ({
       entityType,
@@ -606,12 +653,21 @@ var EntityRepository = class extends Repository {
     return __async(this, null, function* () {
       var _a, _b;
       const currentDatetime = (_a = opts == null ? void 0 : opts.createAndUpdateDatetime) != null ? _a : /* @__PURE__ */ new Date();
+      const finalEntityId = entityId || ulid();
+      const expiresAt = yield this.computeExpiresAt(
+        entityType,
+        finalEntityId,
+        entityPayload,
+        currentDatetime.toISOString(),
+        { mergeWithExisting: false }
+      );
       const entity = new Entity(
         entityType,
-        entityId || ulid(),
+        finalEntityId,
         entityPayload,
         currentDatetime,
-        currentDatetime
+        currentDatetime,
+        expiresAt
       );
       const uniqueFields = this.EntityConfig[entityType].uniqueFields || [];
       const uniqueFieldValues = {};
@@ -656,26 +712,47 @@ var EntityRepository = class extends Repository {
   upsertEntity(entityType, entityId, payload) {
     return __async(this, null, function* () {
       const currentDatetime = (/* @__PURE__ */ new Date()).toISOString();
-      const toUpdateExpressions = this.toUpdate({
+      const expiresAtForUpdate = yield this.computeExpiresAt(
+        entityType,
+        entityId,
+        payload,
+        currentDatetime,
+        { mergeWithExisting: true }
+      );
+      const toUpdateExpressions = this.toUpdate(__spreadValues({
         entityType,
         entityId,
         data: payload,
         updatedAt: currentDatetime
-      });
+      }, expiresAtForUpdate && {
+        expiresAt: Math.floor(expiresAtForUpdate.getTime() / 1e3)
+      }));
       const params = {
         TableName: this.TABLE_NAME,
         ReturnValues: "ALL_NEW",
+        ConditionExpression: "attribute_exists(PK)",
         Key: new Entity(entityType, entityId).keys(),
         UpdateExpression: toUpdateExpressions.UpdateExpression,
         ExpressionAttributeNames: __spreadValues({}, toUpdateExpressions.ExpressionAttributeNames),
         ExpressionAttributeValues: __spreadValues({}, toUpdateExpressions.ExpressionAttributeValues)
       };
-      const resp = yield this.dynamodbClient.updateItem(params);
-      const updatedEntity = Entity.fromItem(resp.Attributes);
-      return updatedEntity;
+      try {
+        const resp = yield this.dynamodbClient.updateItem(params);
+        return Entity.fromItem(resp.Attributes);
+      } catch (err) {
+        if (!(err instanceof ConditionalCheckFailedException)) {
+          throw err;
+        }
+      }
+      return this.createEntity(
+        entityType,
+        payload,
+        entityId,
+        { createAndUpdateDatetime: new Date(currentDatetime) }
+      );
     });
   }
-  updateEntityTransactItems(entity, updateParams, previousUniqueFieldValues, previousEntity) {
+  updateEntityTransactItems(entity, updateParams, previousUniqueFieldValues, previousEntity, expiresAt) {
     const transactItems = [
       {
         Update: __spreadProps(__spreadValues({}, updateParams), {
@@ -698,7 +775,7 @@ var EntityRepository = class extends Repository {
           Put: {
             TableName: this.TABLE_NAME,
             ConditionExpression: "attribute_not_exists(PK)",
-            Item: __spreadProps(__spreadValues({}, entity.toItem()), {
+            Item: __spreadValues(__spreadProps(__spreadValues({}, entity.toItem()), {
               data: {
                 M: __spreadValues(__spreadValues({}, previousEntity.toItem().data.M), entity.toItem().data.M)
               },
@@ -712,6 +789,10 @@ var EntityRepository = class extends Repository {
                 S: previousEntity.createdAt || entity.createdAt || (/* @__PURE__ */ new Date()).toISOString()
               },
               updatedAt: { S: entity.updatedAt || (/* @__PURE__ */ new Date()).toISOString() }
+            }), expiresAt && {
+              expiresAt: {
+                N: String(Math.floor(expiresAt.getTime() / 1e3))
+              }
             })
           }
         }
@@ -721,11 +802,42 @@ var EntityRepository = class extends Repository {
   }
   updateEntity(entityType, entityId, toUpdate, opts) {
     return __async(this, null, function* () {
+      var _a, _b;
       try {
         const currentDatetime = (/* @__PURE__ */ new Date()).toISOString();
-        const toUpdateExpressions = this.toUpdate(__spreadValues({
+        const uniqueFields = this.EntityConfig[entityType].uniqueFields || [];
+        const hasUniqueFields = Object.keys(toUpdate.data).some(
+          (field) => uniqueFields.includes(field)
+        );
+        const hasTtlProcessor = !!((_b = (_a = this.EntityConfig[entityType]) == null ? void 0 : _a.ttl) == null ? void 0 : _b.processor);
+        let previousEntity;
+        if (hasUniqueFields || hasTtlProcessor) {
+          try {
+            previousEntity = yield this.getEntity(entityType, entityId);
+          } catch (err) {
+            if (err instanceof StandardError && err.code === StandardErrorCode.ENTITY_IS_UNDEFINED) {
+              throw new StandardError(
+                StandardErrorCode.ENTITY_NOT_FOUND,
+                "Entity not found",
+                err,
+                { entityId, toUpdate }
+              );
+            }
+            throw err;
+          }
+        }
+        const expiresAtDate = yield this.computeExpiresAt(
+          entityType,
+          entityId,
+          toUpdate.data,
+          currentDatetime,
+          { mergeWithExisting: true, previousEntity }
+        );
+        const toUpdateExpressions = this.toUpdate(__spreadValues(__spreadValues({
           updatedAt: currentDatetime
-        }, toUpdate));
+        }, toUpdate), expiresAtDate && {
+          expiresAt: Math.floor(expiresAtDate.getTime() / 1e3)
+        }));
         const params = {
           TableName: this.TABLE_NAME,
           ReturnValues: "ALL_NEW",
@@ -736,15 +848,9 @@ var EntityRepository = class extends Repository {
           ExpressionAttributeValues: __spreadValues(__spreadValues({}, toUpdateExpressions.ExpressionAttributeValues), opts == null ? void 0 : opts.ExpressionAttributeValues)
         };
         const entity = new Entity(entityType, entityId, toUpdate.data);
-        const uniqueFields = this.EntityConfig[entityType].uniqueFields || [];
-        const hasUniqueFields = Object.keys(toUpdate.data).some(
-          (field) => uniqueFields.includes(field)
-        );
         let updatedUniqueFields = [];
         let previousUniqueFieldValues = {};
-        let previousEntity;
-        if (hasUniqueFields) {
-          previousEntity = yield this.getEntity(entityType, entityId);
+        if (hasUniqueFields && previousEntity) {
           updatedUniqueFields = uniqueFields.filter(
             (field) => toUpdate.data[field] !== void 0 && toUpdate.data[field] !== previousEntity.data[field]
           );
@@ -763,11 +869,13 @@ var EntityRepository = class extends Repository {
             }
           }
           if (updatedUniqueFields.length > 0) {
+            const effectiveExpiresAtDate = expiresAtDate != null ? expiresAtDate : previousEntity.expiresAt !== void 0 ? new Date(previousEntity.expiresAt * 1e3) : void 0;
             const TransactItems = this.updateEntityTransactItems(
               entity,
               params,
               previousUniqueFieldValues,
-              previousEntity
+              previousEntity,
+              effectiveExpiresAtDate
             );
             try {
               yield this.dynamodbClient.transactWriteItems({ TransactItems });
@@ -802,7 +910,14 @@ var EntityRepository = class extends Repository {
               }
               throw err;
             }
-            return yield this.getEntity(entityType, entityId);
+            return new Entity(
+              entityType,
+              entityId,
+              __spreadValues(__spreadValues({}, previousEntity.data), toUpdate.data),
+              previousEntity.createdAt ? new Date(previousEntity.createdAt) : void 0,
+              new Date(currentDatetime),
+              effectiveExpiresAtDate
+            );
           }
         }
         const resp = yield this.dynamodbClient.updateItem(params);
@@ -967,7 +1082,8 @@ var Mutual = class _Mutual {
       parsedItem.createdAt ? new Date(parsedItem.createdAt) : void 0,
       parsedItem.updatedAt ? new Date(parsedItem.updatedAt) : void 0,
       parsedItem.mutualUpdatedAt ? new Date(parsedItem.mutualUpdatedAt) : void 0,
-      parsedItem.expiresAt ? new Date(parsedItem.expiresAt) : void 0
+      // expiresAt is stored as epoch seconds (DynamoDB TTL requires type N)
+      parsedItem.expiresAt ? new Date(parsedItem.expiresAt * 1e3) : void 0
     );
   }
   mainKeys() {
@@ -1010,8 +1126,7 @@ var Mutual = class _Mutual {
     return (_a = this._mutualUpdatedAt) == null ? void 0 : _a.toISOString();
   }
   get expiresAt() {
-    var _a;
-    return (_a = this._expiresAt) == null ? void 0 : _a.toISOString();
+    return this._expiresAt ? Math.floor(this._expiresAt.getTime() / 1e3) : void 0;
   }
   toItem() {
     return __spreadValues(__spreadValues({}, marshall3(this.toJSON(), { removeUndefinedValues: true })), this.mainKeys());
@@ -1110,7 +1225,14 @@ var MutualRepository = class extends Repository {
   }
   getMutual(byEntityType, byEntityId, entityType, entityId, opts) {
     return __async(this, null, function* () {
-      var _a, _b;
+      var _a, _b, _c, _d, _e, _f;
+      console.log("[MONORISE_DEBUG] getMutual start:", {
+        byEntityType,
+        byEntityId,
+        entityType,
+        entityId,
+        opts
+      });
       const mutual = new Mutual(
         byEntityType,
         byEntityId,
@@ -1120,6 +1242,11 @@ var MutualRepository = class extends Repository {
         {},
         {}
       );
+      console.log("[MONORISE_DEBUG] getMutual querying:", {
+        byFullEntityId: mutual.byFullEntityId,
+        fullEntityId: mutual.fullEntityId,
+        tableName: this.TABLE_NAME
+      });
       const resp = yield this.dynamodbClient.query({
         TableName: this.TABLE_NAME,
         KeyConditionExpression: "#PK = :PK and begins_with(#SK, :SK)",
@@ -1136,9 +1263,14 @@ var MutualRepository = class extends Repository {
         },
         Limit: 1
       });
+      console.log("[MONORISE_DEBUG] getMutual query result:", {
+        hasItems: !!((_a = resp.Items) == null ? void 0 : _a.length),
+        itemCount: (_c = (_b = resp.Items) == null ? void 0 : _b.length) != null ? _c : 0,
+        hasLastEvaluatedKey: !!resp.LastEvaluatedKey
+      });
       let mutualMetadata = null;
       if (opts == null ? void 0 : opts.isFromMetadata) {
-        const tempMutual = Mutual.fromItem((_a = resp.Items) == null ? void 0 : _a[0]);
+        const tempMutual = Mutual.fromItem((_d = resp.Items) == null ? void 0 : _d[0]);
         const respMetadataMutual = yield this.dynamodbClient.getItem({
           TableName: this.TABLE_NAME,
           Key: tempMutual.mainKeys(),
@@ -1146,12 +1278,28 @@ var MutualRepository = class extends Repository {
         });
         mutualMetadata = Mutual.fromItem(respMetadataMutual.Item);
       }
-      return mutualMetadata || Mutual.fromItem((_b = resp.Items) == null ? void 0 : _b[0]);
+      console.log("[MONORISE_DEBUG] getMutual fromItem:", {
+        hasMutualMetadata: !!mutualMetadata,
+        hasFirstItem: !!((_e = resp.Items) == null ? void 0 : _e[0])
+      });
+      const result = mutualMetadata || Mutual.fromItem((_f = resp.Items) == null ? void 0 : _f[0]);
+      console.log("[MONORISE_DEBUG] getMutual complete:", {
+        mutualId: result.mutualId,
+        byEntityType: result.byEntityType,
+        entityType: result.entityType
+      });
+      return result;
     });
   }
   checkMutualExist(byEntityType, byEntityId, entityType, entityId) {
     return __async(this, null, function* () {
-      var _a;
+      var _a, _b;
+      console.log("[MONORISE_DEBUG] checkMutualExist:", {
+        byEntityType,
+        byEntityId,
+        entityType,
+        entityId
+      });
       const mutual = new Mutual(
         byEntityType,
         byEntityId,
@@ -1166,7 +1314,11 @@ var MutualRepository = class extends Repository {
         Key: mutual.subKeys(),
         ProjectionExpression: "PK, SK, expiresAt"
       });
-      if (resp.Item && !((_a = resp.Item) == null ? void 0 : _a.expiresAt)) {
+      console.log("[MONORISE_DEBUG] checkMutualExist result:", {
+        hasItem: !!resp.Item,
+        hasExpiresAt: !!((_a = resp.Item) == null ? void 0 : _a.expiresAt)
+      });
+      if (resp.Item && !((_b = resp.Item) == null ? void 0 : _b.expiresAt)) {
         throw new StandardError(
           StandardErrorCode.MUTUAL_EXISTS,
           "Entities are already linked"
@@ -1176,6 +1328,14 @@ var MutualRepository = class extends Repository {
     });
   }
   createMutualTransactItems(mutual, opts) {
+    console.log("[MONORISE_DEBUG] createMutualTransactItems:", {
+      mutualId: mutual.mutualId,
+      byEntityType: mutual.byEntityType,
+      byEntityId: mutual.byEntityId,
+      entityType: mutual.entityType,
+      entityId: mutual.entityId,
+      hasOpts: !!opts
+    });
     const TransactItems = [
       {
         Put: {
@@ -1250,10 +1410,19 @@ var MutualRepository = class extends Repository {
   }
   updateMutual(byEntityType, byEntityId, entityType, entityId, toUpdate, opts) {
     return __async(this, null, function* () {
-      var _a;
+      var _a, _b;
+      console.log("[MONORISE_DEBUG] updateMutual repository start:", {
+        byEntityType,
+        byEntityId,
+        entityType,
+        entityId,
+        toUpdateKeys: Object.keys(toUpdate),
+        opts
+      });
       const returnUpdatedValue = (_a = opts == null ? void 0 : opts.returnUpdatedValue) != null ? _a : false;
       const errorContext = {};
       try {
+        console.log("[MONORISE_DEBUG] updateMutual fetching mutual...");
         const mutual = yield this.getMutual(
           byEntityType,
           byEntityId,
@@ -1261,6 +1430,12 @@ var MutualRepository = class extends Repository {
           entityId,
           { ProjectionExpression: PROJECTION_EXPRESSION.NO_DATA }
         );
+        console.log("[MONORISE_DEBUG] updateMutual mutual found:", {
+          mutualId: mutual.mutualId,
+          mainPk: mutual.mainPk,
+          byFullEntityId: mutual.byFullEntityId,
+          fullEntityId: mutual.fullEntityId
+        });
         const currentDatetime = (/* @__PURE__ */ new Date()).toISOString();
         const toUpdateExpressions = this.toUpdate(
           __spreadValues({
@@ -1268,6 +1443,11 @@ var MutualRepository = class extends Repository {
           }, toUpdate),
           { maxLevel: opts == null ? void 0 : opts.maxObjectUpdateLevel }
         );
+        console.log("[MONORISE_DEBUG] updateMutual update expression:", {
+          UpdateExpression: toUpdateExpressions.UpdateExpression,
+          ExpressionAttributeNames: toUpdateExpressions.ExpressionAttributeNames,
+          hasExpressionAttributeValues: !!toUpdateExpressions.ExpressionAttributeValues
+        });
         const updateExpression = {
           ConditionExpression: (opts == null ? void 0 : opts.ConditionExpression) || "attribute_exists(PK)",
           UpdateExpression: toUpdateExpressions.UpdateExpression,
@@ -1301,18 +1481,33 @@ var MutualRepository = class extends Repository {
           }
         ];
         errorContext.TransactItems = TransactItems;
+        console.log("[MONORISE_DEBUG] updateMutual transact items prepared:", {
+          itemCount: TransactItems.length,
+          tableName: this.TABLE_NAME
+        });
+        console.log("[MONORISE_DEBUG] updateMutual executing transaction...");
         yield this.ddbUtils.executeTransactWrite({ TransactItems });
+        console.log("[MONORISE_DEBUG] updateMutual transaction succeeded");
         if (!returnUpdatedValue) {
+          console.log("[MONORISE_DEBUG] updateMutual returning (no value)");
           return;
         }
+        console.log("[MONORISE_DEBUG] updateMutual fetching updated mutual...");
         const updatedMutual = yield this.getMutual(
           byEntityType,
           byEntityId,
           entityType,
           entityId
         );
+        console.log("[MONORISE_DEBUG] updateMutual repository complete");
         return updatedMutual;
       } catch (err) {
+        console.error("[MONORISE_DEBUG] updateMutual repository error:", {
+          errorName: (_b = err == null ? void 0 : err.constructor) == null ? void 0 : _b.name,
+          errorMessage: err == null ? void 0 : err.message,
+          errorCode: err == null ? void 0 : err.code,
+          isStandardError: err instanceof StandardError
+        });
         if (err instanceof StandardError && err.code === StandardErrorCode.CONDITIONAL_CHECK_FAILED) {
           throw new StandardError(
             StandardErrorCode.MUTUAL_NOT_FOUND,
@@ -2047,6 +2242,7 @@ var getDependencies = () => {
 // middlewares/general-error-handler.ts
 var factory2 = createFactory2();
 var generalErrorHandler = (dependencies = getDependencies()) => factory2.createMiddleware((c) => __async(null, null, function* () {
+  var _a, _b, _c, _d;
   if (c.error) {
     const { nanoid: nanoid2, publishErrorEvent: publishErrorEvent2 } = dependencies;
     const errorId = nanoid2();
@@ -2059,12 +2255,21 @@ var generalErrorHandler = (dependencies = getDependencies()) => factory2.createM
       body,
       error: c.error
     });
-    console.warn(
-      JSON.stringify({
-        message: "INTERNAL_SERVER_EXCEPTION",
-        details: c.error
-      })
-    );
+    const error = c.error;
+    console.warn("[MONORISE_DEBUG] INTERNAL_SERVER_EXCEPTION:", {
+      errorId,
+      method: c.req.method,
+      path: c.req.path,
+      errorName: error == null ? void 0 : error.name,
+      errorMessage: error == null ? void 0 : error.message,
+      errorCode: error == null ? void 0 : error.code,
+      errorStack: error == null ? void 0 : error.stack,
+      errorConstructor: (_a = error == null ? void 0 : error.constructor) == null ? void 0 : _a.name,
+      hasLastError: !!(error == null ? void 0 : error.lastError),
+      lastErrorName: (_c = (_b = error == null ? void 0 : error.lastError) == null ? void 0 : _b.constructor) == null ? void 0 : _c.name,
+      lastErrorMessage: (_d = error == null ? void 0 : error.lastError) == null ? void 0 : _d.message,
+      context: error == null ? void 0 : error.context
+    });
     c.status(500);
     c.json({
       code: "INTERNAL_SERVER_EXCEPTION",
@@ -2147,7 +2352,7 @@ var handler2 = (container) => (ev) => __async(null, null, function* () {
   const { entityRepository, mutualRepository, publishEvent: publishEvent2 } = container;
   yield Promise.allSettled(
     ev.Records.map((record) => __async(null, null, function* () {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e;
       const errorContext = {};
       const body = parseSQSBusEvent(record.body);
       const { detail } = body;
@@ -2170,6 +2375,7 @@ var handler2 = (container) => (ev) => __async(null, null, function* () {
           );
         }
         const mutualDataProcessor = (_d = config.mutualDataProcessor) != null ? _d : (() => ({}));
+        const mutualDataSchema = (_e = config.mutual) == null ? void 0 : _e.mutualDataSchema;
         yield mutualRepository.createMutualLock({
           byEntityType,
           byEntityId,
@@ -2205,6 +2411,20 @@ var handler2 = (container) => (ev) => __async(null, null, function* () {
           addedEntityIds,
           (id) => __async(null, null, function* () {
             const entity = yield entityRepository.getEntity(entityType, id);
+            const processedMutualData = mutualDataProcessor(
+              mutualIds,
+              new Mutual(
+                byEntityType,
+                byEntityId,
+                byEntity.data,
+                entityType,
+                id,
+                entity.data,
+                {}
+              ),
+              customContext
+            );
+            const parsedMutualData = mutualDataSchema ? mutualDataSchema.parse(processedMutualData) : processedMutualData;
             yield mutualRepository.createMutual(
               byEntityType,
               byEntityId,
@@ -2212,19 +2432,7 @@ var handler2 = (container) => (ev) => __async(null, null, function* () {
               entityType,
               id,
               entity.data,
-              mutualDataProcessor(
-                mutualIds,
-                new Mutual(
-                  byEntityType,
-                  byEntityId,
-                  byEntity.data,
-                  entityType,
-                  id,
-                  entity.data,
-                  {}
-                ),
-                customContext
-              ),
+              parsedMutualData,
               {
                 ConditionExpression: "attribute_not_exists(#mutualUpdatedAt) OR #mutualUpdatedAt < :publishedAt",
                 ExpressionAttributeNames: {
@@ -2261,25 +2469,27 @@ var handler2 = (container) => (ev) => __async(null, null, function* () {
         const updateEntities = yield processEntities(
           toUpdateEntityIds,
           (id) => __async(null, null, function* () {
+            const processedMutualData = mutualDataProcessor(
+              mutualIds,
+              new Mutual(
+                byEntityType,
+                byEntityId,
+                byEntity.data,
+                entityType,
+                id,
+                {},
+                {}
+              ),
+              customContext
+            );
+            const parsedMutualData = mutualDataSchema ? mutualDataSchema.parse(processedMutualData) : processedMutualData;
             yield mutualRepository.updateMutual(
               byEntityType,
               byEntityId,
               entityType,
               id,
               {
-                mutualData: mutualDataProcessor(
-                  mutualIds,
-                  new Mutual(
-                    byEntityType,
-                    byEntityId,
-                    byEntity.data,
-                    entityType,
-                    id,
-                    {},
-                    {}
-                  ),
-                  customContext
-                ),
+                mutualData: parsedMutualData,
                 mutualUpdatedAt: publishedAt
               },
               {
@@ -7731,7 +7941,8 @@ var EntityService = class {
 // services/mutual.service.ts
 import { ulid as ulid3 } from "ulid";
 var MutualService = class {
-  constructor(entityRepository, mutualRepository, publishEvent2, ddbUtils, entityServiceLifeCycle) {
+  constructor(EntityConfig, entityRepository, mutualRepository, publishEvent2, ddbUtils, entityServiceLifeCycle) {
+    this.EntityConfig = EntityConfig;
     this.entityRepository = entityRepository;
     this.mutualRepository = mutualRepository;
     this.publishEvent = publishEvent2;
@@ -7746,6 +7957,7 @@ var MutualService = class {
       accountId,
       options = {}
     }) {
+      var _a;
       const {
         ensureEntityStrongConsistentWrite = false,
         asEntity,
@@ -7766,20 +7978,37 @@ var MutualService = class {
           options
         }
       };
-      const schema = external_exports.record(external_exports.string(), external_exports.any());
+      console.log("[MONORISE_DEBUG] createMutual service start:", {
+        byEntityType,
+        byEntityId,
+        entityType,
+        entityId,
+        mutualPayload,
+        options
+      });
+      const schema = (_a = this.getMutualDataSchema(byEntityType, entityType)) != null ? _a : external_exports.record(external_exports.string(), external_exports.any());
+      console.log("[MONORISE_DEBUG] createMutual schema resolved");
       const parsedMutualPayload = schema.parse(mutualPayload);
+      console.log("[MONORISE_DEBUG] createMutual payload parsed:", parsedMutualPayload);
+      console.log("[MONORISE_DEBUG] createMutual fetching entities...");
       const [{ data: byEntityData }, { data: entityData }] = yield Promise.all([
         this.entityRepository.getEntity(byEntityType, byEntityId),
         this.entityRepository.getEntity(entityType, entityId)
       ]);
+      console.log("[MONORISE_DEBUG] createMutual entities fetched:", {
+        hasByEntityData: !!byEntityData,
+        hasEntityData: !!entityData
+      });
       errorContext.byEntityData = byEntityData;
       errorContext.entityData = entityData;
+      console.log("[MONORISE_DEBUG] createMutual checking mutual exist...");
       yield this.mutualRepository.checkMutualExist(
         byEntityType,
         byEntityId,
         entityType,
         entityId
       );
+      console.log("[MONORISE_DEBUG] createMutual mutual does not exist (ok)");
       const currentDatetime = createAndUpdateDatetime || /* @__PURE__ */ new Date();
       const mutual = new Mutual(
         byEntityType,
@@ -7794,6 +8023,9 @@ var MutualService = class {
         currentDatetime,
         currentDatetime
       );
+      console.log("[MONORISE_DEBUG] createMutual mutual object created:", {
+        mutualId: mutual.mutualId
+      });
       const mutualTransactions = skipMutualCreation ? [] : this.mutualRepository.createMutualTransactItems(mutual, {
         ConditionExpression,
         ExpressionAttributeNames,
@@ -7817,9 +8049,13 @@ var MutualService = class {
       }
       const createTransactItems = [...mutualTransactions, ...entityTransactions];
       errorContext.createTransactItems = createTransactItems;
+      console.log("[MONORISE_DEBUG] createMutual executing transaction:", {
+        transactItemCount: createTransactItems.length
+      });
       yield this.ddbUtils.executeTransactWrite({
         TransactItems: createTransactItems
       });
+      console.log("[MONORISE_DEBUG] createMutual transaction succeeded");
       if (asEntity && entity && ensureEntityStrongConsistentWrite) {
         yield this.entityServiceLifeCycle.afterCreateEntityHook(
           entity,
@@ -7858,6 +8094,7 @@ var MutualService = class {
         })
       ];
       yield Promise.all(eventPromises);
+      console.log("[MONORISE_DEBUG] createMutual service complete");
       return { mutual, eventPayload };
     });
     this.updateMutual = (_0) => __async(this, [_0], function* ({
@@ -7869,8 +8106,20 @@ var MutualService = class {
       accountId,
       options
     }) {
-      const schema = external_exports.record(external_exports.string(), external_exports.any());
+      var _a;
+      console.log("[MONORISE_DEBUG] updateMutual service start:", {
+        byEntityType,
+        byEntityId,
+        entityType,
+        entityId,
+        mutualPayload,
+        options
+      });
+      const schema = (_a = this.getMutualDataSchema(byEntityType, entityType)) != null ? _a : external_exports.record(external_exports.string(), external_exports.any());
+      console.log("[MONORISE_DEBUG] updateMutual schema resolved");
       const parsedMutualPayload = schema.parse(mutualPayload);
+      console.log("[MONORISE_DEBUG] updateMutual payload parsed:", parsedMutualPayload);
+      console.log("[MONORISE_DEBUG] updateMutual calling repository...");
       const mutual = yield this.mutualRepository.updateMutual(
         byEntityType,
         byEntityId,
@@ -7879,6 +8128,10 @@ var MutualService = class {
         { mutualData: parsedMutualPayload },
         options
       );
+      console.log("[MONORISE_DEBUG] updateMutual repository result:", {
+        hasMutual: !!mutual,
+        mutualId: mutual == null ? void 0 : mutual.mutualId
+      });
       yield this.publishEvent({
         event: EVENT.CORE.MUTUAL_UPDATED(byEntityType, entityType),
         payload: {
@@ -7890,6 +8143,7 @@ var MutualService = class {
           updatedByAccountId: accountId
         }
       });
+      console.log("[MONORISE_DEBUG] updateMutual service complete");
       return mutual;
     });
     this.deleteMutual = (_0) => __async(this, [_0], function* ({
@@ -7918,6 +8172,22 @@ var MutualService = class {
       return mutual;
     });
   }
+  getMutualDataSchema(byEntityType, entityType) {
+    var _a, _b, _c;
+    for (const [from, to] of [
+      [byEntityType, entityType],
+      [entityType, byEntityType]
+    ]) {
+      const mutualFields = (_b = (_a = this.EntityConfig[from]) == null ? void 0 : _a.mutual) == null ? void 0 : _b.mutualFields;
+      if (!mutualFields) continue;
+      for (const config of Object.values(mutualFields)) {
+        if (config.entityType === to && ((_c = config.mutual) == null ? void 0 : _c.mutualDataSchema)) {
+          return config.mutual.mutualDataSchema;
+        }
+      }
+    }
+    return void 0;
+  }
 };
 
 // controllers/tag/list-tags.controller.ts
@@ -8077,6 +8347,7 @@ var DependencyContainer = class {
   get mutualService() {
     return this.createCachedInstance(
       MutualService,
+      this.config.EntityConfig,
       this.entityRepository,
       this.mutualRepository,
       this.publishEvent,