@monorise/core 4.1.0 → 4.2.0

package/dist/index.d.ts

@@ -4599,12 +4599,14 @@ declare class UpsertEntityController {
 }
 
 declare class MutualService {
+    private EntityConfig;
     private entityRepository;
     private mutualRepository;
     private publishEvent;
     private ddbUtils;
     private entityServiceLifeCycle;
-    constructor(entityRepository: EntityRepository, mutualRepository: MutualRepository, publishEvent: typeof publishEvent, ddbUtils: DbUtils, entityServiceLifeCycle: EntityServiceLifeCycle);
+    constructor(EntityConfig: Record<Entity$2, ReturnType<typeof createEntityConfig>>, entityRepository: EntityRepository, mutualRepository: MutualRepository, publishEvent: typeof publishEvent, ddbUtils: DbUtils, entityServiceLifeCycle: EntityServiceLifeCycle);
+    private getMutualDataSchema;
     createMutual: <B extends Entity$2, T extends Entity$2, A extends Entity$2>({ byEntityType, byEntityId, entityType, entityId, mutualPayload, accountId, options, }: {
         byEntityType: B;
         byEntityId: string;
@@ -4623,13 +4625,17 @@ declare class MutualService {
             ExpressionAttributeValues?: Record<string, AttributeValue>;
         };
     }) => Promise<{
-        mutual: Mutual<B, T, Record<string, any>>;
+        mutual: Mutual<B, T, {
+            [x: string]: any;
+        }>;
         eventPayload: {
             byEntityType: B;
             byEntityId: string;
             entityType: T;
             entityId: string;
-            parsedMutualPayload: Record<string, any>;
+            parsedMutualPayload: {
+                [x: string]: any;
+            };
             accountId: string | string[] | undefined;
             publishedAt: string;
         };

package/dist/index.js

@@ -1225,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,
@@ -1235,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)",
@@ -1251,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(),
@@ -1261,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,
@@ -1281,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"
@@ -1291,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: {
@@ -1365,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,
@@ -1376,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({
@@ -1383,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,
@@ -1416,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,
@@ -2162,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();
@@ -2174,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",
@@ -2262,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;
@@ -2285,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,
@@ -2320,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,
@@ -2327,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: {
@@ -2376,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
               },
               {
@@ -7846,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;
@@ -7861,6 +7957,7 @@ var MutualService = class {
       accountId,
       options = {}
     }) {
+      var _a;
       const {
         ensureEntityStrongConsistentWrite = false,
         asEntity,
@@ -7881,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,
@@ -7909,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,
@@ -7932,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,
@@ -7973,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* ({
@@ -7984,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,
@@ -7994,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: {
@@ -8005,6 +8143,7 @@ var MutualService = class {
           updatedByAccountId: accountId
         }
       });
+      console.log("[MONORISE_DEBUG] updateMutual service complete");
       return mutual;
     });
     this.deleteMutual = (_0) => __async(this, [_0], function* ({
@@ -8033,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
@@ -8192,6 +8347,7 @@ var DependencyContainer = class {
   get mutualService() {
     return this.createCachedInstance(
       MutualService,
+      this.config.EntityConfig,
       this.entityRepository,
       this.mutualRepository,
       this.publishEvent,