@monorise/core 5.0.0-dev.2 → 5.0.0-dev.4

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import { Entity as Entity$2, EntitySchemaMap, createEntityConfig, WhereConditions } from '@monorise/base';
+import { Entity as Entity$2, EntitySchemaMap, createEntityConfig, WhereConditions, TransactionOperation, TransactionResult } from '@monorise/base';
+export { transactional } from '@monorise/base';
 import * as hono from 'hono';
 import { Hono } from 'hono';
 import { DynamoDB, TransactWriteItemsInput, AttributeValue, TransactWriteItem, UpdateItemCommandInput } from '@aws-sdk/client-dynamodb';
@@ -4724,44 +4725,6 @@ declare class ListTagsController {
     }, hono_utils_http_status.ContentfulStatusCode, "json">>;
 }
 
-type TransactionCreateEntity<T extends Entity$2 = Entity$2> = {
-    operation: 'createEntity';
-    entityType: T;
-    entityId?: string;
-    payload: EntitySchemaMap[T];
-};
-type TransactionUpdateEntity<T extends Entity$2 = Entity$2> = {
-    operation: 'updateEntity';
-    entityType: T;
-    entityId: string;
-    payload: Partial<EntitySchemaMap[T]>;
-    accountId?: string;
-    condition?: string;
-};
-type TransactionAdjustEntity<T extends Entity$2 = Entity$2> = {
-    operation: 'adjustEntity';
-    entityType: T;
-    entityId: string;
-    adjustments: Record<string, number>;
-    accountId?: string;
-    condition?: string;
-};
-type TransactionDeleteEntity<T extends Entity$2 = Entity$2> = {
-    operation: 'deleteEntity';
-    entityType: T;
-    entityId: string;
-};
-type TransactionOperation = TransactionCreateEntity | TransactionUpdateEntity | TransactionAdjustEntity | TransactionDeleteEntity;
-type TransactionResultEntry = {
-    operation: string;
-    entityType: Entity$2;
-    entityId: string;
-    data?: Record<string, unknown>;
-};
-type TransactionResult = {
-    results: TransactionResultEntry[];
-};
-
 declare class TransactionService {
     private EntityConfig;
     private EmailAuthEnabledEntities;
@@ -4943,19 +4906,6 @@ declare const $default: (container: DependencyContainer) => (event: APIGatewayPr
  */
 declare const broadcast: (container: DependencyContainer) => (event: DynamoDBStreamEvent) => Promise<void>;
 
-declare const transactional: {
-    createEntity: <T extends Entity$2>(entityType: T, payload: EntitySchemaMap[T] & {
-        entityId?: string;
-    }) => TransactionCreateEntity<T>;
-    updateEntity: <T extends Entity$2>(entityType: T, entityId: string, payload: Partial<EntitySchemaMap[T]> & {
-        $condition?: string;
-    }) => TransactionUpdateEntity<T>;
-    adjustEntity: <T extends Entity$2>(entityType: T, entityId: string, adjustments: Record<string, number> & {
-        $condition?: string;
-    }) => TransactionAdjustEntity<T>;
-    deleteEntity: <T extends Entity$2>(entityType: T, entityId: string) => TransactionDeleteEntity<T>;
-};
-
 declare class CoreFactory {
     private config;
     setupCommonRoutes: ReturnType<typeof setupCommonRoutes>;
@@ -4977,4 +4927,4 @@ declare class CoreFactory {
     });
 }
 
-export { DependencyContainer, Entity$1 as Entity, EntityRepository, EntityService, Mutual, MutualRepository, MutualService, PROJECTION_EXPRESSION, StandardError, StandardErrorCode, TagRepository, TransactionService, WebSocketRepository, appHandler, handler$4 as createEntityProcessor, CoreFactory as default, handler$3 as mutualProcessor, handler$2 as prejoinProcessor, handler$1 as replicationProcessor, setupCommonRoutes, handler as tagProcessor, transactional, broadcast as wsBroadcast, connect as wsConnect, $default as wsDefault, disconnect as wsDisconnect };
+export { DependencyContainer, Entity$1 as Entity, EntityRepository, EntityService, Mutual, MutualRepository, MutualService, PROJECTION_EXPRESSION, StandardError, StandardErrorCode, TagRepository, TransactionService, WebSocketRepository, appHandler, handler$4 as createEntityProcessor, CoreFactory as default, handler$3 as mutualProcessor, handler$2 as prejoinProcessor, handler$1 as replicationProcessor, setupCommonRoutes, handler as tagProcessor, broadcast as wsBroadcast, connect as wsConnect, $default as wsDefault, disconnect as wsDisconnect };

package/dist/index.js

@@ -1075,7 +1075,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,
@@ -1085,6 +1092,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)",
@@ -1101,9 +1113,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(),
@@ -1111,12 +1128,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,
@@ -1131,7 +1164,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"
@@ -1141,6 +1178,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: {
@@ -1215,10 +1260,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,
@@ -1226,6 +1280,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({
@@ -1233,6 +1293,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,
@@ -1266,18 +1331,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,
@@ -2215,6 +2295,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();
@@ -2227,12 +2308,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",
@@ -7930,6 +8020,7 @@ var CreateMutualController = class {
   constructor(mutualService) {
     this.mutualService = mutualService;
     this.controller = createMiddleware11((c) => __async(this, null, function* () {
+      var _a;
       const accountId = c.req.header("account-id");
       const { byEntityType, byEntityId, entityType, entityId } = c.req.param();
       const asEntity = c.req.query("asEntity");
@@ -7948,7 +8039,7 @@ var CreateMutualController = class {
         });
         return c.json(mutual);
       } catch (err) {
-        if (err instanceof ZodError) {
+        if (((_a = err == null ? void 0 : err.constructor) == null ? void 0 : _a.name) === "ZodError") {
           c.status(httpStatus11.BAD_REQUEST);
           return c.json({
             code: "API_VALIDATION_ERROR",
@@ -7956,15 +8047,15 @@ var CreateMutualController = class {
             details: err.flatten()
           });
         }
-        if (err instanceof StandardError && err.code === StandardErrorCode.MUTUAL_EXISTS) {
-          c.status(httpStatus11.BAD_REQUEST);
-          return c.json(__spreadValues({}, err.toJSON()));
-        }
-        if (err instanceof StandardError && err.code === StandardErrorCode.ENTITY_IS_UNDEFINED) {
+        if (err instanceof StandardError) {
           c.status(httpStatus11.BAD_REQUEST);
           return c.json(__spreadValues({}, err.toJSON()));
         }
-        throw err;
+        c.status(httpStatus11.INTERNAL_SERVER_ERROR);
+        return c.json({
+          code: "INTERNAL_SERVER_ERROR",
+          message: (err == null ? void 0 : err.message) || "An unexpected error occurred"
+        });
       }
     }));
   }
@@ -8098,6 +8189,7 @@ var UpdateMutualController = class {
   constructor(mutualService) {
     this.mutualService = mutualService;
     this.controller = createMiddleware15((c) => __async(this, null, function* () {
+      var _a;
       const accountId = c.req.header("account-id");
       const { byEntityType, byEntityId, entityType, entityId } = c.req.param();
       const body = yield c.req.json();
@@ -8115,7 +8207,7 @@ var UpdateMutualController = class {
         });
         return c.json(mutual);
       } catch (err) {
-        if (err instanceof ZodError) {
+        if (((_a = err == null ? void 0 : err.constructor) == null ? void 0 : _a.name) === "ZodError") {
           c.status(httpStatus14.BAD_REQUEST);
           return c.json({
             code: "API_VALIDATION_ERROR",
@@ -8123,11 +8215,15 @@ var UpdateMutualController = class {
             details: err.flatten()
           });
         }
-        if (err instanceof StandardError && err.code === StandardErrorCode.MUTUAL_NOT_FOUND) {
+        if (err instanceof StandardError) {
           c.status(httpStatus14.BAD_REQUEST);
           return c.json(__spreadValues({}, err.toJSON()));
         }
-        throw err;
+        c.status(httpStatus14.INTERNAL_SERVER_ERROR);
+        return c.json({
+          code: "INTERNAL_SERVER_ERROR",
+          message: (err == null ? void 0 : err.message) || "An unexpected error occurred"
+        });
       }
     }));
   }
@@ -8552,20 +8648,37 @@ var MutualService = class {
           options
         }
       };
+      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,
@@ -8580,6 +8693,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,
@@ -8603,9 +8719,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,
@@ -8644,6 +8764,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* ({
@@ -8656,8 +8777,19 @@ var MutualService = class {
       options
     }) {
       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,
@@ -8666,6 +8798,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: {
@@ -8677,6 +8813,7 @@ var MutualService = class {
           updatedByAccountId: accountId
         }
       });
+      console.log("[MONORISE_DEBUG] updateMutual service complete");
       return mutual;
     });
     this.deleteMutual = (_0) => __async(this, [_0], function* ({
@@ -9547,19 +9684,47 @@ var DependencyContainer = class {
   }
 };
 
-// helpers/transactional.ts
+// ../base/dist/index.js
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues2 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __objRest2 = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var transactional = {
   createEntity: (entityType, payload) => {
-    const _a = payload, { entityId } = _a, rest = __objRest(_a, ["entityId"]);
-    return __spreadValues({
+    const _a = payload, { entityId } = _a, rest = __objRest2(_a, ["entityId"]);
+    return __spreadValues2({
       operation: "createEntity",
       entityType,
       payload: rest
     }, entityId && { entityId });
   },
   updateEntity: (entityType, entityId, payload) => {
-    const _a = payload, { $condition } = _a, rest = __objRest(_a, ["$condition"]);
-    return __spreadValues({
+    const _a = payload, { $condition } = _a, rest = __objRest2(_a, ["$condition"]);
+    return __spreadValues2({
       operation: "updateEntity",
       entityType,
       entityId,
@@ -9567,8 +9732,8 @@ var transactional = {
     }, $condition && { condition: $condition });
   },
   adjustEntity: (entityType, entityId, adjustments) => {
-    const _a = adjustments, { $condition } = _a, rest = __objRest(_a, ["$condition"]);
-    return __spreadValues({
+    const _a = adjustments, { $condition } = _a, rest = __objRest2(_a, ["$condition"]);
+    return __spreadValues2({
       operation: "adjustEntity",
       entityType,
       entityId,