feature: Use business repos on core-api v2 api

feature: mark unknown fields as OP_CUSTOM in SearchParameterConverter
fix: fixing some runtime-errors, default offset : 0,  limit 100, if none provided.

packages/core-api/src/versions/2/blocks/methods.ts

@@ -1,8 +1,13 @@
+import { app } from "@arkecosystem/core-container";
+import { Database } from "@arkecosystem/core-interfaces";
 import Boom from "boom";
-import { blocksRepository, transactionsRepository } from "../../../repositories";
 import { ServerCache } from "../../../services";
 import { paginate, respondWithResource, toPagination } from "../utils";
 
+const databaseService = app.resolvePlugin<Database.IDatabaseService>("database");
+const blocksRepository = databaseService.blocks;
+const transactionsRepository = databaseService.transactions;
+
 const index = async request => {
     const blocks = await blocksRepository.findAll({
         ...request.query,

packages/core-api/src/versions/2/transactions/methods.ts

@@ -1,8 +1,11 @@
+import { app } from "@arkecosystem/core-container";
+import { Database } from "@arkecosystem/core-interfaces";
 import Boom from "boom";
-import { transactionsRepository } from "../../../repositories";
 import { ServerCache } from "../../../services";
 import { paginate, respondWithResource, toPagination } from "../utils";
 
+const transactionsRepository = app.resolvePlugin<Database.IDatabaseService>("database").transactions;
+
 const index = async request => {
     const transactions = await transactionsRepository.findAll({
         ...request.query,

packages/core-database-postgres/src/repositories/blocks.ts

@@ -119,7 +119,8 @@ export class BlocksRepository extends Repository implements Database.IBlocksRepo
     public async search(params: Database.SearchParameters) {
         // TODO: we're selecting all the columns right now. Add support for choosing specific columns, when it proves useful.
         const selectQuery = this.q.select().from(this.q);
-        const parameterList = params.parameters;
+        // Blocks repo atm, doesn't search using any custom parameters
+        const parameterList = params.parameters.filter(o => o.operator !== Database.SearchOperator.OP_CUSTOM);
         if (parameterList.length) {
             let first;
             do {
@@ -128,9 +129,9 @@ export class BlocksRepository extends Repository implements Database.IBlocksRepo
             } while (!first.operator && parameterList.length);
 
             if (first) {
-                selectQuery.where(this.q[first.field][first.operator](first.value));
+                selectQuery.where(this.q[this.propToColumnName(first.field)][first.operator](first.value));
                 for (const param of parameterList) {
-                    selectQuery.and(this.q[param.field][param.operator](param.value));
+                    selectQuery.and(this.q[this.propToColumnName(param.field)][param.operator](param.value));
                 }
             }
         }

packages/core-database-postgres/src/repositories/transactions.ts

@@ -118,7 +118,7 @@ export class TransactionsRepository extends Repository implements Database.ITran
         const params = parameters.parameters;
         if (params.length) {
             // custom operators have a null 'operator' prop
-            const [customOps, simpleOps] = partition(params, param => !param.operator);
+            const [customOps, simpleOps] = partition(params, param => param.operator === Database.SearchOperator.OP_CUSTOM);
 
             const [participants, rest] = partition(simpleOps, op => ["sender_public_key", "recipient_id"].includes(this.propToColumnName(op.field)));
 

packages/core-database/src/repositories/transactions-business-repository.ts

@@ -36,12 +36,23 @@ export class TransactionsBusinessRepository implements Database.ITransactionsBus
         }
 
         const searchParameters = new SearchParameterConverter(databaseService.connection.transactionsRepository.getModel()).convert(params);
+
+        if(!searchParameters.paginate) {
+            searchParameters.paginate = {
+                offset: 0,
+                limit: 100
+            };
+        }
+
         searchParameters.orderBy.push({
             field: "sequence",
             direction: sequenceOrder
         });
+
         const result = await databaseService.connection.transactionsRepository.findAll(searchParameters);
-        return await this.mapBlocksToTransactions(result.rows);
+        result.rows = await this.mapBlocksToTransactions(result.rows);
+
+        return result;
     }
 
     public async findAllByBlock(blockId: any, parameters: any = {}) {

packages/core-database/src/repositories/utils/search-parameter-converter.ts

@@ -38,8 +38,8 @@ export class SearchParameterConverter implements Database.ISearchParameterConver
     private parsePaginate(searchParameters: Database.SearchParameters, paginate?: any) {
         if (paginate) {
             searchParameters.paginate = {
-                limit: Number.isInteger(paginate.limit) ? paginate.limit : null,
-                offset: Number.isInteger(paginate.offset) && +paginate.offset > 0 ? paginate.offset : null
+                limit: Number.isInteger(paginate.limit) ? paginate.limit : 100,
+                offset: Number.isInteger(paginate.offset) && +paginate.offset > 0 ? paginate.offset : 0
             }
         }
     }
@@ -59,8 +59,11 @@ export class SearchParameterConverter implements Database.ISearchParameterConver
     private parseSearchParameters(searchParameters: Database.SearchParameters, params: any) {
         const searchableFields = this.databaseModel.getSearchableFields();
         const mapByFieldName = searchableFields.reduce((p, c) => p[c.fieldName] = c, {});
-        // Only consider fields that this model supports.
-        Object.keys(params).filter(value => !["orderBy", "limit", "offset"].includes(value))
+        /*
+            orderBy, limit and offset are parsed earlier.
+            page, pagination are added automatically by hapi-pagination
+         */
+        Object.keys(params).filter(value => !["orderBy", "limit", "offset", "page", "pagination"].includes(value))
             .forEach(fieldName => {
                 const fieldDescriptor = mapByFieldName[fieldName] as Database.SearchableField;
 
@@ -71,7 +74,7 @@ export class SearchParameterConverter implements Database.ISearchParameterConver
                 if (!fieldDescriptor) {
                     searchParameters.parameters.push({
                         field: fieldName,
-                        operator: null,
+                        operator: Database.SearchOperator.OP_CUSTOM,
                         value: params[fieldName]
                     });
                     return;

packages/core-interfaces/src/core-database/business-repository/transactions-business-repository.ts

@@ -1,6 +1,6 @@
 export interface ITransactionsBusinessRepository {
 
-    findAll(params: any, sequenceOrder: "asc" | "desc"): Promise<any>;
+    findAll(params: any, sequenceOrder?: "asc" | "desc"): Promise<any>;
     findAllLegacy(parameters: any): Promise<any>;
     findWithVendorField(): Promise<any>;
     findAllByWallet(wallet, parameters: any): Promise<any>;

packages/core-interfaces/src/core-database/search/search-parameters.ts

@@ -3,7 +3,9 @@ export enum SearchOperator {
     OP_IN = 'in',
     OP_GTE = 'gte',
     OP_LTE = 'lte',
-    OP_LIKE = 'like'
+    OP_LIKE = 'like',
+    // placeholder. For parameters that require custom(not a 1-to-1 field to column mapping) filtering logic on the data-layer repo
+    OP_CUSTOM = 'custom_operator'
 }