@expo/entity 0.31.1 → 0.33.0

package/src/__tests__/EntityLoader-constructor-test.ts

@@ -87,17 +87,22 @@ export default class TestEntity extends Entity<
   ViewerContext,
   TestFieldSelection
 > {
-  constructor(viewerContext: ViewerContext, rawFields: Readonly<TestFields>) {
-    if (rawFields.id === ID_SENTINEL_THROW_LITERAL) {
+  constructor(constructorParams: {
+    viewerContext: ViewerContext;
+    id: string;
+    databaseFields: Readonly<TestFields>;
+    selectedFields: Readonly<TestFields>;
+  }) {
+    if (constructorParams.selectedFields.id === ID_SENTINEL_THROW_LITERAL) {
       // eslint-disable-next-line no-throw-literal,@typescript-eslint/no-throw-literal
       throw 'hello';
-    } else if (rawFields.id === ID_SENTINEL_THROW_ERROR) {
+    } else if (constructorParams.selectedFields.id === ID_SENTINEL_THROW_ERROR) {
       throw new Error('world');
     }
-    super(viewerContext, rawFields);
+    super(constructorParams);
   }
 
-  static getCompanionDefinition(): EntityCompanionDefinition<
+  static defineCompanionDefinition(): EntityCompanionDefinition<
     TestFields,
     string,
     ViewerContext,
@@ -105,16 +110,14 @@ export default class TestEntity extends Entity<
     TestEntityPrivacyPolicy,
     TestFieldSelection
   > {
-    return testEntityCompanion;
+    return {
+      entityClass: TestEntity,
+      entityConfiguration: testEntityConfiguration,
+      privacyPolicyClass: TestEntityPrivacyPolicy,
+    };
   }
 }
 
-export const testEntityCompanion = new EntityCompanionDefinition({
-  entityClass: TestEntity,
-  entityConfiguration: testEntityConfiguration,
-  privacyPolicyClass: TestEntityPrivacyPolicy,
-});
-
 describe(EntityLoader, () => {
   it('handles thrown errors and literals from constructor', async () => {
     const viewerContext = instance(mock(ViewerContext));
@@ -158,6 +161,7 @@ describe(EntityLoader, () => {
       privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
+      /* entitySelectedFields */ undefined,
       privacyPolicy,
       dataManager,
       metricsAdapter

package/src/__tests__/EntityLoader-test.ts

@@ -75,6 +75,7 @@ describe(EntityLoader, () => {
       privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
+      /* entitySelectedFields */ undefined,
       privacyPolicy,
       dataManager,
       metricsAdapter
@@ -177,6 +178,7 @@ describe(EntityLoader, () => {
       privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
+      /* entitySelectedFields */ undefined,
       privacyPolicy,
       dataManager,
       metricsAdapter
@@ -275,6 +277,7 @@ describe(EntityLoader, () => {
       privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
+      /* entitySelectedFields */ undefined,
       privacyPolicy,
       dataManager,
       metricsAdapter
@@ -353,6 +356,7 @@ describe(EntityLoader, () => {
       privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
+      /* entitySelectedFields */ undefined,
       privacyPolicy,
       dataManager,
       metricsAdapter
@@ -385,6 +389,7 @@ describe(EntityLoader, () => {
       privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
+      /* entitySelectedFields */ undefined,
       privacyPolicy,
       dataManagerInstance,
       metricsAdapter
@@ -412,6 +417,7 @@ describe(EntityLoader, () => {
       privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
+      /* entitySelectedFields */ undefined,
       privacyPolicy,
       dataManagerInstance,
       metricsAdapter
@@ -442,6 +448,7 @@ describe(EntityLoader, () => {
       privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
+      /* entitySelectedFields */ undefined,
       privacyPolicy,
       dataManagerInstance,
       metricsAdapter
@@ -486,6 +493,7 @@ describe(EntityLoader, () => {
       privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
+      /* entitySelectedFields */ undefined,
       privacyPolicy,
       dataManagerInstance,
       metricsAdapter
@@ -519,6 +527,7 @@ describe(EntityLoader, () => {
       privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
+      /* entitySelectedFields */ undefined,
       privacyPolicy,
       dataManagerInstance,
       metricsAdapter
@@ -529,7 +538,11 @@ describe(EntityLoader, () => {
     await expect(entityLoader.loadByIDAsync(loadByValue)).rejects.toEqual(error);
     await expect(entityLoader.enforcing().loadByIDAsync(loadByValue)).rejects.toEqual(error);
     await expect(entityLoader.loadManyByIDsAsync([loadByValue])).rejects.toEqual(error);
-    await expect(entityLoader.loadManyByIDsAsync([loadByValue])).rejects.toEqual(error);
+    await expect(entityLoader.enforcing().loadManyByIDsAsync([loadByValue])).rejects.toEqual(error);
+    await expect(entityLoader.loadManyByIDsNullableAsync([loadByValue])).rejects.toEqual(error);
+    await expect(
+      entityLoader.enforcing().loadManyByIDsNullableAsync([loadByValue])
+    ).rejects.toEqual(error);
     await expect(
       entityLoader.loadManyByFieldEqualingAsync('customIdField', loadByValue)
     ).rejects.toEqual(error);

package/src/__tests__/EntityMutator-MutationCacheConsistency-test.ts

@@ -34,37 +34,35 @@ class BlahEntityPrivacyPolicy extends EntityPrivacyPolicy<
 }
 
 class BlahEntity extends Entity<BlahFields, string, ViewerContext> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
+  static defineCompanionDefinition(): EntityCompanionDefinition<
     BlahFields,
     string,
     ViewerContext,
     BlahEntity,
     BlahEntityPrivacyPolicy
   > {
-    return blahCompanion;
+    return {
+      entityClass: BlahEntity,
+      entityConfiguration: new EntityConfiguration<BlahFields>({
+        idField: 'id',
+        tableName: 'blah_table',
+        schema: {
+          id: new UUIDField({
+            columnName: 'id',
+            cache: true,
+          }),
+        },
+        databaseAdapterFlavor: 'postgres',
+        cacheAdapterFlavor: 'redis',
+      }),
+      privacyPolicyClass: BlahEntityPrivacyPolicy,
+      mutationTriggers: {
+        afterCommit: [new TestNonTransactionalMutationTrigger()],
+      },
+    };
   }
 }
 
-const blahCompanion = new EntityCompanionDefinition({
-  entityClass: BlahEntity,
-  entityConfiguration: new EntityConfiguration<BlahFields>({
-    idField: 'id',
-    tableName: 'blah_table',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'redis',
-  }),
-  privacyPolicyClass: BlahEntityPrivacyPolicy,
-  mutationTriggers: () => ({
-    afterCommit: [new TestNonTransactionalMutationTrigger()],
-  }),
-});
-
 class TestNonTransactionalMutationTrigger extends EntityNonTransactionalMutationTrigger<
   BlahFields,
   string,

package/src/__tests__/EntityMutator-test.ts

@@ -12,7 +12,10 @@ import {
 } from 'ts-mockito';
 import { v4 as uuidv4 } from 'uuid';
 
+import EntityCompanionProvider from '../EntityCompanionProvider';
+import EntityConfiguration from '../EntityConfiguration';
 import EntityDatabaseAdapter from '../EntityDatabaseAdapter';
+import EntityLoader from '../EntityLoader';
 import EntityLoaderFactory from '../EntityLoaderFactory';
 import {
   EntityMutationType,
@@ -27,6 +30,7 @@ import EntityMutationValidator from '../EntityMutationValidator';
 import EntityMutatorFactory from '../EntityMutatorFactory';
 import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityTransactionalQueryContext, EntityQueryContext } from '../EntityQueryContext';
+import IEntityDatabaseAdapterProvider from '../IEntityDatabaseAdapterProvider';
 import ViewerContext from '../ViewerContext';
 import { enforceResultsAsync } from '../entityUtils';
 import EntityDataManager from '../internal/EntityDataManager';
@@ -299,10 +303,39 @@ const createEntityMutatorFactory = (
       new Map([[testEntityConfiguration.tableName, existingObjects]])
     )
   );
+  const customStubDatabaseAdapterProvider: IEntityDatabaseAdapterProvider = {
+    getDatabaseAdapter<TFields>(
+      _entityConfiguration: EntityConfiguration<TFields>
+    ): EntityDatabaseAdapter<TFields> {
+      return databaseAdapter as any as EntityDatabaseAdapter<TFields>;
+    },
+  };
   const metricsAdapter = new NoOpEntityMetricsAdapter();
   const cacheAdapterProvider = new NoCacheStubCacheAdapterProvider();
   const cacheAdapter = cacheAdapterProvider.getCacheAdapter(testEntityConfiguration);
   const entityCache = new ReadThroughEntityCache<TestFields>(testEntityConfiguration, cacheAdapter);
+
+  const companionProvider = new EntityCompanionProvider(
+    metricsAdapter,
+    new Map([
+      [
+        'postgres',
+        {
+          adapterProvider: customStubDatabaseAdapterProvider,
+          queryContextProvider: StubQueryContextProvider,
+        },
+      ],
+    ]),
+    new Map([
+      [
+        'redis',
+        {
+          cacheAdapterProvider,
+        },
+      ],
+    ])
+  );
+
   const dataManager = new EntityDataManager(
     databaseAdapter,
     entityCache,
@@ -311,13 +344,12 @@ const createEntityMutatorFactory = (
     TestEntity.name
   );
   const entityLoaderFactory = new EntityLoaderFactory(
-    testEntityConfiguration,
-    TestEntity,
-    privacyPolicy,
+    companionProvider.getCompanionForEntity(TestEntity),
     dataManager,
     metricsAdapter
   );
   const entityMutatorFactory = new EntityMutatorFactory(
+    companionProvider,
     testEntityConfiguration,
     TestEntity,
     privacyPolicy,
@@ -930,12 +962,40 @@ describe(EntityMutatorFactory, () => {
   });
 
   it('returns error result when not authorized to create', async () => {
+    const entityCompanionProvider = instance(mock(EntityCompanionProvider));
     const viewerContext = instance(mock(ViewerContext));
     const queryContext = StubQueryContextProvider.getQueryContext();
     const privacyPolicyMock = mock(SimpleTestEntityPrivacyPolicy);
     const databaseAdapter = instance(mock<EntityDatabaseAdapter<SimpleTestFields>>());
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
-    const entityLoaderFactory = instance(
+
+    const id1 = uuidv4();
+    const fakeEntity = new SimpleTestEntity({
+      viewerContext,
+      id: id1,
+      selectedFields: {
+        id: id1,
+      },
+      databaseFields: {
+        id: id1,
+      },
+    });
+
+    const entityLoaderMock =
+      mock<
+        EntityLoader<
+          SimpleTestFields,
+          string,
+          ViewerContext,
+          SimpleTestEntity,
+          SimpleTestEntityPrivacyPolicy,
+          keyof SimpleTestFields
+        >
+      >(EntityLoader);
+    when(entityLoaderMock.constructEntity(anything())).thenReturn(fakeEntity);
+    const entityLoader = instance(entityLoaderMock);
+
+    const entityLoaderFactoryMock =
       mock<
         EntityLoaderFactory<
           SimpleTestFields,
@@ -945,8 +1005,15 @@ describe(EntityMutatorFactory, () => {
           SimpleTestEntityPrivacyPolicy,
           keyof SimpleTestFields
         >
-      >(EntityLoaderFactory)
-    );
+      >(EntityLoaderFactory);
+    when(
+      entityLoaderFactoryMock.forLoad(
+        viewerContext,
+        anyOfClass(EntityTransactionalQueryContext),
+        anything()
+      )
+    ).thenReturn(entityLoader);
+    const entityLoaderFactory = instance(entityLoaderFactoryMock);
 
     const rejectionError = new Error();
 
@@ -979,6 +1046,7 @@ describe(EntityMutatorFactory, () => {
     ).thenReject(rejectionError);
 
     const entityMutatorFactory = new EntityMutatorFactory(
+      entityCompanionProvider,
       simpleTestEntityConfiguration,
       SimpleTestEntity,
       instance(privacyPolicyMock),
@@ -996,11 +1064,6 @@ describe(EntityMutatorFactory, () => {
     expect(entityCreateResult.reason).toEqual(rejectionError);
     expect(entityCreateResult.value).toBe(undefined);
 
-    const id1 = uuidv4();
-    const fakeEntity = new SimpleTestEntity(viewerContext, {
-      id: id1,
-    });
-
     const entityUpdateResult = await entityMutatorFactory
       .forUpdate(fakeEntity, queryContext)
       .updateAsync();
@@ -1017,12 +1080,46 @@ describe(EntityMutatorFactory, () => {
   });
 
   it('throws error when db adapter throws', async () => {
+    const entityCompanionProviderMock = mock(EntityCompanionProvider);
+    when(entityCompanionProviderMock.getCompanionForEntity(SimpleTestEntity)).thenReturn({
+      entityCompanionDefinition: SimpleTestEntity.defineCompanionDefinition(),
+    } as any);
+
+    const entityCompanionProvider = instance(entityCompanionProviderMock);
+
     const viewerContext = instance(mock(ViewerContext));
     const queryContext = StubQueryContextProvider.getQueryContext();
     const privacyPolicy = instance(mock(SimpleTestEntityPrivacyPolicy));
     const databaseAdapterMock = mock<EntityDatabaseAdapter<SimpleTestFields>>();
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
-    const entityLoaderFactory = instance(
+
+    const id1 = uuidv4();
+    const fakeEntity = new SimpleTestEntity({
+      viewerContext,
+      id: id1,
+      selectedFields: {
+        id: id1,
+      },
+      databaseFields: {
+        id: id1,
+      },
+    });
+
+    const entityLoaderMock =
+      mock<
+        EntityLoader<
+          SimpleTestFields,
+          string,
+          ViewerContext,
+          SimpleTestEntity,
+          SimpleTestEntityPrivacyPolicy,
+          keyof SimpleTestFields
+        >
+      >(EntityLoader);
+    when(entityLoaderMock.constructEntity(anything())).thenReturn(fakeEntity);
+    const entityLoader = instance(entityLoaderMock);
+
+    const entityLoaderFactoryMock =
       mock<
         EntityLoaderFactory<
           SimpleTestFields,
@@ -1032,8 +1129,15 @@ describe(EntityMutatorFactory, () => {
           SimpleTestEntityPrivacyPolicy,
           keyof SimpleTestFields
         >
-      >(EntityLoaderFactory)
-    );
+      >(EntityLoaderFactory);
+    when(
+      entityLoaderFactoryMock.forLoad(
+        viewerContext,
+        anyOfClass(EntityTransactionalQueryContext),
+        anything()
+      )
+    ).thenReturn(entityLoader);
+    const entityLoaderFactory = instance(entityLoaderFactoryMock);
 
     const rejectionError = new Error();
 
@@ -1057,6 +1161,7 @@ describe(EntityMutatorFactory, () => {
     ).thenReject(rejectionError);
 
     const entityMutatorFactory = new EntityMutatorFactory(
+      entityCompanionProvider,
       simpleTestEntityConfiguration,
       SimpleTestEntity,
       privacyPolicy,
@@ -1067,11 +1172,6 @@ describe(EntityMutatorFactory, () => {
       metricsAdapter
     );
 
-    const id1 = uuidv4();
-    const fakeEntity = new SimpleTestEntity(viewerContext, {
-      id: id1,
-    });
-
     await expect(
       entityMutatorFactory.forCreate(viewerContext, queryContext).createAsync()
     ).rejects.toEqual(rejectionError);

package/src/__tests__/EntityPrivacyPolicy-test.ts

@@ -26,14 +26,28 @@ type BlahFields = {
 };
 
 class BlahEntity extends Entity<BlahFields, string, ViewerContext> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
+  static defineCompanionDefinition(): EntityCompanionDefinition<
     BlahFields,
     string,
     ViewerContext,
     BlahEntity,
     any
   > {
-    return blahEntityCompanionDefinition;
+    return {
+      entityClass: BlahEntity,
+      entityConfiguration: new EntityConfiguration<BlahFields>({
+        idField: 'id',
+        tableName: 'blah_table',
+        schema: {
+          id: new UUIDField({
+            columnName: 'id',
+          }),
+        },
+        databaseAdapterFlavor: 'postgres',
+        cacheAdapterFlavor: 'redis',
+      }),
+      privacyPolicyClass: AlwaysDenyPolicy,
+    };
   }
 }
 
@@ -226,22 +240,6 @@ class EmptyPolicy extends EntityPrivacyPolicy<BlahFields, string, ViewerContext,
   protected override readonly deleteRules = [];
 }
 
-const blahEntityCompanionDefinition = new EntityCompanionDefinition({
-  entityClass: BlahEntity,
-  entityConfiguration: new EntityConfiguration<BlahFields>({
-    idField: 'id',
-    tableName: 'blah_table',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'redis',
-  }),
-  privacyPolicyClass: AlwaysDenyPolicy,
-});
-
 describe(EntityPrivacyPolicy, () => {
   describe(EntityPrivacyPolicyEvaluationMode.ENFORCE.toString(), () => {
     it('throws EntityNotAuthorizedError when deny', async () => {
@@ -250,7 +248,12 @@ describe(EntityPrivacyPolicy, () => {
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
-      const entity = new BlahEntity(viewerContext, { id: '1' });
+      const entity = new BlahEntity({
+        viewerContext,
+        id: '1',
+        databaseFields: { id: '1' },
+        selectedFields: { id: '1' },
+      });
       const policy = new AlwaysDenyPolicy();
       await expect(
         policy.authorizeCreateAsync(
@@ -279,7 +282,12 @@ describe(EntityPrivacyPolicy, () => {
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
-      const entity = new BlahEntity(viewerContext, { id: '1' });
+      const entity = new BlahEntity({
+        viewerContext,
+        id: '1',
+        databaseFields: { id: '1' },
+        selectedFields: { id: '1' },
+      });
       const policy = new AlwaysAllowPolicy();
       const approvedEntity = await policy.authorizeCreateAsync(
         viewerContext,
@@ -307,7 +315,12 @@ describe(EntityPrivacyPolicy, () => {
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
-      const entity = new BlahEntity(viewerContext, { id: '1' });
+      const entity = new BlahEntity({
+        viewerContext,
+        id: '1',
+        databaseFields: { id: '1' },
+        selectedFields: { id: '1' },
+      });
       const policy = new SkipAllPolicy();
       await expect(
         policy.authorizeCreateAsync(
@@ -336,7 +349,12 @@ describe(EntityPrivacyPolicy, () => {
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
-      const entity = new BlahEntity(viewerContext, { id: '1' });
+      const entity = new BlahEntity({
+        viewerContext,
+        id: '1',
+        databaseFields: { id: '1' },
+        selectedFields: { id: '1' },
+      });
       const policy = new EmptyPolicy();
       await expect(
         policy.authorizeCreateAsync(
@@ -365,7 +383,12 @@ describe(EntityPrivacyPolicy, () => {
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
-      const entity = new BlahEntity(viewerContext, { id: '1' });
+      const entity = new BlahEntity({
+        viewerContext,
+        id: '1',
+        databaseFields: { id: '1' },
+        selectedFields: { id: '1' },
+      });
       const policy = new ThrowAllPolicy();
       await expect(
         policy.authorizeCreateAsync(
@@ -387,7 +410,12 @@ describe(EntityPrivacyPolicy, () => {
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
-      const entity = new BlahEntity(viewerContext, { id: '1' });
+      const entity = new BlahEntity({
+        viewerContext,
+        id: '1',
+        databaseFields: { id: '1' },
+        selectedFields: { id: '1' },
+      });
       const policy = new DryRunAlwaysDenyPolicy();
 
       const policySpy = spy(policy);
@@ -421,7 +449,12 @@ describe(EntityPrivacyPolicy, () => {
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
-      const entity = new BlahEntity(viewerContext, { id: '1' });
+      const entity = new BlahEntity({
+        viewerContext,
+        id: '1',
+        databaseFields: { id: '1' },
+        selectedFields: { id: '1' },
+      });
       const policy = new DryRunAlwaysAllowPolicy();
 
       const policySpy = spy(policy);
@@ -455,7 +488,12 @@ describe(EntityPrivacyPolicy, () => {
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
-      const entity = new BlahEntity(viewerContext, { id: '1' });
+      const entity = new BlahEntity({
+        viewerContext,
+        id: '1',
+        databaseFields: { id: '1' },
+        selectedFields: { id: '1' },
+      });
       const policy = new DryRunThrowAllPolicy();
 
       const policySpy = spy(policy);
@@ -483,7 +521,12 @@ describe(EntityPrivacyPolicy, () => {
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
-      const entity = new BlahEntity(viewerContext, { id: '1' });
+      const entity = new BlahEntity({
+        viewerContext,
+        id: '1',
+        databaseFields: { id: '1' },
+        selectedFields: { id: '1' },
+      });
       const policy = new LoggingEnforceAlwaysDenyPolicy();
 
       const policySpy = spy(policy);
@@ -518,7 +561,12 @@ describe(EntityPrivacyPolicy, () => {
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
-      const entity = new BlahEntity(viewerContext, { id: '1' });
+      const entity = new BlahEntity({
+        viewerContext,
+        id: '1',
+        databaseFields: { id: '1' },
+        selectedFields: { id: '1' },
+      });
       const policy = new LoggingEnforceAlwaysAllowPolicy();
 
       const policySpy = spy(policy);
@@ -552,7 +600,12 @@ describe(EntityPrivacyPolicy, () => {
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
-      const entity = new BlahEntity(viewerContext, { id: '1' });
+      const entity = new BlahEntity({
+        viewerContext,
+        id: '1',
+        databaseFields: { id: '1' },
+        selectedFields: { id: '1' },
+      });
       const policy = new LoggingEnforceThrowAllPolicy();
 
       const policySpy = spy(policy);

package/src/__tests__/EntityQueryContext-test.ts

@@ -1,6 +1,6 @@
 import invariant from 'invariant';
 
-import { EntityQueryContext } from '../EntityQueryContext';
+import { EntityQueryContext, TransactionIsolationLevel } from '../EntityQueryContext';
 import ViewerContext from '../ViewerContext';
 import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
 
@@ -129,4 +129,26 @@ describe(EntityQueryContext, () => {
       expect(postCommitInvalidationCallback).toHaveBeenCalledTimes(2);
     });
   });
+
+  describe('transaction config', () => {
+    it('passes it into the provider', async () => {
+      const companionProvider = createUnitTestEntityCompanionProvider();
+      const viewerContext = new ViewerContext(companionProvider);
+
+      const queryContextProvider =
+        companionProvider.getQueryContextProviderForDatabaseAdaptorFlavor('postgres');
+      const queryContextProviderSpy = jest.spyOn(queryContextProvider, 'runInTransactionAsync');
+
+      const transactionScopeFn = async (): Promise<any> => {};
+      const transactionConfig = { isolationLevel: TransactionIsolationLevel.SERIALIZABLE };
+
+      await viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
+        'postgres',
+        transactionScopeFn,
+        transactionConfig
+      );
+
+      expect(queryContextProviderSpy).toHaveBeenCalledWith(transactionScopeFn, transactionConfig);
+    });
+  });
 });