Feature/side view

backend/src/modules/purchase/service.ts

@@ -61,25 +61,28 @@ export class PurchaseService implements IPurchaseService {
         async (payload: GetCompanyPurchasesDTO): Promise<GetCompanyPurchasesResponse> => {
             const qbPurchases = await this.PurchaseTransaction.getPurchasesForCompany(payload);
 
-            return qbPurchases.map((qbPurchase) => ({
-                companyId: qbPurchase.companyId,
-                dateCreated: qbPurchase.dateCreated.toUTCString(),
-                id: qbPurchase.id,
-                isRefund: qbPurchase.isRefund,
-                quickBooksId: qbPurchase.quickBooksId,
-                vendor: qbPurchase.vendor ? qbPurchase.vendor : undefined,
-                totalAmountCents: Math.round(qbPurchase.totalAmountCents),
-                quickbooksDateCreated: qbPurchase.quickbooksDateCreated?.toUTCString(),
-                lastUpdated: qbPurchase.lastUpdated.toUTCString(),
-                lineItems: qbPurchase.lineItems
-                    ? qbPurchase.lineItems.map((item) => ({
-                          ...item,
-                          dateCreated: item.dateCreated.toISOString(),
-                          lastUpdated: item.lastUpdated.toISOString(),
-                          quickbooksDateCreated: item.quickbooksDateCreated?.toISOString(),
-                      }))
-                    : [],
-            }));
+            return {
+                purchases: qbPurchases.purchases.map((qbPurchase) => ({
+                    companyId: qbPurchase.companyId,
+                    dateCreated: qbPurchase.dateCreated.toUTCString(),
+                    id: qbPurchase.id,
+                    isRefund: qbPurchase.isRefund,
+                    quickBooksId: qbPurchase.quickBooksId,
+                    vendor: qbPurchase.vendor ? qbPurchase.vendor : undefined,
+                    totalAmountCents: Math.round(qbPurchase.totalAmountCents),
+                    quickbooksDateCreated: qbPurchase.quickbooksDateCreated?.toUTCString(),
+                    lastUpdated: qbPurchase.lastUpdated.toUTCString(),
+                    lineItems: qbPurchase.lineItems
+                        ? qbPurchase.lineItems.map((item) => ({
+                              ...item,
+                              dateCreated: item.dateCreated.toISOString(),
+                              lastUpdated: item.lastUpdated.toISOString(),
+                              quickbooksDateCreated: item.quickbooksDateCreated?.toISOString(),
+                          }))
+                        : [],
+                })),
+                numPurchases: qbPurchases.numPurchases,
+            };
         }
     );
 

backend/src/modules/purchase/transaction.ts

@@ -7,12 +7,13 @@ import {
     GetCompanyPurchasesByDateDTO,
     GetCompanyPurchasesDTO,
     GetCompanyPurchasesInMonthBinsResponse,
+    PurchasesWithCount,
 } from "./types";
 
 export interface IPurchaseTransaction {
     createOrUpdatePurchase(payload: CreateOrChangePurchaseDTO): Promise<Purchase[]>;
     getPurchase(id: string): Promise<Purchase>;
-    getPurchasesForCompany(payload: GetCompanyPurchasesDTO): Promise<Purchase[]>;
+    getPurchasesForCompany(payload: GetCompanyPurchasesDTO): Promise<PurchasesWithCount>;
     sumPurchasesByCompanyAndDateRange(payload: GetCompanyPurchasesByDateDTO): Promise<number>;
     sumPurchasesByCompanyInMonthBins(
         payload: GetCompanyPurchasesByDateDTO
@@ -59,7 +60,7 @@ export class PurchaseTransaction implements IPurchaseTransaction {
         return existingQBPurchase;
     }
 
-    async getPurchasesForCompany(payload: GetCompanyPurchasesDTO): Promise<Purchase[]> {
+    async getPurchasesForCompany(payload: GetCompanyPurchasesDTO): Promise<PurchasesWithCount> {
         const { companyId, pageNumber, resultsPerPage, categories, type, dateFrom, dateTo, search, sortBy, sortOrder } =
             payload;
 
@@ -128,10 +129,12 @@ export class PurchaseTransaction implements IPurchaseTransaction {
             queryBuilder.orderBy(sortColumnMap[sortBy], sortOrder);
         }
 
+        const totalPurchases = await queryBuilder.getCount();
+
         const idRows = await queryBuilder.skip(numToSkip).take(resultsPerPage).getMany();
         const ids = idRows.map((row) => row.id);
         if (ids.length === 0) {
-            return [];
+            return { purchases: [], numPurchases: 0 };
         }
 
         const queryBuilderForIds = this.db.manager
@@ -144,7 +147,8 @@ export class PurchaseTransaction implements IPurchaseTransaction {
         }
         // to guarantee that line items do not move in the table rows
         queryBuilderForIds.addOrderBy("li.dateCreated", "ASC");
-        return await queryBuilderForIds.getMany();
+        const paginatedPurchases = await queryBuilderForIds.getMany();
+        return { purchases: paginatedPurchases, numPurchases: totalPurchases };
     }
 
     async sumPurchasesByCompanyAndDateRange(payload: GetCompanyPurchasesByDateDTO): Promise<number> {

backend/src/modules/purchase/types.ts

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { PurchaseLineItemType } from "../../entities/PurchaseLineItem";
 import { GetPurchaseLineItemResponseSchema } from "../purchase-line-item/types";
+import { Purchase } from "../../entities/Purchase";
 
 export const CreateOrChangePurchaseRequestSchema = z.object({
     items: z
@@ -95,7 +96,10 @@ export const GetCompanyPurchasesByDateDTOSchema = z.object({
     endDate: z.iso.datetime(),
 });
 
-export const GetCompanyPurchasesResponseSchema = z.array(GetPurchaseWithLineItems);
+export const GetCompanyPurchasesResponseSchema = z.object({
+    purchases: z.array(GetPurchaseWithLineItems),
+    numPurchases: z.number().nonnegative(),
+});
 
 export const GetCompanyPurchasesSummationResponseSchema = z.object({
     total: z.number().nonnegative(),
@@ -124,3 +128,11 @@ export type CreateOrChangePurchaseDTO = z.infer<typeof CreateOrChangePurchaseDTO
 export type GetCompanyPurchasesDTO = z.infer<typeof GetCompanyPurchasesDTOSchema>;
 export type GetCompanyPurchasesByDateDTO = z.infer<typeof GetCompanyPurchasesByDateDTOSchema>;
 export type GetPurchaseDTO = z.infer<typeof GetPurchaseDTOSchema>;
+
+/**
+ * Types for the transaction layer
+ */
+export type PurchasesWithCount = {
+    purchases: Purchase[];
+    numPurchases: number;
+};