@expo/entity 0.32.0 → 0.34.0

package/src/__tests__/EntityMutator-test.ts

@@ -31,7 +31,6 @@ 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';
 import ReadThroughEntityCache from '../internal/ReadThroughEntityCache';
@@ -47,6 +46,7 @@ import TestEntity, {
   TestEntityPrivacyPolicy,
   testEntityConfiguration,
 } from '../testfixtures/TestEntity';
+import TestViewerContext from '../testfixtures/TestViewerContext';
 import { NoCacheStubCacheAdapterProvider } from '../utils/testing/StubCacheAdapter';
 import StubDatabaseAdapter from '../utils/testing/StubDatabaseAdapter';
 import StubQueryContextProvider from '../utils/testing/StubQueryContextProvider';
@@ -54,18 +54,18 @@ import StubQueryContextProvider from '../utils/testing/StubQueryContextProvider'
 class TestMutationTrigger extends EntityMutationTrigger<
   TestFields,
   string,
-  ViewerContext,
+  TestViewerContext,
   TestEntity,
   keyof TestFields
 > {
   async executeAsync(
-    _viewerContext: ViewerContext,
+    _viewerContext: TestViewerContext,
     _queryContext: EntityQueryContext,
     _entity: TestEntity,
     _mutationInfo: EntityTriggerMutationInfo<
       TestFields,
       string,
-      ViewerContext,
+      TestViewerContext,
       TestEntity,
       keyof TestFields
     >
@@ -75,31 +75,37 @@ class TestMutationTrigger extends EntityMutationTrigger<
 class TestNonTransactionalMutationTrigger extends EntityNonTransactionalMutationTrigger<
   TestFields,
   string,
-  ViewerContext,
+  TestViewerContext,
   TestEntity,
   keyof TestFields
 > {
-  async executeAsync(_viewerContext: ViewerContext, _entity: TestEntity): Promise<void> {}
+  async executeAsync(_viewerContext: TestViewerContext, _entity: TestEntity): Promise<void> {}
 }
 
 const setUpMutationValidatorSpies = (
   mutationValidators: EntityMutationValidator<
     TestFields,
     string,
-    ViewerContext,
+    TestViewerContext,
     TestEntity,
     keyof TestFields
   >[]
-): EntityMutationValidator<TestFields, string, ViewerContext, TestEntity, keyof TestFields>[] => {
+): EntityMutationValidator<
+  TestFields,
+  string,
+  TestViewerContext,
+  TestEntity,
+  keyof TestFields
+>[] => {
   return mutationValidators.map((validator) => spy(validator));
 };
 
 const verifyValidatorCounts = (
-  viewerContext: ViewerContext,
+  viewerContext: TestViewerContext,
   mutationValidatorSpies: EntityMutationValidator<
     TestFields,
     string,
-    ViewerContext,
+    TestViewerContext,
     TestEntity,
     keyof TestFields
   >[],
@@ -107,7 +113,7 @@ const verifyValidatorCounts = (
   mutationInfo: EntityValidatorMutationInfo<
     TestFields,
     string,
-    ViewerContext,
+    TestViewerContext,
     TestEntity,
     keyof TestFields
   >
@@ -128,14 +134,14 @@ const setUpMutationTriggerSpies = (
   mutationTriggers: EntityMutationTriggerConfiguration<
     TestFields,
     string,
-    ViewerContext,
+    TestViewerContext,
     TestEntity,
     keyof TestFields
   >
 ): EntityMutationTriggerConfiguration<
   TestFields,
   string,
-  ViewerContext,
+  TestViewerContext,
   TestEntity,
   keyof TestFields
 > => {
@@ -153,11 +159,11 @@ const setUpMutationTriggerSpies = (
 };
 
 const verifyTriggerCounts = (
-  viewerContext: ViewerContext,
+  viewerContext: TestViewerContext,
   mutationTriggerSpies: EntityMutationTriggerConfiguration<
     TestFields,
     string,
-    ViewerContext,
+    TestViewerContext,
     TestEntity,
     keyof TestFields
   >,
@@ -166,7 +172,7 @@ const verifyTriggerCounts = (
       EntityMutationTriggerConfiguration<
         TestFields,
         string,
-        ViewerContext,
+        TestViewerContext,
         TestEntity,
         keyof TestFields
       >,
@@ -182,7 +188,7 @@ const verifyTriggerCounts = (
   mutationInfo: EntityTriggerMutationInfo<
     TestFields,
     string,
-    ViewerContext,
+    TestViewerContext,
     TestEntity,
     keyof TestFields
   >
@@ -243,7 +249,7 @@ const createEntityMutatorFactory = (
   entityLoaderFactory: EntityLoaderFactory<
     TestFields,
     string,
-    ViewerContext,
+    TestViewerContext,
     TestEntity,
     TestEntityPrivacyPolicy,
     keyof TestFields
@@ -251,7 +257,7 @@ const createEntityMutatorFactory = (
   entityMutatorFactory: EntityMutatorFactory<
     TestFields,
     string,
-    ViewerContext,
+    TestViewerContext,
     TestEntity,
     TestEntityPrivacyPolicy
   >;
@@ -259,14 +265,14 @@ const createEntityMutatorFactory = (
   mutationValidators: EntityMutationValidator<
     TestFields,
     string,
-    ViewerContext,
+    TestViewerContext,
     TestEntity,
     keyof TestFields
   >[];
   mutationTriggers: EntityMutationTriggerConfiguration<
     TestFields,
     string,
-    ViewerContext,
+    TestViewerContext,
     TestEntity,
     keyof TestFields
   >;
@@ -274,14 +280,14 @@ const createEntityMutatorFactory = (
   const mutationValidators: EntityMutationValidator<
     TestFields,
     string,
-    ViewerContext,
+    TestViewerContext,
     TestEntity,
     keyof TestFields
   >[] = [new TestMutationTrigger()];
   const mutationTriggers: EntityMutationTriggerConfiguration<
     TestFields,
     string,
-    ViewerContext,
+    TestViewerContext,
     TestEntity,
     keyof TestFields
   > = {
@@ -372,8 +378,8 @@ const createEntityMutatorFactory = (
 describe(EntityMutatorFactory, () => {
   describe('forCreate', () => {
     it('creates entities', async () => {
-      const viewerContext = mock<ViewerContext>();
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const viewerContext = mock<TestViewerContext>();
+      const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -403,8 +409,8 @@ describe(EntityMutatorFactory, () => {
     });
 
     it('checks privacy', async () => {
-      const viewerContext = mock<ViewerContext>();
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const viewerContext = mock<TestViewerContext>();
+      const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -446,8 +452,8 @@ describe(EntityMutatorFactory, () => {
     });
 
     it('executes triggers', async () => {
-      const viewerContext = mock<ViewerContext>();
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const viewerContext = mock<TestViewerContext>();
+      const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -493,8 +499,8 @@ describe(EntityMutatorFactory, () => {
     });
 
     it('executes validators', async () => {
-      const viewerContext = mock<ViewerContext>();
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const viewerContext = mock<TestViewerContext>();
+      const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -530,9 +536,9 @@ describe(EntityMutatorFactory, () => {
 
   describe('forUpdate', () => {
     it('updates entities', async () => {
-      const viewerContext = mock<ViewerContext>();
+      const viewerContext = mock<TestViewerContext>();
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -579,9 +585,9 @@ describe(EntityMutatorFactory, () => {
     });
 
     it('checks privacy', async () => {
-      const viewerContext = mock<ViewerContext>();
+      const viewerContext = mock<TestViewerContext>();
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -630,9 +636,9 @@ describe(EntityMutatorFactory, () => {
     });
 
     it('executes triggers', async () => {
-      const viewerContext = mock<ViewerContext>();
+      const viewerContext = mock<TestViewerContext>();
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -688,9 +694,9 @@ describe(EntityMutatorFactory, () => {
       );
     });
     it('executes validators', async () => {
-      const viewerContext = mock<ViewerContext>();
+      const viewerContext = mock<TestViewerContext>();
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
 
       const id1 = uuidv4();
       const id2 = uuidv4();
@@ -737,9 +743,9 @@ describe(EntityMutatorFactory, () => {
 
   describe('forDelete', () => {
     it('deletes entities', async () => {
-      const viewerContext = mock<ViewerContext>();
+      const viewerContext = mock<TestViewerContext>();
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
 
       const id1 = uuidv4();
       const { entityMutatorFactory, entityLoaderFactory } = createEntityMutatorFactory([
@@ -772,9 +778,9 @@ describe(EntityMutatorFactory, () => {
     });
 
     it('checks privacy', async () => {
-      const viewerContext = mock<ViewerContext>();
+      const viewerContext = mock<TestViewerContext>();
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
 
       const id1 = uuidv4();
       const { privacyPolicy, entityMutatorFactory, entityLoaderFactory } =
@@ -811,9 +817,9 @@ describe(EntityMutatorFactory, () => {
     });
 
     it('executes triggers', async () => {
-      const viewerContext = mock<ViewerContext>();
+      const viewerContext = mock<TestViewerContext>();
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
 
       const id1 = uuidv4();
       const { mutationTriggers, entityMutatorFactory, entityLoaderFactory } =
@@ -854,9 +860,9 @@ describe(EntityMutatorFactory, () => {
     });
 
     it('does not execute validators', async () => {
-      const viewerContext = mock<ViewerContext>();
+      const viewerContext = mock<TestViewerContext>();
       const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
-      const queryContext = StubQueryContextProvider.getQueryContext();
+      const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
 
       const id1 = uuidv4();
       const { mutationValidators, entityMutatorFactory, entityLoaderFactory } =
@@ -888,9 +894,9 @@ describe(EntityMutatorFactory, () => {
   });
 
   it('invalidates cache for fields upon create', async () => {
-    const viewerContext = mock<ViewerContext>();
+    const viewerContext = mock<TestViewerContext>();
     const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
 
     const id1 = uuidv4();
     const { entityMutatorFactory, entityLoaderFactory } = createEntityMutatorFactory([
@@ -927,8 +933,8 @@ describe(EntityMutatorFactory, () => {
   });
 
   it('throws error when field not valid', async () => {
-    const viewerContext = mock<ViewerContext>();
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const viewerContext = mock<TestViewerContext>();
+    const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
     const id1 = uuidv4();
     const { entityMutatorFactory } = createEntityMutatorFactory([
       {
@@ -963,8 +969,8 @@ 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 viewerContext = instance(mock(TestViewerContext));
+    const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
     const privacyPolicyMock = mock(SimpleTestEntityPrivacyPolicy);
     const databaseAdapter = instance(mock<EntityDatabaseAdapter<SimpleTestFields>>());
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
@@ -986,7 +992,7 @@ describe(EntityMutatorFactory, () => {
         EntityLoader<
           SimpleTestFields,
           string,
-          ViewerContext,
+          TestViewerContext,
           SimpleTestEntity,
           SimpleTestEntityPrivacyPolicy,
           keyof SimpleTestFields
@@ -1000,7 +1006,7 @@ describe(EntityMutatorFactory, () => {
         EntityLoaderFactory<
           SimpleTestFields,
           string,
-          ViewerContext,
+          TestViewerContext,
           SimpleTestEntity,
           SimpleTestEntityPrivacyPolicy,
           keyof SimpleTestFields
@@ -1087,8 +1093,8 @@ describe(EntityMutatorFactory, () => {
 
     const entityCompanionProvider = instance(entityCompanionProviderMock);
 
-    const viewerContext = instance(mock(ViewerContext));
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const viewerContext = instance(mock(TestViewerContext));
+    const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
     const privacyPolicy = instance(mock(SimpleTestEntityPrivacyPolicy));
     const databaseAdapterMock = mock<EntityDatabaseAdapter<SimpleTestFields>>();
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
@@ -1110,7 +1116,7 @@ describe(EntityMutatorFactory, () => {
         EntityLoader<
           SimpleTestFields,
           string,
-          ViewerContext,
+          TestViewerContext,
           SimpleTestEntity,
           SimpleTestEntityPrivacyPolicy,
           keyof SimpleTestFields
@@ -1124,7 +1130,7 @@ describe(EntityMutatorFactory, () => {
         EntityLoaderFactory<
           SimpleTestFields,
           string,
-          ViewerContext,
+          TestViewerContext,
           SimpleTestEntity,
           SimpleTestEntityPrivacyPolicy,
           keyof SimpleTestFields
@@ -1184,8 +1190,8 @@ describe(EntityMutatorFactory, () => {
   });
 
   it('records metrics appropriately', async () => {
-    const viewerContext = mock<ViewerContext>();
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const viewerContext = mock<TestViewerContext>();
+    const queryContext = StubQueryContextProvider.getNonTransactionalQueryContext();
     const { entityMutatorFactory, metricsAdapter } = createEntityMutatorFactory([]);
     const spiedMetricsAdapter = spy(metricsAdapter);
 

package/src/__tests__/EntitySecondaryCacheLoader-test.ts

@@ -2,11 +2,11 @@ import { anyOfClass, anything, deepEqual, instance, mock, spy, verify, when } fr
 
 import { EntityNonTransactionalQueryContext } from '../EntityQueryContext';
 import EntitySecondaryCacheLoader, { ISecondaryEntityCache } from '../EntitySecondaryCacheLoader';
-import ViewerContext from '../ViewerContext';
 import SimpleTestEntity, {
   SimpleTestEntityPrivacyPolicy,
   SimpleTestFields,
 } from '../testfixtures/SimpleTestEntity';
+import TestViewerContext from '../testfixtures/TestViewerContext';
 import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
 
 type TestLoadParams = { id: string };
@@ -15,7 +15,7 @@ class TestSecondaryRedisCacheLoader extends EntitySecondaryCacheLoader<
   TestLoadParams,
   SimpleTestFields,
   string,
-  ViewerContext,
+  TestViewerContext,
   SimpleTestEntity,
   SimpleTestEntityPrivacyPolicy
 > {
@@ -30,9 +30,12 @@ class TestSecondaryRedisCacheLoader extends EntitySecondaryCacheLoader<
 describe(EntitySecondaryCacheLoader, () => {
   describe('loadManyAsync', () => {
     it('calls into secondary cache with correct params', async () => {
-      const vc1 = new ViewerContext(createUnitTestEntityCompanionProvider());
+      const vc1 = new TestViewerContext(createUnitTestEntityCompanionProvider());
 
-      const createdEntity = await SimpleTestEntity.creator(vc1).enforceCreateAsync();
+      const createdEntity = await SimpleTestEntity.creator(
+        vc1,
+        vc1.getQueryContext()
+      ).enforceCreateAsync();
       const loadParams = { id: createdEntity.getID() };
 
       const secondaryEntityCacheMock =
@@ -44,7 +47,7 @@ describe(EntitySecondaryCacheLoader, () => {
 
       const secondaryCacheLoader = new TestSecondaryRedisCacheLoader(
         secondaryEntityCache,
-        SimpleTestEntity.loader(vc1)
+        SimpleTestEntity.loader(vc1, vc1.getQueryContext())
       );
 
       await secondaryCacheLoader.loadManyAsync([loadParams]);
@@ -55,9 +58,12 @@ describe(EntitySecondaryCacheLoader, () => {
     });
 
     it('constructs and authorizes entities', async () => {
-      const vc1 = new ViewerContext(createUnitTestEntityCompanionProvider());
+      const vc1 = new TestViewerContext(createUnitTestEntityCompanionProvider());
 
-      const createdEntity = await SimpleTestEntity.creator(vc1).enforceCreateAsync();
+      const createdEntity = await SimpleTestEntity.creator(
+        vc1,
+        vc1.getQueryContext()
+      ).enforceCreateAsync();
       const loadParams = { id: createdEntity.getID() };
 
       const secondaryEntityCacheMock =
@@ -67,7 +73,7 @@ describe(EntitySecondaryCacheLoader, () => {
       ).thenResolve(new Map([[loadParams, createdEntity.getAllFields()]]));
       const secondaryEntityCache = instance(secondaryEntityCacheMock);
 
-      const loader = SimpleTestEntity.loader(vc1);
+      const loader = SimpleTestEntity.loader(vc1, vc1.getQueryContext());
       const spiedPrivacyPolicy = spy(loader['privacyPolicy']);
       const secondaryCacheLoader = new TestSecondaryRedisCacheLoader(secondaryEntityCache, loader);
 
@@ -88,15 +94,18 @@ describe(EntitySecondaryCacheLoader, () => {
 
   describe('invalidateManyAsync', () => {
     it('calls invalidate on the secondary cache', async () => {
-      const vc1 = new ViewerContext(createUnitTestEntityCompanionProvider());
+      const vc1 = new TestViewerContext(createUnitTestEntityCompanionProvider());
 
-      const createdEntity = await SimpleTestEntity.creator(vc1).enforceCreateAsync();
+      const createdEntity = await SimpleTestEntity.creator(
+        vc1,
+        vc1.getQueryContext()
+      ).enforceCreateAsync();
       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, vc1.getQueryContext());
       const secondaryCacheLoader = new TestSecondaryRedisCacheLoader(secondaryEntityCache, loader);
       await secondaryCacheLoader.invalidateManyAsync([loadParams]);