Skip to content

Commit

Permalink
Rename functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@wschurman
wschurman committed Apr 11, 2024
1 parent af70c77 commit 7e40a52
Show file tree
Hide file tree
Showing 22 changed files with 347 additions and 193 deletions.
16 changes: 8 additions & 8 deletions ...ges/entity-cache-adapter-local-memory/src/__tests__/GenericLocalMemoryCacher-full-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe(GenericLocalMemoryCacher, () => {
const date = new Date();
const entity1Created = await LocalMemoryTestEntity.creator(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.setField('name', 'blah')
.setField('dateField', date)
Expand All @@ -36,7 +36,7 @@ describe(GenericLocalMemoryCacher, () => {
// loading an entity should put it in cache
const entity1 = await LocalMemoryTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.enforcing()
.loadByIDAsync(entity1Created.getID());
Expand Down Expand Up @@ -71,7 +71,7 @@ describe(GenericLocalMemoryCacher, () => {

const entityNonExistentResult = await LocalMemoryTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
).loadByIDAsync(nonExistentId);
expect(entityNonExistentResult.ok).toBe(false);

Expand All @@ -85,14 +85,14 @@ describe(GenericLocalMemoryCacher, () => {
// load again through entities framework to ensure it reads negative result
const entityNonExistentResult2 = await LocalMemoryTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
).loadByIDAsync(nonExistentId);
expect(entityNonExistentResult2.ok).toBe(false);

// invalidate from cache to ensure it invalidates correctly
await LocalMemoryTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
).invalidateFieldsAsync(entity1.getAllFields());
const cachedResultMiss = await entitySpecificGenericCacher.loadManyAsync([
cacheKeyMaker('id', entity1.getID()),
Expand All @@ -113,7 +113,7 @@ describe(GenericLocalMemoryCacher, () => {
const date = new Date();
const entity1Created = await LocalMemoryTestEntity.creator(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.setField('name', 'blah')
.setField('dateField', date)
Expand All @@ -122,7 +122,7 @@ describe(GenericLocalMemoryCacher, () => {
// loading an entity will try to put it in cache but it's a noop cache, so it should be a miss
const entity1 = await LocalMemoryTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.enforcing()
.loadByIDAsync(entity1Created.getID());
Expand Down Expand Up @@ -152,7 +152,7 @@ describe(GenericLocalMemoryCacher, () => {

const entityNonExistentResult = await LocalMemoryTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
).loadByIDAsync(nonExistentId);
expect(entityNonExistentResult.ok).toBe(false);

Expand Down
16 changes: 8 additions & 8 deletions ...ache-adapter-redis/src/__integration-tests__/BatchedRedisCacheAdapter-integration-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ describe(GenericRedisCacher, () => {

const entity1Created = await RedisTestEntity.creator(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.setField('name', 'blah')
.enforceCreateAsync();
Expand All @@ -122,19 +122,19 @@ describe(GenericRedisCacher, () => {
const [entity1, entity2, entity3] = await Promise.all([
RedisTestEntity.loader(
viewerContext1,
viewerContext1.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext1.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.enforcing()
.loadByIDAsync(entity1Created.getID()),
RedisTestEntity.loader(
viewerContext2,
viewerContext2.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext2.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.enforcing()
.loadByIDAsync(entity1Created.getID()),
RedisTestEntity.loader(
viewerContext3,
viewerContext3.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext3.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.enforcing()
.loadByFieldEqualingAsync('name', entity1Created.getField('name')),
Expand All @@ -156,7 +156,7 @@ describe(GenericRedisCacher, () => {
const cacheKeyEntity1NameField = cacheKeyMaker('name', entity1Created.getField('name'));
await RedisTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.enforcing()
.loadByFieldEqualingAsync('name', entity1Created.getField('name'));
Expand All @@ -166,7 +166,7 @@ describe(GenericRedisCacher, () => {
const nonExistentId = uuidv4();
const entityNonExistentResult = await RedisTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
).loadByIDAsync(nonExistentId);
expect(entityNonExistentResult.ok).toBe(false);
const cacheKeyNonExistent = cacheKeyMaker('id', nonExistentId);
Expand All @@ -175,14 +175,14 @@ describe(GenericRedisCacher, () => {
// load again through entities framework to ensure it reads negative result
const entityNonExistentResult2 = await RedisTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
).loadByIDAsync(nonExistentId);
expect(entityNonExistentResult2.ok).toBe(false);

// invalidate from cache to ensure it invalidates correctly in both caches
await RedisTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
).invalidateFieldsAsync(entity1.getAllFields());
await expect(redis.get(cacheKeyEntity1)).resolves.toBeNull();
await expect(redis.get(cacheKeyEntity1NameField)).resolves.toBeNull();
Expand Down
22 changes: 11 additions & 11 deletions ...cache-adapter-redis/src/__integration-tests__/GenericRedisCacher-full-integration-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ describe(GenericRedisCacher, () => {

const entity1Created = await RedisTestEntity.creator(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.setField('name', 'blah')
.enforceCreateAsync();

// loading an entity should put it in cache
const entity1 = await RedisTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.enforcing()
.loadByIDAsync(entity1Created.getID());
Expand All @@ -75,7 +75,7 @@ describe(GenericRedisCacher, () => {

const entityNonExistentResult = await RedisTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
).loadByIDAsync(nonExistentId);
expect(entityNonExistentResult.ok).toBe(false);

Expand All @@ -87,14 +87,14 @@ describe(GenericRedisCacher, () => {
// load again through entities framework to ensure it reads negative result
const entityNonExistentResult2 = await RedisTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
).loadByIDAsync(nonExistentId);
expect(entityNonExistentResult2.ok).toBe(false);

// invalidate from cache to ensure it invalidates correctly
await RedisTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
).invalidateFieldsAsync(entity1.getAllFields());
const cachedValueNull = await (genericRedisCacheContext.redisClient as Redis).get(
cacheKeyMaker('id', entity1.getID())
Expand All @@ -110,7 +110,7 @@ describe(GenericRedisCacher, () => {
const entity1 = await enforceAsyncResult(
RedisTestEntity.creator(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.setField('dateField', date)
.createAsync()
Expand All @@ -119,7 +119,7 @@ describe(GenericRedisCacher, () => {

const entity2 = await RedisTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.enforcing()
.loadByIDAsync(entity1.getID());
Expand All @@ -131,7 +131,7 @@ describe(GenericRedisCacher, () => {
);
const entity3 = await RedisTestEntity.loader(
vc2,
vc2.getQueryContextForDatabaseAdaptorFlavor('postgres')
vc2.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.enforcing()
.loadByIDAsync(entity1.getID());
Expand All @@ -145,14 +145,14 @@ describe(GenericRedisCacher, () => {
const entity1 = await enforceAsyncResult(
RedisTestEntity.creator(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.setField('name', '')
.createAsync()
);
const entity2 = await RedisTestEntity.loader(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.enforcing()
.loadByFieldEqualingAsync('name', '');
Expand All @@ -164,7 +164,7 @@ describe(GenericRedisCacher, () => {
);
const entity3 = await RedisTestEntity.loader(
vc2,
vc2.getQueryContextForDatabaseAdaptorFlavor('postgres')
vc2.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.enforcing()
.loadByFieldEqualingAsync('name', '');
Expand Down
4 changes: 2 additions & 2 deletions ...tity-cache-adapter-redis/src/__integration-tests__/GenericRedisCacher-integration-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ describe(GenericRedisCacher, () => {
const date = new Date();
const entity1Created = await RedisTestEntity.creator(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.setField('name', 'blah')
.setField('dateField', date)
Expand Down Expand Up @@ -97,7 +97,7 @@ describe(GenericRedisCacher, () => {
const date = new Date();
const entity1Created = await RedisTestEntity.creator(
viewerContext,
viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres')
viewerContext.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.setField('name', 'blah')
.setField('dateField', date)
Expand Down
5 changes: 4 additions & 1 deletion packages/entity-cache-adapter-redis/src/__integration-tests__/errors-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ describe(GenericRedisCacher, () => {
);

await expect(
RedisTestEntity.creator(vc1, vc1.getQueryContextForDatabaseAdaptorFlavor('postgres'))
RedisTestEntity.creator(
vc1,
vc1.getNonTransactionalQueryContextForDatabaseAdaptorFlavor('postgres')
)
.setField('name', 'blah')
.enforceCreateAsync()
).rejects.toThrow(EntityCacheAdapterTransientError);
Expand Down
Loading

0 comments on commit 7e40a52

Please sign in to comment.