@expo/entity 0.42.0 → 0.44.0

package/src/metrics/EntityMetricsUtils.ts

@@ -2,6 +2,7 @@ import IEntityMetricsAdapter, {
   EntityMetricsLoadType,
   EntityMetricsMutationType,
 } from './IEntityMetricsAdapter';
+import { EntityQueryContext } from '../EntityQueryContext';
 import { IEntityLoadValue } from '../internal/EntityLoadInterfaces';
 import { reduceMap } from '../utils/collections/maps';
 
@@ -10,6 +11,7 @@ export const timeAndLogLoadEventAsync =
     metricsAdapter: IEntityMetricsAdapter,
     loadType: EntityMetricsLoadType,
     entityClassName: string,
+    queryContext: EntityQueryContext,
   ) =>
   async <TFields>(promise: Promise<readonly Readonly<TFields>[]>) => {
     const startTime = Date.now();
@@ -18,6 +20,7 @@ export const timeAndLogLoadEventAsync =
 
     metricsAdapter.logDataManagerLoadEvent({
       type: loadType,
+      isInTransaction: queryContext.isInTransaction(),
       entityClassName,
       duration: endTime - startTime,
       count: result.length,
@@ -31,6 +34,7 @@ export const timeAndLogLoadMapEventAsync =
     metricsAdapter: IEntityMetricsAdapter,
     loadType: EntityMetricsLoadType,
     entityClassName: string,
+    queryContext: EntityQueryContext,
   ) =>
   async <
     TFields extends Record<string, any>,
@@ -47,6 +51,7 @@ export const timeAndLogLoadMapEventAsync =
 
     metricsAdapter.logDataManagerLoadEvent({
       type: loadType,
+      isInTransaction: queryContext.isInTransaction(),
       entityClassName,
       duration: endTime - startTime,
       count,
@@ -60,6 +65,7 @@ export const timeAndLogMutationEventAsync =
     metricsAdapter: IEntityMetricsAdapter,
     mutationType: EntityMetricsMutationType,
     entityClassName: string,
+    queryContext: EntityQueryContext,
   ) =>
   async <T>(promise: Promise<T>) => {
     const startTime = Date.now();
@@ -68,6 +74,7 @@ export const timeAndLogMutationEventAsync =
 
     metricsAdapter.logMutatorMutationEvent({
       type: mutationType,
+      isInTransaction: queryContext.isInTransaction(),
       entityClassName,
       duration: endTime - startTime,
     });

package/src/metrics/IEntityMetricsAdapter.ts

@@ -19,6 +19,11 @@ export interface EntityMetricsLoadEvent {
    */
   type: EntityMetricsLoadType;
 
+  /**
+   * Whether this load is within a transaction.
+   */
+  isInTransaction: boolean;
+
   /**
    * Class name of the Entity being loaded.
    */
@@ -47,6 +52,11 @@ export interface EntityMetricsMutationEvent {
    */
   type: EntityMetricsMutationType;
 
+  /**
+   * Whether this mutation is within a transaction.
+   */
+  isInTransaction: boolean;
+
   /**
    * Class name of the Entity being mutated.
    */
@@ -85,6 +95,11 @@ export interface IncrementLoadCountEvent {
    */
   type: IncrementLoadCountEventType;
 
+  /**
+   * Whether this load is within a transaction.
+   */
+  isInTransaction: boolean;
+
   /**
    * Load method type for this event.
    */
@@ -114,8 +129,20 @@ export interface EntityMetricsAuthorizationEvent {
    * Class name of the Entity being authorized.
    */
   entityClassName: string;
+
+  /**
+   * The action being authorized.
+   */
   action: EntityAuthorizationAction;
+
+  /**
+   * The result of the authorization.
+   */
   evaluationResult: EntityMetricsAuthorizationResult;
+
+  /**
+   * The evaluation mode of the privacy policy.
+   */
   privacyPolicyEvaluationMode: EntityPrivacyPolicyEvaluationMode;
 }
 

package/src/utils/__testfixtures__/StubDatabaseAdapter.ts

@@ -49,6 +49,18 @@ export default class StubDatabaseAdapter<
     return new Map();
   }
 
+  private static uniqBy<T>(a: T[], keyExtractor: (k: T) => string): T[] {
+    const seen = new Set();
+    return a.filter((item) => {
+      const k = keyExtractor(item);
+      if (seen.has(k)) {
+        return false;
+      }
+      seen.add(k);
+      return true;
+    });
+  }
+
   protected async fetchManyWhereInternalAsync(
     _queryInterface: any,
     tableName: string,
@@ -56,7 +68,7 @@ export default class StubDatabaseAdapter<
     tableTuples: (readonly any[])[],
   ): Promise<object[]> {
     const objectCollection = this.getObjectCollectionForTable(tableName);
-    const results = tableTuples.reduce(
+    const results = StubDatabaseAdapter.uniqBy(tableTuples, (tuple) => tuple.join(':')).reduce(
       (acc, tableTuple) => {
         return acc.concat(
           objectCollection.filter((obj) => {