From 396b61c4a0135919d9e35d87082c10d0bece950b Mon Sep 17 00:00:00 2001 From: AP Date: Tue, 3 Dec 2019 09:09:03 +0100 Subject: [PATCH] chore: changes --- src/schemaTypes/query/flow/InOut.ts | 12 +++++------- src/schemas/query/flow/getInOut.ts | 10 ++++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/schemaTypes/query/flow/InOut.ts b/src/schemaTypes/query/flow/InOut.ts index 91e93ed8..01dd4d51 100644 --- a/src/schemaTypes/query/flow/InOut.ts +++ b/src/schemaTypes/query/flow/InOut.ts @@ -1,15 +1,13 @@ -import { GraphQLObjectType, GraphQLString } from 'graphql'; +import { GraphQLObjectType, GraphQLString, GraphQLInt } from 'graphql'; export const InOutType = new GraphQLObjectType({ name: 'InOutType', fields: () => { return { - invoices: { - type: GraphQLString, - }, - payments: { - type: GraphQLString, - }, + invoices: { type: GraphQLString }, + payments: { type: GraphQLString }, + confirmedInvoices: { type: GraphQLInt }, + unConfirmedInvoices: { type: GraphQLInt }, }; }, }); diff --git a/src/schemas/query/flow/getInOut.ts b/src/schemas/query/flow/getInOut.ts index 9c15101f..cfa8ad38 100644 --- a/src/schemas/query/flow/getInOut.ts +++ b/src/schemas/query/flow/getInOut.ts @@ -90,6 +90,14 @@ export const getInOut = { return payment.isConfirmed && dif < periods; }); + const allInvoices = invoices.filter(invoice => { + const dif = differenceFn(endDate, new Date(invoice.createdAt)); + return dif < periods; + }); + + const totalConfirmed = confirmedInvoices.length; + const totalUnConfirmed = allInvoices.length - totalConfirmed; + const orderedInvoices = groupBy(confirmedInvoices, invoice => { return periods - differenceFn(endDate, new Date(invoice.createdAt)); }); @@ -103,6 +111,8 @@ export const getInOut = { return { invoices: JSON.stringify(reducedInvoices), payments: JSON.stringify(reducedPayments), + confirmedInvoices: totalConfirmed, + unConfirmedInvoices: totalUnConfirmed, }; }, };