changed signature of fallbackStrategy to be (id, schema), no point in…

… passing entity when the fallback is only executed when entity is undefined, updated tests
paularmstrong · Oct 14, 2019 · 4050536 · 4050536
1 parent c35b5bb
commit 4050536
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/index.js b/src/index.js
@@ -58,7 58,7 @@ const unvisitEntity = (id, schema, unvisit, getEntity, cache) => {
  let entity = getEntity(id, schema);
 
  if (entity === undefined && schema instanceof EntitySchema) {
- entity = schema.fallback(entity, id);
  entity = schema.fallback(id, schema);
  }
 
  if (typeof entity !== 'object' || entity === null) {

diff --git a/src/schemas/Entity.js b/src/schemas/Entity.js
@@ -15,7 15,7 @@ export default class EntitySchema {
  return { ...entityA, ...entityB };
  },
  processStrategy = (input) => ({ ...input }),
- fallbackStrategy = (input, key) => input
  fallbackStrategy = (key, schema) => undefined
  } = options;
 
  this._key = key;
@@ -50,8 50,8 @@ export default class EntitySchema {
  return this._mergeStrategy(entityA, entityB);
  }
 
- fallback(input, id) {
- return this._fallbackStrategy(input, id);
  fallback(id, schema) {
  return this._fallbackStrategy(id, schema);
  }
 
  normalize(input, parent, key, visit, addEntity, visitedEntities) {

diff --git a/src/schemas/__tests__/Entity.test.js b/src/schemas/__tests__/Entity.test.js
@@ -298,8 298,9 @@ describe(`${schema.Entity.name} denormalization`, () => {
  'users',
  {},
  {
- fallbackStrategy: (entity, id) => ({
- id: id,
  idAttribute: 'userId',
  fallbackStrategy: (id, schema) => ({
  [schema.idAttribute]: id,
  name: 'John Doe'
  })
  }
@@ -325,6 326,7 @@ describe(`${schema.Entity.name} denormalization`, () => {
 
  expect(denormalizedReport.publishedBy).toBe(denormalizedReport.draftedBy);
  expect(denormalizedReport.publishedBy.name).toBe('John Doe');
  expect(denormalizedReport.publishedBy.userId).toBe('456');
  //
  });
 });