@expo/entity 0.38.0 → 0.40.0

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

@@ -4,6 +4,7 @@ import EntityConfiguration from '../EntityConfiguration';
 import { UUIDField } from '../EntityFields';
 import { EntityMutationType, EntityTriggerMutationInfo } from '../EntityMutationInfo';
 import { EntityNonTransactionalMutationTrigger } from '../EntityMutationTriggerConfiguration';
+import EntityMutatorFactory from '../EntityMutatorFactory';
 import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
 import ViewerContext from '../ViewerContext';
 import AlwaysAllowPrivacyPolicyRule from '../rules/AlwaysAllowPrivacyPolicyRule';
@@ -87,17 +88,17 @@ class TestNonTransactionalMutationTrigger extends EntityNonTransactionalMutation
   }
 }
 
-describe('EntityMutator', () => {
+describe(EntityMutatorFactory, () => {
   test('cache consistency with post-commit callbacks', async () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new ViewerContext(companionProvider);
 
     // put it in cache
-    const entity = await BlahEntity.creator(viewerContext).enforceCreateAsync();
+    const entity = await BlahEntity.creator(viewerContext).enforcing().createAsync();
     const entityLoaded = await BlahEntity.loader(viewerContext)
       .enforcing()
       .loadByIDAsync(entity.getID());
 
-    await BlahEntity.enforceDeleteAsync(entityLoaded);
+    await BlahEntity.deleter(entityLoaded).enforcing().deleteAsync();
   });
 });

package/src/__tests__/EntityMutator-test.ts

@@ -12,10 +12,10 @@ import {
 } from 'ts-mockito';
 import { v4 as uuidv4 } from 'uuid';
 
+import AuthorizationResultBasedEntityLoader from '../AuthorizationResultBasedEntityLoader';
 import EntityCompanionProvider from '../EntityCompanionProvider';
 import EntityConfiguration from '../EntityConfiguration';
 import EntityDatabaseAdapter from '../EntityDatabaseAdapter';
-import EntityLoader from '../EntityLoader';
 import EntityLoaderFactory from '../EntityLoaderFactory';
 import EntityLoaderUtils from '../EntityLoaderUtils';
 import {
@@ -315,6 +315,7 @@ const createEntityMutatorFactory = (
   const cacheAdapter = cacheAdapterProvider.getCacheAdapter(testEntityConfiguration);
   const entityCache = new ReadThroughEntityCache<TestFields>(testEntityConfiguration, cacheAdapter);
 
+  const queryContextProvider = new StubQueryContextProvider();
   const companionProvider = new EntityCompanionProvider(
     metricsAdapter,
     new Map([
@@ -322,7 +323,7 @@ const createEntityMutatorFactory = (
         'postgres',
         {
           adapterProvider: customStubDatabaseAdapterProvider,
-          queryContextProvider: StubQueryContextProvider,
+          queryContextProvider,
         },
       ],
     ]),
@@ -339,7 +340,7 @@ const createEntityMutatorFactory = (
   const dataManager = new EntityDataManager(
     databaseAdapter,
     entityCache,
-    StubQueryContextProvider,
+    queryContextProvider,
     metricsAdapter,
     TestEntity.name,
   );
@@ -373,7 +374,7 @@ describe(EntityMutatorFactory, () => {
   describe('forCreate', () => {
     it('creates entities', async () => {
       const viewerContext = mock<ViewerContext>();
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = new StubQueryContextProvider().getQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -395,16 +396,18 @@ describe(EntityMutatorFactory, () => {
           nullableField: null,
         },
       ]);
-      const newEntity = await entityMutatorFactory
-        .forCreate(viewerContext, queryContext)
-        .setField('stringField', 'huh')
-        .enforceCreateAsync();
+      const newEntity = await enforceAsyncResult(
+        entityMutatorFactory
+          .forCreate(viewerContext, queryContext)
+          .setField('stringField', 'huh')
+          .createAsync(),
+      );
       expect(newEntity).toBeTruthy();
     });
 
     it('checks privacy', async () => {
       const viewerContext = mock<ViewerContext>();
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = new StubQueryContextProvider().getQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -429,10 +432,12 @@ describe(EntityMutatorFactory, () => {
 
       const spiedPrivacyPolicy = spy(privacyPolicy);
 
-      await entityMutatorFactory
-        .forCreate(viewerContext, queryContext)
-        .setField('stringField', 'huh')
-        .enforceCreateAsync();
+      await enforceAsyncResult(
+        entityMutatorFactory
+          .forCreate(viewerContext, queryContext)
+          .setField('stringField', 'huh')
+          .createAsync(),
+      );
 
       verify(
         spiedPrivacyPolicy.authorizeCreateAsync(
@@ -447,7 +452,7 @@ describe(EntityMutatorFactory, () => {
 
     it('executes triggers', async () => {
       const viewerContext = mock<ViewerContext>();
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = new StubQueryContextProvider().getQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -472,10 +477,12 @@ describe(EntityMutatorFactory, () => {
 
       const triggerSpies = setUpMutationTriggerSpies(mutationTriggers);
 
-      await entityMutatorFactory
-        .forCreate(viewerContext, queryContext)
-        .setField('stringField', 'huh')
-        .enforceCreateAsync();
+      await enforceAsyncResult(
+        entityMutatorFactory
+          .forCreate(viewerContext, queryContext)
+          .setField('stringField', 'huh')
+          .createAsync(),
+      );
 
       verifyTriggerCounts(
         viewerContext,
@@ -494,7 +501,7 @@ describe(EntityMutatorFactory, () => {
 
     it('executes validators', async () => {
       const viewerContext = mock<ViewerContext>();
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = new StubQueryContextProvider().getQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -519,10 +526,12 @@ describe(EntityMutatorFactory, () => {
 
       const validatorSpies = setUpMutationValidatorSpies(mutationValidators);
 
-      await entityMutatorFactory
-        .forCreate(viewerContext, queryContext)
-        .setField('stringField', 'huh')
-        .enforceCreateAsync();
+      await enforceAsyncResult(
+        entityMutatorFactory
+          .forCreate(viewerContext, queryContext)
+          .setField('stringField', 'huh')
+          .createAsync(),
+      );
 
       verifyValidatorCounts(viewerContext, validatorSpies, 1, { type: EntityMutationType.CREATE });
     });
@@ -543,7 +552,7 @@ describe(EntityMutatorFactory, () => {
             >
           >(),
         );
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = new StubQueryContextProvider().getQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -569,14 +578,15 @@ describe(EntityMutatorFactory, () => {
       const existingEntity = await enforceAsyncResult(
         entityLoaderFactory
           .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .withAuthorizationResults()
           .loadByIDAsync(id2),
       );
 
-      const updatedEntity = await entityMutatorFactory
-        .forUpdate(existingEntity, queryContext)
-        .setField('stringField', 'huh2')
-        .enforceUpdateAsync();
+      const updatedEntity = await enforceAsyncResult(
+        entityMutatorFactory
+          .forUpdate(existingEntity, queryContext)
+          .setField('stringField', 'huh2')
+          .updateAsync(),
+      );
 
       expect(updatedEntity).toBeTruthy();
       expect(updatedEntity.getAllFields()).not.toMatchObject(existingEntity.getAllFields());
@@ -585,7 +595,6 @@ describe(EntityMutatorFactory, () => {
       const reloadedEntity = await enforceAsyncResult(
         entityLoaderFactory
           .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .withAuthorizationResults()
           .loadByIDAsync(id2),
       );
       expect(reloadedEntity.getAllFields()).toMatchObject(updatedEntity.getAllFields());
@@ -593,7 +602,7 @@ describe(EntityMutatorFactory, () => {
 
     it('checks privacy', async () => {
       const viewerContext = mock<ViewerContext>();
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = new StubQueryContextProvider().getQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -622,14 +631,15 @@ describe(EntityMutatorFactory, () => {
       const existingEntity = await enforceAsyncResult(
         entityLoaderFactory
           .forLoad(viewerContext, queryContext, { previousValue: null, cascadingDeleteCause: null })
-          .withAuthorizationResults()
           .loadByIDAsync(id2),
       );
 
-      await entityMutatorFactory
-        .forUpdate(existingEntity, queryContext)
-        .setField('stringField', 'huh2')
-        .enforceUpdateAsync();
+      await enforceAsyncResult(
+        entityMutatorFactory
+          .forUpdate(existingEntity, queryContext)
+          .setField('stringField', 'huh2')
+          .updateAsync(),
+      );
 
       verify(
         spiedPrivacyPolicy.authorizeUpdateAsync(
@@ -666,7 +676,7 @@ describe(EntityMutatorFactory, () => {
             >
           >(),
         );
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = new StubQueryContextProvider().getQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -695,14 +705,15 @@ describe(EntityMutatorFactory, () => {
       const existingEntity = await enforceAsyncResult(
         entityLoaderFactory
           .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .withAuthorizationResults()
           .loadByIDAsync(id2),
       );
 
-      await entityMutatorFactory
-        .forUpdate(existingEntity, queryContext)
-        .setField('stringField', 'huh2')
-        .enforceUpdateAsync();
+      await enforceAsyncResult(
+        entityMutatorFactory
+          .forUpdate(existingEntity, queryContext)
+          .setField('stringField', 'huh2')
+          .updateAsync(),
+      );
 
       verifyTriggerCounts(
         viewerContext,
@@ -737,7 +748,7 @@ describe(EntityMutatorFactory, () => {
             >
           >(),
         );
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = new StubQueryContextProvider().getQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -766,14 +777,15 @@ describe(EntityMutatorFactory, () => {
       const existingEntity = await enforceAsyncResult(
         entityLoaderFactory
           .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .withAuthorizationResults()
           .loadByIDAsync(id2),
       );
 
-      await entityMutatorFactory
-        .forUpdate(existingEntity, queryContext)
-        .setField('stringField', 'huh2')
-        .enforceUpdateAsync();
+      await enforceAsyncResult(
+        entityMutatorFactory
+          .forUpdate(existingEntity, queryContext)
+          .setField('stringField', 'huh2')
+          .updateAsync(),
+      );
 
       verifyValidatorCounts(viewerContext, validatorSpies, 1, {
         type: EntityMutationType.UPDATE,
@@ -796,7 +808,7 @@ describe(EntityMutatorFactory, () => {
             >
           >(),
         );
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = new StubQueryContextProvider().getQueryContext();
 
       const id1 = uuidv4();
       const { entityMutatorFactory, entityLoaderFactory } = createEntityMutatorFactory([
@@ -813,21 +825,21 @@ describe(EntityMutatorFactory, () => {
       const existingEntity = await enforceAsyncResult(
         entityLoaderFactory
           .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .withAuthorizationResults()
           .loadByIDAsync(id1),
       );
 
       await expect(
-        entityMutatorFactory
-          .forUpdate(existingEntity, queryContext)
-          .setField('customIdField', uuidv4())
-          .enforceUpdateAsync(),
+        enforceAsyncResult(
+          entityMutatorFactory
+            .forUpdate(existingEntity, queryContext)
+            .setField('customIdField', uuidv4())
+            .updateAsync(),
+        ),
       ).rejects.toThrow('id field updates not supported: (entityClass = TestEntity)');
 
       const reloadedEntity = await enforceAsyncResult(
         entityLoaderFactory
           .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .withAuthorizationResults()
           .loadByIDAsync(id1),
       );
       expect(reloadedEntity.getAllFields()).toMatchObject(existingEntity.getAllFields());
@@ -849,7 +861,7 @@ describe(EntityMutatorFactory, () => {
             >
           >(),
         );
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = new StubQueryContextProvider().getQueryContext();
 
       const id1 = uuidv4();
       const { entityMutatorFactory, entityLoaderFactory } = createEntityMutatorFactory([
@@ -866,18 +878,18 @@ describe(EntityMutatorFactory, () => {
       const existingEntity = await enforceAsyncResult(
         entityLoaderFactory
           .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .withAuthorizationResults()
           .loadByIDAsync(id1),
       );
       expect(existingEntity).toBeTruthy();
 
-      await entityMutatorFactory.forDelete(existingEntity, queryContext).enforceDeleteAsync();
+      await enforceAsyncResult(
+        entityMutatorFactory.forDelete(existingEntity, queryContext).deleteAsync(),
+      );
 
       await expect(
         enforceAsyncResult(
           entityLoaderFactory
             .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-            .withAuthorizationResults()
             .loadByIDAsync(id1),
         ),
       ).rejects.toBeInstanceOf(Error);
@@ -897,7 +909,7 @@ describe(EntityMutatorFactory, () => {
             >
           >(),
         );
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = new StubQueryContextProvider().getQueryContext();
 
       const id1 = uuidv4();
       const { privacyPolicy, entityMutatorFactory, entityLoaderFactory } =
@@ -917,11 +929,12 @@ describe(EntityMutatorFactory, () => {
       const existingEntity = await enforceAsyncResult(
         entityLoaderFactory
           .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .withAuthorizationResults()
           .loadByIDAsync(id1),
       );
 
-      await entityMutatorFactory.forDelete(existingEntity, queryContext).enforceDeleteAsync();
+      await enforceAsyncResult(
+        entityMutatorFactory.forDelete(existingEntity, queryContext).deleteAsync(),
+      );
 
       verify(
         spiedPrivacyPolicy.authorizeDeleteAsync(
@@ -948,7 +961,7 @@ describe(EntityMutatorFactory, () => {
             >
           >(),
         );
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = new StubQueryContextProvider().getQueryContext();
 
       const id1 = uuidv4();
       const { mutationTriggers, entityMutatorFactory, entityLoaderFactory } =
@@ -968,11 +981,12 @@ describe(EntityMutatorFactory, () => {
       const existingEntity = await enforceAsyncResult(
         entityLoaderFactory
           .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .withAuthorizationResults()
           .loadByIDAsync(id1),
       );
 
-      await entityMutatorFactory.forDelete(existingEntity, queryContext).enforceDeleteAsync();
+      await enforceAsyncResult(
+        entityMutatorFactory.forDelete(existingEntity, queryContext).deleteAsync(),
+      );
 
       verifyTriggerCounts(
         viewerContext,
@@ -1003,7 +1017,7 @@ describe(EntityMutatorFactory, () => {
             >
           >(),
         );
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = new StubQueryContextProvider().getQueryContext();
 
       const id1 = uuidv4();
       const { mutationValidators, entityMutatorFactory, entityLoaderFactory } =
@@ -1023,11 +1037,12 @@ describe(EntityMutatorFactory, () => {
       const existingEntity = await enforceAsyncResult(
         entityLoaderFactory
           .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .withAuthorizationResults()
           .loadByIDAsync(id1),
       );
 
-      await entityMutatorFactory.forDelete(existingEntity, queryContext).enforceDeleteAsync();
+      await enforceAsyncResult(
+        entityMutatorFactory.forDelete(existingEntity, queryContext).deleteAsync(),
+      );
 
       verifyValidatorCounts(viewerContext, validatorSpies, 0, {
         type: EntityMutationType.DELETE as any,
@@ -1049,7 +1064,7 @@ describe(EntityMutatorFactory, () => {
           >
         >(),
       );
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = new StubQueryContextProvider().getQueryContext();
 
     const id1 = uuidv4();
     const { entityMutatorFactory, entityLoaderFactory } = createEntityMutatorFactory([
@@ -1066,7 +1081,6 @@ describe(EntityMutatorFactory, () => {
     const entites1 = await enforceResultsAsync(
       entityLoaderFactory
         .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-        .withAuthorizationResults()
         .loadManyByFieldEqualingAsync('stringField', 'huh'),
     );
     expect(entites1).toHaveLength(1);
@@ -1081,7 +1095,6 @@ describe(EntityMutatorFactory, () => {
     const entities2 = await enforceResultsAsync(
       entityLoaderFactory
         .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-        .withAuthorizationResults()
         .loadManyByFieldEqualingAsync('stringField', 'huh'),
     );
     expect(entities2).toHaveLength(2);
@@ -1089,7 +1102,7 @@ describe(EntityMutatorFactory, () => {
 
   it('throws error when field not valid', async () => {
     const viewerContext = mock<ViewerContext>();
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = new StubQueryContextProvider().getQueryContext();
     const id1 = uuidv4();
     const { entityMutatorFactory } = createEntityMutatorFactory([
       {
@@ -1109,10 +1122,12 @@ describe(EntityMutatorFactory, () => {
         .createAsync(),
     ).rejects.toThrowError('Entity field not valid: TestEntity (stringField = 10)');
 
-    const createdEntity = await entityMutatorFactory
-      .forCreate(viewerContext, queryContext)
-      .setField('stringField', 'hello')
-      .enforceCreateAsync();
+    const createdEntity = await enforceAsyncResult(
+      entityMutatorFactory
+        .forCreate(viewerContext, queryContext)
+        .setField('stringField', 'hello')
+        .createAsync(),
+    );
 
     await expect(
       entityMutatorFactory
@@ -1125,7 +1140,7 @@ 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 queryContext = new StubQueryContextProvider().getQueryContext();
     const privacyPolicyMock = mock(SimpleTestEntityPrivacyPolicy);
     const databaseAdapter = instance(mock<EntityDatabaseAdapter<SimpleTestFields>>());
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
@@ -1142,17 +1157,16 @@ describe(EntityMutatorFactory, () => {
       },
     });
 
-    const entityLoaderMock =
-      mock<
-        EntityLoader<
-          SimpleTestFields,
-          string,
-          ViewerContext,
-          SimpleTestEntity,
-          SimpleTestEntityPrivacyPolicy,
-          keyof SimpleTestFields
-        >
-      >(EntityLoader);
+    const entityLoaderMock = mock<
+      AuthorizationResultBasedEntityLoader<
+        SimpleTestFields,
+        string,
+        ViewerContext,
+        SimpleTestEntity,
+        SimpleTestEntityPrivacyPolicy,
+        keyof SimpleTestFields
+      >
+    >(AuthorizationResultBasedEntityLoader);
     const entityLoaderUtilsMock =
       mock<
         EntityLoaderUtils<
@@ -1165,7 +1179,7 @@ describe(EntityMutatorFactory, () => {
         >
       >(EntityLoaderUtils);
     when(entityLoaderUtilsMock.constructEntity(anything())).thenReturn(fakeEntity);
-    when(entityLoaderMock.utils()).thenReturn(instance(entityLoaderUtilsMock));
+    when(entityLoaderMock.utils).thenReturn(instance(entityLoaderUtilsMock));
     const entityLoader = instance(entityLoaderMock);
 
     const entityLoaderFactoryMock =
@@ -1261,7 +1275,7 @@ describe(EntityMutatorFactory, () => {
     const entityCompanionProvider = instance(entityCompanionProviderMock);
 
     const viewerContext = instance(mock(ViewerContext));
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = new StubQueryContextProvider().getQueryContext();
     const privacyPolicy = instance(mock(SimpleTestEntityPrivacyPolicy));
     const databaseAdapterMock = mock<EntityDatabaseAdapter<SimpleTestFields>>();
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
@@ -1278,17 +1292,16 @@ describe(EntityMutatorFactory, () => {
       },
     });
 
-    const entityLoaderMock =
-      mock<
-        EntityLoader<
-          SimpleTestFields,
-          string,
-          ViewerContext,
-          SimpleTestEntity,
-          SimpleTestEntityPrivacyPolicy,
-          keyof SimpleTestFields
-        >
-      >(EntityLoader);
+    const entityLoaderMock = mock<
+      AuthorizationResultBasedEntityLoader<
+        SimpleTestFields,
+        string,
+        ViewerContext,
+        SimpleTestEntity,
+        SimpleTestEntityPrivacyPolicy,
+        keyof SimpleTestFields
+      >
+    >(AuthorizationResultBasedEntityLoader);
     const entityLoaderUtilsMock =
       mock<
         EntityLoaderUtils<
@@ -1301,7 +1314,7 @@ describe(EntityMutatorFactory, () => {
         >
       >(EntityLoaderUtils);
     when(entityLoaderUtilsMock.constructEntity(anything())).thenReturn(fakeEntity);
-    when(entityLoaderMock.utils()).thenReturn(instance(entityLoaderUtilsMock));
+    when(entityLoaderMock.utils).thenReturn(instance(entityLoaderUtilsMock));
     const entityLoader = instance(entityLoaderMock);
 
     const entityLoaderFactoryMock =
@@ -1370,7 +1383,7 @@ describe(EntityMutatorFactory, () => {
 
   it('records metrics appropriately', async () => {
     const viewerContext = mock<ViewerContext>();
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = new StubQueryContextProvider().getQueryContext();
     const { entityMutatorFactory, metricsAdapter } = createEntityMutatorFactory([]);
     const spiedMetricsAdapter = spy(metricsAdapter);
 

package/src/__tests__/EntitySecondaryCacheLoader-test.ts

@@ -32,7 +32,7 @@ describe(EntitySecondaryCacheLoader, () => {
     it('calls into secondary cache with correct params', async () => {
       const vc1 = new ViewerContext(createUnitTestEntityCompanionProvider());
 
-      const createdEntity = await SimpleTestEntity.creator(vc1).enforceCreateAsync();
+      const createdEntity = await SimpleTestEntity.creator(vc1).enforcing().createAsync();
       const loadParams = { id: createdEntity.getID() };
 
       const secondaryEntityCacheMock =
@@ -44,7 +44,7 @@ describe(EntitySecondaryCacheLoader, () => {
 
       const secondaryCacheLoader = new TestSecondaryRedisCacheLoader(
         secondaryEntityCache,
-        SimpleTestEntity.loader(vc1),
+        SimpleTestEntity.loader(vc1).withAuthorizationResults(),
       );
 
       await secondaryCacheLoader.loadManyAsync([loadParams]);
@@ -57,7 +57,7 @@ describe(EntitySecondaryCacheLoader, () => {
     it('constructs and authorizes entities', async () => {
       const vc1 = new ViewerContext(createUnitTestEntityCompanionProvider());
 
-      const createdEntity = await SimpleTestEntity.creator(vc1).enforceCreateAsync();
+      const createdEntity = await SimpleTestEntity.creator(vc1).enforcing().createAsync();
       const loadParams = { id: createdEntity.getID() };
 
       const secondaryEntityCacheMock =
@@ -67,8 +67,8 @@ describe(EntitySecondaryCacheLoader, () => {
       ).thenResolve(new Map([[loadParams, createdEntity.getAllFields()]]));
       const secondaryEntityCache = instance(secondaryEntityCacheMock);
 
-      const loader = SimpleTestEntity.loader(vc1);
-      const spiedPrivacyPolicy = spy(loader['privacyPolicy']);
+      const loader = SimpleTestEntity.loader(vc1).withAuthorizationResults();
+      const spiedPrivacyPolicy = spy(loader.utils['privacyPolicy']);
       const secondaryCacheLoader = new TestSecondaryRedisCacheLoader(secondaryEntityCache, loader);
 
       const result = await secondaryCacheLoader.loadManyAsync([loadParams]);
@@ -90,13 +90,13 @@ describe(EntitySecondaryCacheLoader, () => {
     it('calls invalidate on the secondary cache', async () => {
       const vc1 = new ViewerContext(createUnitTestEntityCompanionProvider());
 
-      const createdEntity = await SimpleTestEntity.creator(vc1).enforceCreateAsync();
+      const createdEntity = await SimpleTestEntity.creator(vc1).enforcing().createAsync();
       const loadParams = { id: createdEntity.getID() };
 
       const secondaryEntityCacheMock =
         mock<ISecondaryEntityCache<SimpleTestFields, TestLoadParams>>();
       const secondaryEntityCache = instance(secondaryEntityCacheMock);
-      const loader = SimpleTestEntity.loader(vc1);
+      const loader = SimpleTestEntity.loader(vc1).withAuthorizationResults();
       const secondaryCacheLoader = new TestSecondaryRedisCacheLoader(secondaryEntityCache, loader);
       await secondaryCacheLoader.invalidateManyAsync([loadParams]);