refactor: Creates filterEntity util to fix CI.

Author: ryasmi

src/functions/getEntity.ts

@@ -1,25 +1,11 @@
-import ConflictingEntityError from '@js-entity-repos/core/dist/errors/ConflictingEntityError';
-import MissingEntityError from '@js-entity-repos/core/dist/errors/MissingEntityError';
 import GetEntity from '@js-entity-repos/core/dist/signatures/GetEntity';
 import Entity from '@js-entity-repos/core/dist/types/Entity';
-import Filter from '@js-entity-repos/core/dist/types/Filter';
 import Config from '../Config';
-import filterEntities from '../utils/filterEntities';
+import filterEntity from '../utils/filterEntity';
 
 export default <E extends Entity>(config: Config<E>): GetEntity<E> => {
   return async ({ id, filter = {} }) => {
-    const storedEntities = config.getEntities();
-    const idFilter = { id } as Filter<E>;
-    const fullFilter = { $and: [idFilter, filter] };
-    const matchedEntities = filterEntities(storedEntities, fullFilter);
-    if (matchedEntities.length === 0) {
-      throw new MissingEntityError(config.entityName, id);
-    }
-    /* istanbul ignore next */
-    if (matchedEntities.length > 1) {
-      throw new ConflictingEntityError(config.entityName, id);
-    }
-    const entity = matchedEntities[0];
+    const entity = filterEntity(config, id, filter);
     return { entity };
   };
 };

src/functions/patchEntity.ts

@@ -1,30 +1,16 @@
-import ConflictingEntityError from '@js-entity-repos/core/dist/errors/ConflictingEntityError';
-import MissingEntityError from '@js-entity-repos/core/dist/errors/MissingEntityError';
 import PatchEntity from '@js-entity-repos/core/dist/signatures/PatchEntity';
 import Entity from '@js-entity-repos/core/dist/types/Entity';
-import Filter from '@js-entity-repos/core/dist/types/Filter';
+import { difference } from 'lodash';
 import Config from '../Config';
-import filterEntities from '../utils/filterEntities';
+import filterEntity from '../utils/filterEntity';
 
 export default <E extends Entity>(config: Config<E>): PatchEntity<E> => {
   return async ({ id, patch, filter = {} }) => {
     const storedEntities = config.getEntities();
-    const idFilter = { id } as Filter<E>;
-    const fullFilter = { $and: [idFilter, filter] };
-    const matchedEntities = filterEntities(storedEntities, fullFilter);
-    if (matchedEntities.length === 0) {
-      throw new MissingEntityError(config.entityName, id);
-    }
-    /* istanbul ignore next */
-    if (matchedEntities.length > 1) {
-      throw new ConflictingEntityError(config.entityName, id);
-    }
-
-    const patchEntities = matchedEntities.map((matchedEntity: E) => {
-      return { ...matchedEntity as any, ...patch as any } as E;
-    });
-    const unmatchedEntities = filterEntities(storedEntities, { $nor: [idFilter] });
-    config.setEntities([...unmatchedEntities, ...patchEntities]);
-    return { entity: patchEntities[0] };
+    const matchedEntity = filterEntity(config, id, filter);
+    const patchedEntity = { ...matchedEntity as any, ...patch as any } as E;
+    const unmatchedEntities = difference(storedEntities, [matchedEntity]);
+    config.setEntities([...unmatchedEntities, patchedEntity]);
+    return { entity: patchedEntity };
   };
 };

src/functions/replaceEntity.ts

@@ -1,30 +1,16 @@
-import ConflictingEntityError from '@js-entity-repos/core/dist/errors/ConflictingEntityError';
-import MissingEntityError from '@js-entity-repos/core/dist/errors/MissingEntityError';
 import ReplaceEntity from '@js-entity-repos/core/dist/signatures/ReplaceEntity';
 import Entity from '@js-entity-repos/core/dist/types/Entity';
-import Filter from '@js-entity-repos/core/dist/types/Filter';
+import { difference } from 'lodash';
 import Config from '../Config';
-import filterEntities from '../utils/filterEntities';
+import filterEntity from '../utils/filterEntity';
 
 export default <E extends Entity>(config: Config<E>): ReplaceEntity<E> => {
   return async ({ id, entity, filter = {} }) => {
     const storedEntities = config.getEntities();
-    const idFilter = { id } as Filter<E>;
-    const fullFilter = { $and: [idFilter, filter] };
-    const matchedEntities = filterEntities(storedEntities, fullFilter);
-    if (matchedEntities.length === 0) {
-      throw new MissingEntityError(config.entityName, id);
-    }
-    /* istanbul ignore next */
-    if (matchedEntities.length > 1) {
-      throw new ConflictingEntityError(config.entityName, id);
-    }
-
-    const replacedEntities = matchedEntities.map(() => {
-      return { ...entity as any, id } as E;
-    });
-    const unmatchedEntities = filterEntities(storedEntities, { $nor: [fullFilter] });
-    config.setEntities([...unmatchedEntities, ...replacedEntities]);
-    return { entity: replacedEntities[0] };
+    const matchedEntity = filterEntity(config, id, filter);
+    const replacedEntity = { ...entity as any, id } as E;
+    const unmatchedEntities = difference(storedEntities, [matchedEntity]);
+    config.setEntities([...unmatchedEntities, replacedEntity]);
+    return { entity: replacedEntity };
   };
 };

src/utils/filterEntity.ts

@@ -0,0 +1,21 @@
+import ConflictingEntityError from '@js-entity-repos/core/dist/errors/ConflictingEntityError';
+import MissingEntityError from '@js-entity-repos/core/dist/errors/MissingEntityError';
+import Entity from '@js-entity-repos/core/dist/types/Entity';
+import Filter from '@js-entity-repos/core/dist/types/Filter';
+import Config from '../Config';
+import filterEntities from './filterEntities';
+
+export default <E extends Entity>(config: Config<E>, id: string, filter: Filter<E>) => {
+  const storedEntities = config.getEntities();
+  const idFilter = { id } as Filter<E>;
+  const fullFilter = { $and: [idFilter, filter] };
+  const matchedEntities = filterEntities(storedEntities, fullFilter);
+  if (matchedEntities.length === 0) {
+    throw new MissingEntityError(config.entityName, id);
+  }
+  /* istanbul ignore next */
+  if (matchedEntities.length > 1) {
+    throw new ConflictingEntityError(config.entityName, id);
+  }
+  return matchedEntities[0];
+};