fix(constructQuery): Takes the db instead of the table as the parameter.

Author: ryasmi

readme.md

@@ -39,8 +39,8 @@ const todosFacade = factory<TodoEntity>({
     return filter;
   },
   // Optional property to construct an initial database query. Defaults to the function below.
-  constrctQuery: (table) => {
-    return table;
+  constructQuery: (db) => {
+    return db.table('todos');
   },
   // Optional property to convert an entity sort to a DB sort. Defaults to the function below.
   constructSort: (sort) => {

src/FacadeConfig.ts

@@ -9,7 +9,7 @@ export default interface FacadeConfig<E extends Entity> {
   readonly constructDocument: (patch: Partial<E>) => Document;
   readonly constructEntity: (document: Document) => E;
   readonly constructFilter: (filter: Filter<E>) => any;
-  readonly constructQuery: (table: knex.QueryBuilder) => knex.QueryBuilder;
+  readonly constructQuery: (db: knex) => knex.QueryBuilder;
   readonly constructSort: (sort: Sort<E>) => any;
   readonly db: () => Promise<knex>;
   readonly defaultPaginationLimit: number;

src/FactoryConfig.ts

@@ -9,7 +9,7 @@ export default interface FacadeConfig<E extends Entity> {
   readonly constructDocument?: (patch: Partial<E>) => Document;
   readonly constructEntity?: (document: Document) => E;
   readonly constructFilter?: (filter: Filter<E>) => any;
-  readonly constructQuery?: (table: knex.QueryBuilder) => knex.QueryBuilder;
+  readonly constructQuery?: (table: knex) => knex.QueryBuilder;
   readonly constructSort?: (sort: Sort<E>) => any;
   readonly db: () => Promise<knex>;
   readonly defaultPaginationLimit?: number;

src/factory.ts

@@ -19,7 +19,9 @@ export default <E extends Entity>(factoryConfig: FactoryConfig<E>): Facade<E> =>
       return document;
     },
     constructFilter: (filter) => filter,
-    constructQuery: (table) => table,
+    constructQuery: (db) => {
+      return db.table(facadeConfig.tableName);
+    },
     constructSort: (sort) => sort,
     defaultPaginationLimit: 10,
     tableName: factoryConfig.entityName,

src/functions/countEntities.ts

@@ -5,8 +5,8 @@ import filterEntities from '../utils/filterEntities';
 
 export default <E extends Entity>(config: FacadeConfig<E>): CountEntities<E> => {
   return async ({ filter = {} }) => {
-    const table = (await config.db()).table(config.tableName);
-    const query = config.constructQuery(table);
+    const db = (await config.db());
+    const query = config.constructQuery(db);
     const constructedFilter = config.constructFilter(filter);
     const [result] = await Promise.resolve(filterEntities(query, constructedFilter).count());
     return { count: result['count(*)'] };

src/functions/createEntity.ts

@@ -7,8 +7,8 @@ const conflictErrorCode = 1062;
 
 export default <E extends Entity>(config: FacadeConfig<E>): CreateEntity<E> => {
   return async ({ id, entity }) => {
-    const table = (await config.db()).table(config.tableName);
-    const query = config.constructQuery(table);
+    const db = (await config.db());
+    const query = config.constructQuery(db);
     const document = config.constructDocument({ ...entity as any, id });
     try {
       await Promise.resolve(query.insert(document));

src/functions/getEntities.ts

@@ -23,8 +23,8 @@ export default <E extends Entity>(config: FacadeConfig<E>): GetEntities<E> => {
   };
   const defaultSort = { id: asc } as Sort<E>;
   return async ({ filter = {}, sort = defaultSort, pagination = defaultPagination }) => {
-    const table = (await config.db()).table(config.tableName);
-    const query = config.constructQuery(table);
+    const db = (await config.db());
+    const query = config.constructQuery(db);
     const paginationFilter = createPaginationFilter(pagination, sort);
     const fullFilter = { $and: [filter, paginationFilter] };
     const constructedFilter = config.constructFilter(fullFilter);

src/functions/getEntity.ts

@@ -7,8 +7,8 @@ import filterEntities from '../utils/filterEntities';
 
 export default <E extends Entity>(config: FacadeConfig<E>): GetEntity<E> => {
   return async ({ id, filter = {} }) => {
-    const table = (await config.db()).table(config.tableName);
-    const query = config.constructQuery(table);
+    const db = (await config.db());
+    const query = config.constructQuery(db);
     const constructedFilter = constructIdFilter({ id, filter, config });
     const document = await Promise.resolve(filterEntities(query, constructedFilter).first());
 

src/functions/patchEntity.ts

@@ -7,8 +7,8 @@ import getEntity from './getEntity';
 
 export default <E extends Entity>(config: FacadeConfig<E>): PatchEntity<E> => {
   return async ({ id, patch, filter = {} }) => {
-    const table = (await config.db()).table(config.tableName);
-    const query = config.constructQuery(table);
+    const db = (await config.db());
+    const query = config.constructQuery(db);
     const document = config.constructDocument({ ...patch as any, id });
     const constructedFilter = constructIdFilter({ id, filter, config });
     await Promise.resolve(filterEntities(query, constructedFilter).update(document));

src/functions/removeEntities.ts

@@ -5,8 +5,8 @@ import filterEntities from '../utils/filterEntities';
 
 export default <E extends Entity>(config: FacadeConfig<E>): RemoveEntities<E> => {
   return async ({ filter = {} }) => {
-    const table = (await config.db()).table(config.tableName);
-    const query = config.constructQuery(table);
+    const db = (await config.db());
+    const query = config.constructQuery(db);
     const constructedFilter = config.constructFilter(filter);
     await Promise.resolve(filterEntities(query, constructedFilter).delete());
   };

src/functions/removeEntity.ts

@@ -7,8 +7,8 @@ import filterEntities from '../utils/filterEntities';
 
 export default <E extends Entity>(config: FacadeConfig<E>): RemoveEntity<E> => {
   return async ({ id, filter = {} }) => {
-    const table = (await config.db()).table(config.tableName);
-    const query = config.constructQuery(table);
+    const db = (await config.db());
+    const query = config.constructQuery(db);
     const constructedFilter = constructIdFilter({ id, filter, config });
     const count = await Promise.resolve(filterEntities(query, constructedFilter).delete());
 

src/functions/replaceEntity.ts

@@ -7,8 +7,8 @@ import filterEntities from '../utils/filterEntities';
 
 export default <E extends Entity>(config: FacadeConfig<E>): ReplaceEntity<E> => {
   return async ({ id, entity, filter = {} }) => {
-    const table = (await config.db()).table(config.tableName);
-    const query = config.constructQuery(table);
+    const db = (await config.db());
+    const query = config.constructQuery(db);
     const document = config.constructDocument({ ...entity as any, id });
     const constructedFilter = constructIdFilter({ id, filter, config });
     const res = await Promise.resolve(filterEntities(query, constructedFilter).update(document));