@expo/entity 0.34.0 → 0.35.0

package/src/__tests__/EntitySelfReferentialEdges-test.ts

@@ -87,52 +87,34 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE', () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new TestViewerContext(companionProvider);
 
-    const parentCategory = await CategoryEntity.creator(
-      viewerContext,
-      viewerContext.getQueryContext()
-    ).enforceCreateAsync();
-    const subCategory = await CategoryEntity.creator(viewerContext, viewerContext.getQueryContext())
+    const parentCategory = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
+    const subCategory = await CategoryEntity.creator(viewerContext)
       .setField('parent_category_id', parentCategory.getID())
       .enforceCreateAsync();
-    const subSubCategory = await CategoryEntity.creator(
-      viewerContext,
-      viewerContext.getQueryContext()
-    )
+    const subSubCategory = await CategoryEntity.creator(viewerContext)
       .setField('parent_category_id', subCategory.getID())
       .enforceCreateAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(parentCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(subCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(subSubCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subSubCategory.getID())
     ).resolves.not.toBeNull();
 
-    await CategoryEntity.enforceDeleteAsync(parentCategory, viewerContext.getQueryContext());
+    await CategoryEntity.enforceDeleteAsync(parentCategory);
 
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(parentCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
     ).resolves.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(subCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID())
     ).resolves.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(subSubCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subSubCategory.getID())
     ).resolves.toBeNull();
   });
 
@@ -142,28 +124,21 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE', () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new TestViewerContext(companionProvider);
 
-    const categoryA = await CategoryEntity.creator(
-      viewerContext,
-      viewerContext.getQueryContext()
-    ).enforceCreateAsync();
-    const categoryB = await CategoryEntity.creator(viewerContext, viewerContext.getQueryContext())
+    const categoryA = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
+    const categoryB = await CategoryEntity.creator(viewerContext)
       .setField('parent_category_id', categoryA.getID())
       .enforceCreateAsync();
-    await CategoryEntity.updater(categoryA, viewerContext.getQueryContext())
+    await CategoryEntity.updater(categoryA)
       .setField('parent_category_id', categoryB.getID())
       .enforceUpdateAsync();
 
-    await CategoryEntity.enforceDeleteAsync(categoryA, viewerContext.getQueryContext());
+    await CategoryEntity.enforceDeleteAsync(categoryA);
 
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(categoryA.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(categoryA.getID())
     ).resolves.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(categoryB.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(categoryB.getID())
     ).resolves.toBeNull();
   });
 });
@@ -175,56 +150,36 @@ describe('EntityEdgeDeletionBehavior.SET_NULL', () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new TestViewerContext(companionProvider);
 
-    const parentCategory = await CategoryEntity.creator(
-      viewerContext,
-      viewerContext.getQueryContext()
-    ).enforceCreateAsync();
-    const subCategory = await CategoryEntity.creator(viewerContext, viewerContext.getQueryContext())
+    const parentCategory = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
+    const subCategory = await CategoryEntity.creator(viewerContext)
       .setField('parent_category_id', parentCategory.getID())
       .enforceCreateAsync();
-    const subSubCategory = await CategoryEntity.creator(
-      viewerContext,
-      viewerContext.getQueryContext()
-    )
+    const subSubCategory = await CategoryEntity.creator(viewerContext)
       .setField('parent_category_id', subCategory.getID())
       .enforceCreateAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(parentCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(subCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(subSubCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subSubCategory.getID())
     ).resolves.not.toBeNull();
 
-    await CategoryEntity.enforceDeleteAsync(parentCategory, viewerContext.getQueryContext());
+    await CategoryEntity.enforceDeleteAsync(parentCategory);
 
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(parentCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
     ).resolves.toBeNull();
 
-    const loadedSubCategory = await CategoryEntity.loader(
-      viewerContext,
-      viewerContext.getQueryContext()
-    )
+    const loadedSubCategory = await CategoryEntity.loader(viewerContext)
       .enforcing()
       .loadByIDAsync(subCategory.getID());
     expect(loadedSubCategory.getField('parent_category_id')).toBeNull();
 
-    const loadedSubSubCategory = await CategoryEntity.loader(
-      viewerContext,
-      viewerContext.getQueryContext()
-    )
+    const loadedSubSubCategory = await CategoryEntity.loader(viewerContext)
       .enforcing()
       .loadByIDAsync(subSubCategory.getID());
     expect(loadedSubSubCategory.getField('parent_category_id')).not.toBeNull();
@@ -236,23 +191,17 @@ describe('EntityEdgeDeletionBehavior.SET_NULL', () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new TestViewerContext(companionProvider);
 
-    const categoryA = await CategoryEntity.creator(
-      viewerContext,
-      viewerContext.getQueryContext()
-    ).enforceCreateAsync();
-    const categoryB = await CategoryEntity.creator(viewerContext, viewerContext.getQueryContext())
+    const categoryA = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
+    const categoryB = await CategoryEntity.creator(viewerContext)
       .setField('parent_category_id', categoryA.getID())
       .enforceCreateAsync();
-    await CategoryEntity.updater(categoryA, viewerContext.getQueryContext())
+    await CategoryEntity.updater(categoryA)
       .setField('parent_category_id', categoryB.getID())
       .enforceUpdateAsync();
 
-    await CategoryEntity.enforceDeleteAsync(categoryA, viewerContext.getQueryContext());
+    await CategoryEntity.enforceDeleteAsync(categoryA);
 
-    const loadedCategoryB = await CategoryEntity.loader(
-      viewerContext,
-      viewerContext.getQueryContext()
-    )
+    const loadedCategoryB = await CategoryEntity.loader(viewerContext)
       .enforcing()
       .loadByIDAsync(categoryB.getID());
     expect(loadedCategoryB.getField('parent_category_id')).toBeNull();
@@ -268,32 +217,24 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new TestViewerContext(companionProvider);
 
-    const parentCategory = await CategoryEntity.creator(
-      viewerContext,
-      viewerContext.getQueryContext()
-    ).enforceCreateAsync();
-    const subCategory = await CategoryEntity.creator(viewerContext, viewerContext.getQueryContext())
+    const parentCategory = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
+    const subCategory = await CategoryEntity.creator(viewerContext)
       .setField('parent_category_id', parentCategory.getID())
       .enforceCreateAsync();
-    const subSubCategory = await CategoryEntity.creator(
-      viewerContext,
-      viewerContext.getQueryContext()
-    )
+    const subSubCategory = await CategoryEntity.creator(viewerContext)
       .setField('parent_category_id', subCategory.getID())
       .enforceCreateAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(parentCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
+      CategoryEntity.loader(viewerContext)
         .enforcing()
         .loadByFieldEqualingAsync('parent_category_id', parentCategory.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
+      CategoryEntity.loader(viewerContext)
         .enforcing()
         .loadByFieldEqualingAsync('parent_category_id', subCategory.getID())
     ).resolves.not.toBeNull();
@@ -314,7 +255,7 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
     );
     expect(subSubCategoryCachedBefore.get(subCategory.getID())?.status).toEqual(CacheStatus.HIT);
 
-    await CategoryEntity.enforceDeleteAsync(parentCategory, viewerContext.getQueryContext());
+    await CategoryEntity.enforceDeleteAsync(parentCategory);
 
     const subCategoryCachedAfter = await categoryCacheAdapter.loadManyAsync('parent_category_id', [
       parentCategory.getID(),
@@ -328,19 +269,13 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
     expect(subSubCategoryCachedAfter.get(subCategory.getID())?.status).toEqual(CacheStatus.MISS);
 
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(parentCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
     ).resolves.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(subCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDNullableAsync(subSubCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subSubCategory.getID())
     ).resolves.not.toBeNull();
   });
 
@@ -352,24 +287,21 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
     const viewerContext = new TestViewerContext(companionProvider);
 
-    const categoryA = await CategoryEntity.creator(
-      viewerContext,
-      viewerContext.getQueryContext()
-    ).enforceCreateAsync();
-    const categoryB = await CategoryEntity.creator(viewerContext, viewerContext.getQueryContext())
+    const categoryA = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
+    const categoryB = await CategoryEntity.creator(viewerContext)
       .setField('parent_category_id', categoryA.getID())
       .enforceCreateAsync();
-    await CategoryEntity.updater(categoryA, viewerContext.getQueryContext())
+    await CategoryEntity.updater(categoryA)
       .setField('parent_category_id', categoryB.getID())
       .enforceUpdateAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
+      CategoryEntity.loader(viewerContext)
         .enforcing()
         .loadByFieldEqualingAsync('parent_category_id', categoryA.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext, viewerContext.getQueryContext())
+      CategoryEntity.loader(viewerContext)
         .enforcing()
         .loadByFieldEqualingAsync('parent_category_id', categoryB.getID())
     ).resolves.not.toBeNull();
@@ -386,7 +318,7 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
     expect(categoriesCachedBefore.get(categoryA.getID())?.status).toEqual(CacheStatus.HIT);
     expect(categoriesCachedBefore.get(categoryB.getID())?.status).toEqual(CacheStatus.HIT);
 
-    await CategoryEntity.enforceDeleteAsync(categoryA, viewerContext.getQueryContext());
+    await CategoryEntity.enforceDeleteAsync(categoryA);
 
     const categoriesCachedAfter = await categoryCacheAdapter.loadManyAsync('parent_category_id', [
       categoryA.getID(),

package/src/__tests__/ReadonlyEntity-test.ts

@@ -3,15 +3,15 @@ import { instance, mock } from 'ts-mockito';
 import EntityAssociationLoader from '../EntityAssociationLoader';
 import EntityLoader from '../EntityLoader';
 import ReadonlyEntity from '../ReadonlyEntity';
+import ViewerContext from '../ViewerContext';
 import SimpleTestEntity from '../testfixtures/SimpleTestEntity';
 import TestEntity from '../testfixtures/TestEntity';
-import TestViewerContext from '../testfixtures/TestViewerContext';
 import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
 
 describe(ReadonlyEntity, () => {
   describe('getID', () => {
     it('returns correct value', () => {
-      const viewerContext = instance(mock(TestViewerContext));
+      const viewerContext = instance(mock(ViewerContext));
       const data = {
         id: 'what',
       };
@@ -27,7 +27,7 @@ describe(ReadonlyEntity, () => {
 
   describe('toString', () => {
     it('returns correct value', () => {
-      const viewerContext = instance(mock(TestViewerContext));
+      const viewerContext = instance(mock(ViewerContext));
       const data = {
         id: 'what',
       };
@@ -43,7 +43,7 @@ describe(ReadonlyEntity, () => {
 
   describe('getUniqueIdentifier', () => {
     it('returns a different value for two different entities of the same type', () => {
-      const viewerContext = instance(mock(TestViewerContext));
+      const viewerContext = instance(mock(ViewerContext));
       const testEntity = new SimpleTestEntity({
         viewerContext,
         id: '1',
@@ -68,8 +68,8 @@ describe(ReadonlyEntity, () => {
     });
 
     it('returns the same value even if different viewer context', () => {
-      const viewerContext = instance(mock(TestViewerContext));
-      const viewerContext2 = instance(mock(TestViewerContext));
+      const viewerContext = instance(mock(ViewerContext));
+      const viewerContext2 = instance(mock(ViewerContext));
       const data = { id: '1' };
       const testEntity = new SimpleTestEntity({
         viewerContext,
@@ -87,7 +87,7 @@ describe(ReadonlyEntity, () => {
     });
 
     it('returns a different value for different entities even if same ID', () => {
-      const viewerContext = instance(mock(TestViewerContext));
+      const viewerContext = instance(mock(ViewerContext));
       const data = { id: '1' };
       const testEntity = new SimpleTestEntity({
         viewerContext,
@@ -114,7 +114,7 @@ describe(ReadonlyEntity, () => {
   });
 
   it('cannot be created without an ID', () => {
-    const viewerContext = instance(mock(TestViewerContext));
+    const viewerContext = instance(mock(ViewerContext));
     const dataWithoutID = {};
     expect(() => {
       // eslint-disable-next-line no-new
@@ -128,7 +128,7 @@ describe(ReadonlyEntity, () => {
   });
 
   it('returns correct viewerCo}ntext from instantiation', () => {
-    const viewerContext = instance(mock(TestViewerContext));
+    const viewerContext = instance(mock(ViewerContext));
     const data = {
       id: 'what',
     };
@@ -142,7 +142,7 @@ describe(ReadonlyEntity, () => {
   });
 
   it('returns correct data for field getters', () => {
-    const viewerContext = instance(mock(TestViewerContext));
+    const viewerContext = instance(mock(ViewerContext));
     const data = {
       id: 'what',
     };
@@ -159,7 +159,7 @@ describe(ReadonlyEntity, () => {
   describe('associationLoader', () => {
     it('returns a new association loader', () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
-      const viewerContext = new TestViewerContext(companionProvider);
+      const viewerContext = new ViewerContext(companionProvider);
       const data = {
         id: 'what',
       };
@@ -176,10 +176,8 @@ describe(ReadonlyEntity, () => {
   describe('loader', () => {
     it('creates a new EntityLoader', async () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
-      const viewerContext = new TestViewerContext(companionProvider);
-      expect(
-        SimpleTestEntity.loader(viewerContext, viewerContext.getQueryContext())
-      ).toBeInstanceOf(EntityLoader);
+      const viewerContext = new ViewerContext(companionProvider);
+      expect(SimpleTestEntity.loader(viewerContext)).toBeInstanceOf(EntityLoader);
     });
   });
 });

package/src/__tests__/ViewerContext-test.ts

@@ -3,12 +3,11 @@ import ViewerContext from '../ViewerContext';
 import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
 
 describe(ViewerContext, () => {
-  describe('getNonTransactionalQueryContextForDatabaseAdaptorFlavor', () => {
+  describe('getQueryContextForDatabaseAdaptorFlavor', () => {
     it('creates a new regular query context', () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new ViewerContext(companionProvider);
-      const queryContext =
-        viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres');
+      const queryContext = viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres');
       expect(queryContext).toBeInstanceOf(EntityQueryContext);
       expect(queryContext.isInTransaction()).toBe(false);
     });

package/src/__tests__/cases/TwoEntitySameTableDisjointRows-test.ts

@@ -3,22 +3,22 @@ import { EntityCompanionDefinition } from '../../EntityCompanionProvider';
 import EntityConfiguration from '../../EntityConfiguration';
 import { UUIDField, EnumField, StringField } from '../../EntityFields';
 import EntityPrivacyPolicy from '../../EntityPrivacyPolicy';
+import ViewerContext from '../../ViewerContext';
 import { successfulResults, failedResults } from '../../entityUtils';
 import AlwaysAllowPrivacyPolicyRule from '../../rules/AlwaysAllowPrivacyPolicyRule';
-import TestViewerContext from '../../testfixtures/TestViewerContext';
 import { createUnitTestEntityCompanionProvider } from '../../utils/testing/createUnitTestEntityCompanionProvider';
 
 describe('Two entities backed by the same table', () => {
   test('load by different types', async () => {
     const companionProvider = createUnitTestEntityCompanionProvider();
-    const viewerContext = new TestViewerContext(companionProvider);
+    const viewerContext = new ViewerContext(companionProvider);
 
-    const one = await OneTestEntity.creator(viewerContext, viewerContext.getQueryContext())
+    const one = await OneTestEntity.creator(viewerContext)
       .setField('entity_type', EntityType.ONE)
       .setField('common_other_field', 'wat')
       .enforceCreateAsync();
 
-    const two = await TwoTestEntity.creator(viewerContext, viewerContext.getQueryContext())
+    const two = await TwoTestEntity.creator(viewerContext)
       .setField('entity_type', EntityType.TWO)
       .setField('other_field', 'blah')
       .setField('common_other_field', 'wat')
@@ -28,21 +28,17 @@ describe('Two entities backed by the same table', () => {
     expect(two).toBeInstanceOf(TwoTestEntity);
 
     await expect(
-      TwoTestEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDAsync(one.getID())
+      TwoTestEntity.loader(viewerContext).enforcing().loadByIDAsync(one.getID())
     ).rejects.toThrowError('TwoTestEntity must be instantiated with two data');
 
     await expect(
-      OneTestEntity.loader(viewerContext, viewerContext.getQueryContext())
-        .enforcing()
-        .loadByIDAsync(two.getID())
+      OneTestEntity.loader(viewerContext).enforcing().loadByIDAsync(two.getID())
     ).rejects.toThrowError('OneTestEntity must be instantiated with one data');
 
-    const manyResults = await OneTestEntity.loader(
-      viewerContext,
-      viewerContext.getQueryContext()
-    ).loadManyByFieldEqualingAsync('common_other_field', 'wat');
+    const manyResults = await OneTestEntity.loader(viewerContext).loadManyByFieldEqualingAsync(
+      'common_other_field',
+      'wat'
+    );
     const successfulManyResults = successfulResults(manyResults);
     const failedManyResults = failedResults(manyResults);
 
@@ -55,8 +51,7 @@ describe('Two entities backed by the same table', () => {
     );
 
     const fieldEqualityConjunctionResults = await OneTestEntity.loader(
-      viewerContext,
-      viewerContext.getQueryContext()
+      viewerContext
     ).loadManyByFieldEqualityConjunctionAsync([
       {
         fieldName: 'common_other_field',
@@ -111,30 +106,24 @@ const testEntityConfiguration = new EntityConfiguration<TestFields>({
   cacheAdapterFlavor: 'redis',
 });
 
-class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  any,
-  string,
-  TestViewerContext,
-  any,
-  any
-> {
+class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<any, string, ViewerContext, any, any> {
   protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, TestViewerContext, any, any>(),
+    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
   ];
   protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, TestViewerContext, any, any>(),
+    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
   ];
   protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, TestViewerContext, any, any>(),
+    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
   ];
   protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, TestViewerContext, any, any>(),
+    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
   ];
 }
 
-class OneTestEntity extends Entity<TestFields, string, TestViewerContext, OneTestFields> {
+class OneTestEntity extends Entity<TestFields, string, ViewerContext, OneTestFields> {
   constructor(constructorParams: {
-    viewerContext: TestViewerContext;
+    viewerContext: ViewerContext;
     id: string;
     databaseFields: Readonly<TestFields>;
     selectedFields: Readonly<Pick<TestFields, OneTestFields>>;
@@ -148,7 +137,7 @@ class OneTestEntity extends Entity<TestFields, string, TestViewerContext, OneTes
   static defineCompanionDefinition(): EntityCompanionDefinition<
     TestFields,
     string,
-    TestViewerContext,
+    ViewerContext,
     OneTestEntity,
     TestEntityPrivacyPolicy,
     OneTestFields
@@ -162,9 +151,9 @@ class OneTestEntity extends Entity<TestFields, string, TestViewerContext, OneTes
   }
 }
 
-class TwoTestEntity extends Entity<TestFields, string, TestViewerContext, TwoTestFields> {
+class TwoTestEntity extends Entity<TestFields, string, ViewerContext, TwoTestFields> {
   constructor(constructorParams: {
-    viewerContext: TestViewerContext;
+    viewerContext: ViewerContext;
     id: string;
     databaseFields: Readonly<TestFields>;
     selectedFields: Readonly<Pick<TestFields, TwoTestFields>>;
@@ -178,7 +167,7 @@ class TwoTestEntity extends Entity<TestFields, string, TestViewerContext, TwoTes
   static defineCompanionDefinition(): EntityCompanionDefinition<
     TestFields,
     string,
-    TestViewerContext,
+    ViewerContext,
     TwoTestEntity,
     TestEntityPrivacyPolicy,
     TwoTestFields