From b9ab091791a46d24b7087c2abe9878387840b0f1 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Sun, 21 Jan 2024 21:59:35 +0200
Subject: [PATCH 1/6] feat(server): wip purchases by items exporting

---
 .../src/interfaces/PurchasesByItemsSheet.ts   |  54 +++++++++
 .../PurchasesByItems/PurchasesByItems.ts      |  10 +-
 .../PurchasesByItemsApplication.ts            |  45 +++++++
 .../PurchasesByItemsExport.ts                 |  43 +++++++
 .../PurchasesByItemsService.ts                |   6 +-
 .../PurchasesByItems/PurchasesByItemsTable.ts | 110 ++++++++++++++++++
 .../PurchasesByItemsTableInjectable.ts        |  13 +++
 .../PurchasesByItems/_types.ts                |   5 +
 8 files changed, 277 insertions(+), 9 deletions(-)
 create mode 100644 packages/server/src/interfaces/PurchasesByItemsSheet.ts
 create mode 100644 packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts
 create mode 100644 packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsExport.ts
 create mode 100644 packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts
 create mode 100644 packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTableInjectable.ts
 create mode 100644 packages/server/src/services/FinancialStatements/PurchasesByItems/_types.ts

diff --git a/packages/server/src/interfaces/PurchasesByItemsSheet.ts b/packages/server/src/interfaces/PurchasesByItemsSheet.ts
new file mode 100644
index 0000000000..33c24d309a
--- /dev/null
+++ b/packages/server/src/interfaces/PurchasesByItemsSheet.ts
@@ -0,0 +1,54 @@
+import { INumberFormatQuery } from './FinancialStatements';
+import { IFinancialTable } from './Table';
+
+export interface IPurchasesByItemsReportQuery {
+  fromDate: Date | string;
+  toDate: Date | string;
+  itemsIds: number[];
+  numberFormat: INumberFormatQuery;
+  noneTransactions: boolean;
+  onlyActive: boolean;
+}
+
+export interface IPurchasesByItemsSheetMeta {
+  organizationName: string;
+  baseCurrency: string;
+}
+
+export interface IPurchasesByItemsItem {
+  id: number;
+  name: string;
+  code: string;
+  quantitySold: number;
+  soldCost: number;
+  averageSellPrice: number;
+
+  quantitySoldFormatted: string;
+  soldCostFormatted: string;
+  averageSellPriceFormatted: string;
+  currencyCode: string;
+}
+
+export interface IPurchasesByItemsTotal {
+  quantitySold: number;
+  soldCost: number;
+  quantitySoldFormatted: string;
+  soldCostFormatted: string;
+  currencyCode: string;
+}
+
+export type IPurchasesByItemsSheetData = {
+  items: IPurchasesByItemsItem[];
+  total: IPurchasesByItemsTotal;
+};
+
+export interface ISalesByItemsSheet {
+  data: IPurchasesByItemsSheetData;
+  query: IPurchasesByItemsReportQuery;
+  meta: IPurchasesByItemsSheetMeta;
+}
+
+export interface IPurchasesByItemsTable extends IFinancialTable {
+  query: IPurchasesByItemsReportQuery;
+  meta: IPurchasesByItemsSheetMeta;
+}
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItems.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItems.ts
index 0dba04f03d..32904ef221 100644
--- a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItems.ts
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItems.ts
@@ -11,7 +11,7 @@ import {
   IItem,
 } from '@/interfaces';
 
-export default class InventoryValuationReport extends FinancialSheet {
+export class PurchasesByItems extends FinancialSheet {
   readonly baseCurrency: string;
   readonly items: IItem[];
   readonly itemsTransactions: Map<number, IAccountTransaction>;
@@ -159,7 +159,7 @@ export default class InventoryValuationReport extends FinancialSheet {
    * @param {IInventoryValuationItem[]} items
    * @returns {IInventoryValuationTotal}
    */
-  totalSection(items: IInventoryValuationItem[]): IInventoryValuationTotal {
+  private totalSection(items: IInventoryValuationItem[]): IInventoryValuationTotal {
     const quantityPurchased = sumBy(items, (item) => item.quantityPurchased);
     const purchaseCost = sumBy(items, (item) => item.purchaseCost);
 
@@ -176,12 +176,12 @@ export default class InventoryValuationReport extends FinancialSheet {
 
   /**
    * Retrieve the sheet data.
-   * @returns
+   * @returns {IInventoryValuationStatement}
    */
-  reportData(): IInventoryValuationStatement {
+  public reportData(): IInventoryValuationStatement {
     const items = this.itemsSection();
     const total = this.totalSection(items);
 
-    return items.length > 0 ? { items, total } : {};
+    return { items, total };
   }
 }
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts
new file mode 100644
index 0000000000..b2142a50af
--- /dev/null
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts
@@ -0,0 +1,45 @@
+import { Service, Inject } from 'typedi';
+import { PurchasesByItemsExport } from './PurchasesByItemsExport';
+import { IPurchasesByItemsReportQuery } from '@/interfaces/PurchasesByItemsSheet';
+
+@Service()
+export class PurcahsesByItemsApplication {
+  @Inject()
+  private purchasesByItemsSheet: any;
+
+  @Inject()
+  private purchasesByItemsTable: any;
+
+  @Inject()
+  private purchasesByItemsExport: PurchasesByItemsExport;
+
+  public sheet(tenantId: number, query: any) {}
+
+  public table(tenantId: number, query: any) {}
+
+  /**
+   * Retrieves the purchases by items in csv format.
+   * @param {number} tenantId
+   * @param {IPurchasesByItemsReportQuery} query
+   * @returns {Promise<string>}
+   */
+  public csv(
+    tenantId: number,
+    query: IPurchasesByItemsReportQuery
+  ): Promise<string> {
+    return this.purchasesByItemsExport.csv(tenantId, query);
+  }
+
+  /**
+   * Retrieves the purchases by items in xlsx format.
+   * @param {number} tenantId
+   * @param {IPurchasesByItemsReportQuery} query
+   * @returns {Promise<Buffer>}
+   */
+  public xlsx(
+    tenantId: number,
+    query: IPurchasesByItemsReportQuery
+  ): Promise<Buffer> {
+    return this.purchasesByItemsExport.xlsx(tenantId, query);
+  }
+}
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsExport.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsExport.ts
new file mode 100644
index 0000000000..2a96ac1e2c
--- /dev/null
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsExport.ts
@@ -0,0 +1,43 @@
+import { Inject, Service } from 'typedi';
+import { TableSheet } from '@/lib/Xlsx/TableSheet';
+import { ISalesByItemsReportQuery } from '@/interfaces';
+import { PurchasesByItemsTableInjectable } from './PurchasesByItemsTableInjectable';
+
+@Service()
+export class PurchasesByItemsExport {
+  @Inject()
+  private purchasesByItemsTable: PurchasesByItemsTableInjectable;
+
+  /**
+   * Retrieves the purchases by items sheet in XLSX format.
+   * @param {number} tenantId
+   * @param {ISalesByItemsReportQuery} query
+   * @returns {Promise<Buffer>}
+   */
+  public async xlsx(tenantId: number, query: ISalesByItemsReportQuery) {
+    const table = await this.purchasesByItemsTable.table(tenantId, query);
+
+    const tableSheet = new TableSheet(table.table);
+    const tableCsv = tableSheet.convertToXLSX();
+
+    return tableSheet.convertToBuffer(tableCsv, 'xlsx');
+  }
+
+  /**
+   * Retrieves the purchases by items sheet in CSV format.
+   * @param {number} tenantId
+   * @param {ISalesByItemsReportQuery} query
+   * @returns {Promise<Buffer>}
+   */
+  public async csv(
+    tenantId: number,
+    query: ISalesByItemsReportQuery
+  ): Promise<string> {
+    const table = await this.purchasesByItemsTable.table(tenantId, query);
+
+    const tableSheet = new TableSheet(table.table);
+    const tableCsv = tableSheet.convertToCSV();
+
+    return tableCsv;
+  }
+}
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts
index df4aee1adc..31f11afa7e 100644
--- a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts
@@ -6,11 +6,11 @@ import {
   IInventoryValuationSheetMeta,
 } from '@/interfaces';
 import TenancyService from '@/services/Tenancy/TenancyService';
-import PurchasesByItems from './PurchasesByItems';
+import { PurchasesByItems } from './PurchasesByItems';
 import { Tenant } from '@/system/models';
 
 @Service()
-export default class InventoryValuationReportService {
+export class PurchasesByItemsService {
   @Inject()
   private tenancy: TenancyService;
 
@@ -63,7 +63,6 @@ export default class InventoryValuationReportService {
    * -------------
    * @param {number} tenantId
    * @param {IBalanceSheetQuery} query
-   *
    * @return {IBalanceSheetStatement}
    */
   public async purchasesByItems(
@@ -106,7 +105,6 @@ export default class InventoryValuationReportService {
         builder.modify('filterDateRange', filter.fromDate, filter.toDate);
       }
     );
-
     const purchasesByItemsInstance = new PurchasesByItems(
       filter,
       inventoryItems,
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts
new file mode 100644
index 0000000000..a8e1668ec4
--- /dev/null
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts
@@ -0,0 +1,110 @@
+import * as R from 'ramda';
+import { ITableColumn, ITableColumnAccessor, ITableRow } from '@/interfaces';
+import { ROW_TYPE } from './_types';
+import { tableRowMapper } from '@/utils';
+import { FinancialTable } from '../FinancialTable';
+import { FinancialSheetStructure } from '../FinancialSheetStructure';
+import FinancialSheet from '../FinancialSheet';
+import {
+  IPurchasesByItemsItem,
+  IPurchasesByItemsTotal,
+} from '@/interfaces/PurchasesByItemsSheet';
+
+export class PurchasesByItemsTable extends R.compose(
+  FinancialTable,
+  FinancialSheetStructure
+)(FinancialSheet) {
+  private data: any;
+
+  /**
+   * Constructor method.
+   * @param data
+   */
+  constructor(data) {
+    super();
+    this.data = data;
+  }
+
+  /**
+   * Retrieves thge common table accessors.
+   * @returns {ITableColumnAccessor[]}
+   */
+  private commonTableAccessors(): ITableColumnAccessor[] {
+    return [
+      { key: 'item_name', accessor: 'itemName' },
+      { key: 'quantity_purchases', accessor: 'quantityPurchasedFormatted' },
+      { key: 'purchase_amount', accessor: 'purchaseCostFormatted' },
+      { key: 'average_cost', accessor: 'averageCostPriceFormatted' },
+    ];
+  }
+
+  /**
+   * Retrieves the common table columns.
+   * @returns {ITableColumn[]}
+   */
+  private commonTableColumns(): ITableColumn[] {
+    return [
+      { label: 'Item name', key: 'item_name' },
+      { label: 'Quantity Purchases', key: 'quantity_purchases' },
+      { label: 'Purchase Amount', key: 'purchase_amount' },
+      { label: 'Average Cost', key: 'average_cost' },
+    ];
+  }
+
+  /**
+   * Maps the given item node to table row.
+   * @param {IPurchasesByItemsItem} item
+   * @returns {ITableRow}
+   */
+  private itemMap = (item: IPurchasesByItemsItem): ITableRow => {
+    const columns = this.commonTableAccessors();
+    const meta = {
+      rowTypes: [ROW_TYPE.ITEM],
+    };
+    return tableRowMapper(item, columns, meta);
+  };
+
+  /**
+   * Maps the given items nodes to table rows.
+   * @param {IPurchasesByItemsItem[]} items - Items nodes.
+   * @returns {ITableRow[]}
+   */
+  private itemsMap = (items: IPurchasesByItemsItem[]): ITableRow[] => {
+    return R.map(this.itemMap)(items);
+  };
+
+  /**
+   * Maps the given total node to table rows.
+   * @param {IPurchasesByItemsTotal} total
+   * @returns {ITableRow}
+   */
+  private totalNodeMap = (total: IPurchasesByItemsTotal): ITableRow => {
+    const columns = this.commonTableAccessors();
+    const meta = {
+      rowTypes: [ROW_TYPE.ITEM],
+    };
+    return tableRowMapper(total, columns, meta);
+  };
+
+  /**
+   * Retrieves the table columns.
+   * @returns {ITableColumn[]}
+   */
+  public tableColumns(): ITableColumn[] {
+    const columns = this.commonTableColumns();
+    return R.compose(this.tableColumnsCellIndexing)(columns);
+  }
+
+  /**
+   * Retrieves the table rows.
+   * @returns {ITableRow[]}
+   */
+  public tableData(): ITableRow[] {
+    const itemsRows = this.itemsMap(this.data.items);
+    const totalRow = this.totalNodeMap(this.data.total);
+
+    return R.compose(
+      R.when(R.always(R.not(R.isEmpty(itemsRows))), R.append(totalRow))
+    )(itemsRows) as ITableRow[];
+  }
+}
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTableInjectable.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTableInjectable.ts
new file mode 100644
index 0000000000..6fe514e571
--- /dev/null
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTableInjectable.ts
@@ -0,0 +1,13 @@
+import {
+  IPurchasesByItemsReportQuery,
+  IPurchasesByItemsTable,
+} from '@/interfaces/PurchasesByItemsSheet';
+import { Service } from 'typedi';
+
+@Service()
+export class PurchasesByItemsTableInjectable {
+  table(
+    tenantId: number,
+    query: IPurchasesByItemsReportQuery
+  ): Promise<IPurchasesByItemsTable> {}
+}
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/_types.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/_types.ts
new file mode 100644
index 0000000000..d9fbb7dc00
--- /dev/null
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/_types.ts
@@ -0,0 +1,5 @@
+
+export enum ROW_TYPE {
+  TOTAL = 'TOTAL',
+  ITEM = 'ITEM'
+}
\ No newline at end of file

From 82b8ec3e8010ae757ecf800da116038af27f3c0c Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Mon, 22 Jan 2024 18:05:13 +0200
Subject: [PATCH 2/6] feat: wip

---
 .../FinancialStatements/PurchasesByItem.ts    |  7 ++--
 .../src/interfaces/APAgingSummaryReport.ts    |  3 --
 .../services/Accounts/AccountsApplication.ts  | 20 +++++++----
 .../PurchasesByItemsApplication.ts            | 13 ++++++--
 .../PurchasesByItemsTableInjectable.ts        | 33 ++++++++++++++++---
 5 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/packages/server/src/api/controllers/FinancialStatements/PurchasesByItem.ts b/packages/server/src/api/controllers/FinancialStatements/PurchasesByItem.ts
index 5e7aacb09e..33d5ba8f0d 100644
--- a/packages/server/src/api/controllers/FinancialStatements/PurchasesByItem.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/PurchasesByItem.ts
@@ -1,17 +1,16 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { query, ValidationChain } from 'express-validator';
-import moment from 'moment';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from './BaseFinancialReportController';
-import PurchasesByItemsService from '@/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService';
+import { PurchasesByItemsService } from '@/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 
 @Service()
-export default class PurchasesByItemReportController extends BaseFinancialReportController {
+export class PurchasesByItemReportController extends BaseFinancialReportController {
   @Inject()
-  purchasesByItemsService: PurchasesByItemsService;
+  private purchasesByItemsService: PurchasesByItemsService;
 
   /**
    * Router constructor.
diff --git a/packages/server/src/interfaces/APAgingSummaryReport.ts b/packages/server/src/interfaces/APAgingSummaryReport.ts
index 6bf7c83bb7..2d7a8a447a 100644
--- a/packages/server/src/interfaces/APAgingSummaryReport.ts
+++ b/packages/server/src/interfaces/APAgingSummaryReport.ts
@@ -1,13 +1,10 @@
 import {
   IAgingPeriod,
-  IAgingPeriodTotal,
-  IAgingAmount,
   IAgingSummaryQuery,
   IAgingSummaryTotal,
   IAgingSummaryContact,
   IAgingSummaryData,
 } from './AgingReport';
-import { INumberFormatQuery } from './FinancialStatements';
 import { IFinancialTable } from './Table';
 
 export interface IAPAgingSummaryQuery extends IAgingSummaryQuery {
diff --git a/packages/server/src/services/Accounts/AccountsApplication.ts b/packages/server/src/services/Accounts/AccountsApplication.ts
index 5e7043b9aa..8182b30586 100644
--- a/packages/server/src/services/Accounts/AccountsApplication.ts
+++ b/packages/server/src/services/Accounts/AccountsApplication.ts
@@ -3,8 +3,10 @@ import {
   IAccount,
   IAccountCreateDTO,
   IAccountEditDTO,
+  IAccountResponse,
   IAccountsFilter,
   IAccountsTransactionsFilter,
+  IFilterMeta,
   IGetAccountTransactionPOJO,
 } from '@/interfaces';
 import { CreateAccount } from './CreateAccount';
@@ -14,6 +16,7 @@ import { ActivateAccount } from './ActivateAccount';
 import { GetAccounts } from './GetAccounts';
 import { GetAccount } from './GetAccount';
 import { GetAccountTransactions } from './GetAccountTransactions';
+
 @Service()
 export class AccountsApplication {
   @Inject()
@@ -113,19 +116,22 @@ export class AccountsApplication {
 
   /**
    * Retrieves the accounts list.
-   * @param   {number} tenantId
-   * @param   {IAccountsFilter} filterDTO
-   * @returns
+   * @param {number} tenantId
+   * @param {IAccountsFilter} filterDTO
+   * @returns {Promise<{ accounts: IAccountResponse[]; filterMeta: IFilterMeta }>}
    */
-  public getAccounts = (tenantId: number, filterDTO: IAccountsFilter) => {
+  public getAccounts = (
+    tenantId: number,
+    filterDTO: IAccountsFilter
+  ): Promise<{ accounts: IAccountResponse[]; filterMeta: IFilterMeta }> => {
     return this.getAccountsService.getAccountsList(tenantId, filterDTO);
   };
 
   /**
    * Retrieves the given account transactions.
-   * @param    {number} tenantId
-   * @param    {IAccountsTransactionsFilter} filter
-   * @returns  {Promise<IGetAccountTransactionPOJO[]>}
+   * @param {number} tenantId
+   * @param {IAccountsTransactionsFilter} filter
+   * @returns {Promise<IGetAccountTransactionPOJO[]>}
    */
   public getAccountsTransactions = (
     tenantId: number,
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts
index b2142a50af..77e303f0a9 100644
--- a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts
@@ -1,6 +1,7 @@
 import { Service, Inject } from 'typedi';
 import { PurchasesByItemsExport } from './PurchasesByItemsExport';
 import { IPurchasesByItemsReportQuery } from '@/interfaces/PurchasesByItemsSheet';
+import { PurchasesByItemsTableInjectable } from './PurchasesByItemsTableInjectable';
 
 @Service()
 export class PurcahsesByItemsApplication {
@@ -8,14 +9,22 @@ export class PurcahsesByItemsApplication {
   private purchasesByItemsSheet: any;
 
   @Inject()
-  private purchasesByItemsTable: any;
+  private purchasesByItemsTable: PurchasesByItemsTableInjectable;
 
   @Inject()
   private purchasesByItemsExport: PurchasesByItemsExport;
 
   public sheet(tenantId: number, query: any) {}
 
-  public table(tenantId: number, query: any) {}
+  /**
+   * 
+   * @param {number} tenantId 
+   * @param {} query 
+   * @returns 
+   */
+  public table(tenantId: number, query: IPurchasesByItemsReportQuery) {
+    return this.purchasesByItemsTable.table(tenantId, query);
+  }
 
   /**
    * Retrieves the purchases by items in csv format.
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTableInjectable.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTableInjectable.ts
index 6fe514e571..066ac6f72d 100644
--- a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTableInjectable.ts
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTableInjectable.ts
@@ -2,12 +2,37 @@ import {
   IPurchasesByItemsReportQuery,
   IPurchasesByItemsTable,
 } from '@/interfaces/PurchasesByItemsSheet';
-import { Service } from 'typedi';
+import { Inject, Service } from 'typedi';
+import { PurchasesByItemsService } from './PurchasesByItemsService';
+import { PurchasesByItemsTable } from './PurchasesByItemsTable';
 
 @Service()
 export class PurchasesByItemsTableInjectable {
-  table(
+  @Inject()
+  private purchasesByItemsSheet: PurchasesByItemsService;
+
+  /**
+   * Retrieves the purchases by items table format.
+   * @param {number} tenantId
+   * @param {IPurchasesByItemsReportQuery} filter
+   * @returns {Promise<IPurchasesByItemsTable>}
+   */
+  public async table(
     tenantId: number,
-    query: IPurchasesByItemsReportQuery
-  ): Promise<IPurchasesByItemsTable> {}
+    filter: IPurchasesByItemsReportQuery
+  ): Promise<IPurchasesByItemsTable> {
+    const { data, query, meta } =
+      await this.purchasesByItemsSheet.purchasesByItems(tenantId, filter);
+
+    const table = new PurchasesByItemsTable(data);
+
+    return {
+      table: {
+        columns: table.tableColumns(),
+        rows: table.tableData(),
+      },
+      meta,
+      query,
+    };
+  }
 }

From e1f3cfc96f81e8d3ce164164f9123cbf6c4bc67b Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Mon, 22 Jan 2024 23:32:14 +0200
Subject: [PATCH 3/6] feat(server): purchases by items table format

---
 .../FinancialStatements/PurchasesByItem.ts    | 55 ++++++++++++++-----
 .../PurchasesByItemsApplication.ts            | 31 ++++++++---
 .../PurchasesByItems/PurchasesByItemsTable.ts |  5 +-
 3 files changed, 68 insertions(+), 23 deletions(-)

diff --git a/packages/server/src/api/controllers/FinancialStatements/PurchasesByItem.ts b/packages/server/src/api/controllers/FinancialStatements/PurchasesByItem.ts
index 33d5ba8f0d..2e72587c02 100644
--- a/packages/server/src/api/controllers/FinancialStatements/PurchasesByItem.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/PurchasesByItem.ts
@@ -6,11 +6,13 @@ import BaseFinancialReportController from './BaseFinancialReportController';
 import { PurchasesByItemsService } from '@/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
+import { ACCEPT_TYPE } from '@/interfaces/Http';
+import { PurcahsesByItemsApplication } from '@/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication';
 
 @Service()
-export class PurchasesByItemReportController extends BaseFinancialReportController {
+export default class PurchasesByItemReportController extends BaseFinancialReportController {
   @Inject()
-  private purchasesByItemsService: PurchasesByItemsService;
+  private purchasesByItemsApp: PurcahsesByItemsApplication;
 
   /**
    * Router constructor.
@@ -62,20 +64,47 @@ export class PurchasesByItemReportController extends BaseFinancialReportControll
    * @param {Request} req -
    * @param {Response} res -
    */
-  async purchasesByItems(req: Request, res: Response, next: NextFunction) {
+  public async purchasesByItems(req: Request, res: Response) {
     const { tenantId } = req;
     const filter = this.matchedQueryData(req);
 
-    try {
-      const { data, query, meta } =
-        await this.purchasesByItemsService.purchasesByItems(tenantId, filter);
-      return res.status(200).send({
-        meta: this.transfromToResponse(meta),
-        data: this.transfromToResponse(data),
-        query: this.transfromToResponse(query),
-      });
-    } catch (error) {
-      next(error);
+    const accept = this.accepts(req);
+
+    const acceptType = accept.types([
+      ACCEPT_TYPE.APPLICATION_JSON,
+      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
+      ACCEPT_TYPE.APPLICATION_XLSX,
+      ACCEPT_TYPE.APPLICATION_CSV,
+    ]);
+
+    // JSON table response format.
+    if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
+      const table = await this.purchasesByItemsApp.table(tenantId, filter);
+
+      return res.status(200).send(table);
+      // CSV response format.
+    } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
+      const buffer = await this.purchasesByItemsApp.csv(tenantId, filter);
+
+      res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
+      res.setHeader('Content-Type', 'text/csv');
+
+      return res.send(buffer);
+      // Xlsx response format.
+    } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
+      const buffer = await this.purchasesByItemsApp.xlsx(tenantId, filter);
+
+      res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
+      res.setHeader(
+        'Content-Type',
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      );
+      return res.send(buffer);
+      // Json response format.
+    } else {
+      const sheet = await this.purchasesByItemsApp.sheet(tenantId, filter);
+
+      return res.status(200).send(sheet);
     }
   }
 }
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts
index 77e303f0a9..e6086262a6 100644
--- a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts
@@ -1,12 +1,16 @@
 import { Service, Inject } from 'typedi';
 import { PurchasesByItemsExport } from './PurchasesByItemsExport';
-import { IPurchasesByItemsReportQuery } from '@/interfaces/PurchasesByItemsSheet';
+import {
+  IPurchasesByItemsReportQuery,
+  IPurchasesByItemsTable,
+} from '@/interfaces/PurchasesByItemsSheet';
 import { PurchasesByItemsTableInjectable } from './PurchasesByItemsTableInjectable';
+import { PurchasesByItemsService } from './PurchasesByItemsService';
 
 @Service()
 export class PurcahsesByItemsApplication {
   @Inject()
-  private purchasesByItemsSheet: any;
+  private purchasesByItemsSheet: PurchasesByItemsService;
 
   @Inject()
   private purchasesByItemsTable: PurchasesByItemsTableInjectable;
@@ -14,15 +18,26 @@ export class PurcahsesByItemsApplication {
   @Inject()
   private purchasesByItemsExport: PurchasesByItemsExport;
 
-  public sheet(tenantId: number, query: any) {}
+  /**
+   * Retrieves the purchases by items in json format.
+   * @param {number} tenantId
+   * @param {IPurchasesByItemsReportQuery} query
+   * @returns
+   */
+  public sheet(tenantId: number, query: any) {
+    return this.purchasesByItemsSheet.purchasesByItems(tenantId, query);
+  }
 
   /**
-   * 
-   * @param {number} tenantId 
-   * @param {} query 
-   * @returns 
+   * Retrieves the purchases by items in table format.
+   * @param {number} tenantId
+   * @param {IPurchasesByItemsReportQuery} query
+   * @returns {Promise<IPurchasesByItemsTable>}
    */
-  public table(tenantId: number, query: IPurchasesByItemsReportQuery) {
+  public table(
+    tenantId: number,
+    query: IPurchasesByItemsReportQuery
+  ): Promise<IPurchasesByItemsTable> {
     return this.purchasesByItemsTable.table(tenantId, query);
   }
 
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts
index a8e1668ec4..12bcebf71e 100644
--- a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts
@@ -7,6 +7,7 @@ import { FinancialSheetStructure } from '../FinancialSheetStructure';
 import FinancialSheet from '../FinancialSheet';
 import {
   IPurchasesByItemsItem,
+  IPurchasesByItemsSheetData,
   IPurchasesByItemsTotal,
 } from '@/interfaces/PurchasesByItemsSheet';
 
@@ -14,7 +15,7 @@ export class PurchasesByItemsTable extends R.compose(
   FinancialTable,
   FinancialSheetStructure
 )(FinancialSheet) {
-  private data: any;
+  private data: IPurchasesByItemsSheetData;
 
   /**
    * Constructor method.
@@ -81,7 +82,7 @@ export class PurchasesByItemsTable extends R.compose(
   private totalNodeMap = (total: IPurchasesByItemsTotal): ITableRow => {
     const columns = this.commonTableAccessors();
     const meta = {
-      rowTypes: [ROW_TYPE.ITEM],
+      rowTypes: [ROW_TYPE.TOTAL],
     };
     return tableRowMapper(total, columns, meta);
   };

From fc786814eb052aefeac4a05651829f36e4dff1a0 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Tue, 23 Jan 2024 12:13:36 +0200
Subject: [PATCH 4/6] feat: purchases by items exporting

---
 .../PurchasesByItems/PurchasesByItemsTable.ts |   2 +-
 .../PurchasesByItemsActionsBar.tsx            |  18 +-
 .../PurchasesByItemsProvider.tsx              |   5 +-
 .../PurchasesByItemsTable.tsx                 |   8 +-
 .../PurchasesByItems/components.tsx           | 162 +++++++++++-------
 .../PurchasesByItems/dynamicColumns.ts        |  89 ++++++++++
 .../src/hooks/query/financialReports.tsx      |  54 +++++-
 7 files changed, 255 insertions(+), 83 deletions(-)
 create mode 100644 packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dynamicColumns.ts

diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts
index 12bcebf71e..23480de461 100644
--- a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts
@@ -32,7 +32,7 @@ export class PurchasesByItemsTable extends R.compose(
    */
   private commonTableAccessors(): ITableColumnAccessor[] {
     return [
-      { key: 'item_name', accessor: 'itemName' },
+      { key: 'item_name', accessor: 'name' },
       { key: 'quantity_purchases', accessor: 'quantityPurchasedFormatted' },
       { key: 'purchase_amount', accessor: 'purchaseCostFormatted' },
       { key: 'average_cost', accessor: 'averageCostPriceFormatted' },
diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsActionsBar.tsx
index 4a5a817382..c3859939e0 100644
--- a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsActionsBar.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsActionsBar.tsx
@@ -18,6 +18,7 @@ import withPurchasesByItems from './withPurchasesByItems';
 import withPurchasesByItemsActions from './withPurchasesByItemsActions';
 import { compose, saveInvoke } from '@/utils';
 import { usePurchaseByItemsContext } from './PurchasesByItemsProvider';
+import { PurchasesByItemsExportMenu } from './components';
 
 function PurchasesByItemsActionsBar({
   // #withPurchasesByItems
@@ -106,11 +107,18 @@ function PurchasesByItemsActionsBar({
           icon={<Icon icon="print-16" iconSize={16} />}
           text={<T id={'print'} />}
         />
-        <Button
-          className={Classes.MINIMAL}
-          icon={<Icon icon="file-export-16" iconSize={16} />}
-          text={<T id={'export'} />}
-        />
+        <Popover
+          content={<PurchasesByItemsExportMenu />}
+          interactionKind={PopoverInteractionKind.CLICK}
+          placement="bottom-start"
+          minimal
+        >
+          <Button
+            className={Classes.MINIMAL}
+            icon={<Icon icon="file-export-16" iconSize={16} />}
+            text={<T id={'export'} />}
+          />
+        </Popover>
       </NavbarGroup>
     </DashboardActionsBar>
   );
diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsProvider.tsx b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsProvider.tsx
index c08f713bc7..82b21d86ff 100644
--- a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsProvider.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsProvider.tsx
@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React, { createContext, useContext } from 'react';
 import FinancialReportPage from '../FinancialReportPage';
-import { usePurchasesByItems } from '@/hooks/query';
+import { usePurchasesByItemsTable } from '@/hooks/query';
 import { transformFilterFormToQuery } from '../common';
 
 const PurchasesByItemsContext = createContext();
@@ -13,7 +13,7 @@ function PurchasesByItemsProvider({ query, ...props }) {
     isFetching,
     isLoading,
     refetch,
-  } = usePurchasesByItems(
+  } = usePurchasesByItemsTable(
     {
       ...transformFilterFormToQuery(query),
     },
@@ -26,7 +26,6 @@ function PurchasesByItemsProvider({ query, ...props }) {
     purchaseByItems,
     isFetching,
     isLoading,
-
     refetchSheet: refetch,
   };
   return (
diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.tsx b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.tsx
index 495c06ab90..bbfb5260b8 100644
--- a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.tsx
@@ -6,10 +6,10 @@ import styled from 'styled-components';
 import { ReportDataTable, FinancialSheet } from '@/components';
 
 import { usePurchaseByItemsContext } from './PurchasesByItemsProvider';
-import { usePurchasesByItemsTableColumns } from './components';
 
 import { tableRowTypesToClassnames } from '@/utils';
 import { TableStyle } from '@/constants';
+import { usePurchasesByItemsTableColumns } from './dynamicColumns';
 
 /**
  * Purchases by items data table.
@@ -17,7 +17,7 @@ import { TableStyle } from '@/constants';
 export default function PurchasesByItemsTable({ companyName }) {
   // Purchases by items context.
   const {
-    purchaseByItems: { tableRows, query },
+    purchaseByItems: { table, query },
   } = usePurchaseByItemsContext();
 
   // Purchases by items table columns.
@@ -32,7 +32,7 @@ export default function PurchasesByItemsTable({ companyName }) {
     >
       <PurchasesByItemsDataTable
         columns={columns}
-        data={tableRows}
+        data={table.rows}
         expandable={true}
         expandToggleColumn={1}
         expandColumnSpace={1}
@@ -58,7 +58,7 @@ const PurchasesByItemsDataTable = styled(ReportDataTable)`
         padding-top: 0.36rem;
         padding-bottom: 0.36rem;
       }
-      .tr.row_type--total .td {
+      .tr.row_type--TOTAL .td {
         border-top: 1px solid #bbb;
         font-weight: 500;
         border-bottom: 3px double #000;
diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/components.tsx b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/components.tsx
index 24dfd258e6..777ea9526d 100644
--- a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/components.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/components.tsx
@@ -1,69 +1,22 @@
 // @ts-nocheck
-import React from 'react';
-import intl from 'react-intl-universal';
+import { useRef } from 'react';
+import classNames from 'classnames';
+import {
+  Classes,
+  Intent,
+  Menu,
+  MenuItem,
+  ProgressBar,
+  Text,
+} from '@blueprintjs/core';
 
-import { If } from '@/components';
-import { Align } from '@/constants';
-import { CellTextSpan } from '@/components/Datatable/Cells';
+import { AppToaster, If, Stack } from '@/components';
 import { usePurchaseByItemsContext } from './PurchasesByItemsProvider';
-import { getColumnWidth } from '@/utils';
 import FinancialLoadingBar from '../FinancialLoadingBar';
-
-/**
- * Retrieve purchases by items table columns.
- */
-export const usePurchasesByItemsTableColumns = () => {
-  // purchases by items context.
-  const {
-    purchaseByItems: { tableRows },
-  } = usePurchaseByItemsContext();
-
-  return React.useMemo(
-    () => [
-      {
-        Header: intl.get('item_name'),
-        accessor: (row) => (row.code ? `${row.name} - ${row.code}` : row.name),
-        className: 'name',
-        width: 180,
-        textOverview: true,
-      },
-      {
-        Header: intl.get('quantity_purchased'),
-        accessor: 'quantity_purchased_formatted',
-        Cell: CellTextSpan,
-        className: 'quantity_purchased_formatted',
-        width: getColumnWidth(tableRows, `quantity_purchased_formatted`, {
-          minWidth: 150,
-        }),
-        textOverview: true,
-        align: Align.Right,
-      },
-      {
-        Header: intl.get('purchase_amount'),
-        accessor: 'purchase_cost_formatted',
-        Cell: CellTextSpan,
-        className: 'purchase_cost_formatted',
-        width: getColumnWidth(tableRows, `purchase_cost_formatted`, {
-          minWidth: 150,
-        }),
-        textOverview: true,
-        align: Align.Right,
-      },
-      {
-        Header: intl.get('average_price'),
-        accessor: 'average_cost_price_formatted',
-        Cell: CellTextSpan,
-        className: 'average_cost_price_formatted',
-        width: getColumnWidth(tableRows, `average_cost_price_formatted`, {
-          minWidth: 180,
-        }),
-        textOverview: true,
-        align: Align.Right,
-      },
-    ],
-    [tableRows],
-  );
-};
+import {
+  usePurchasesByItemsCsvExport,
+  usePurchasesByItemsXlsxExport,
+} from '@/hooks/query';
 
 /**
  * Purchases by items progress loading bar.
@@ -77,3 +30,88 @@ export function PurchasesByItemsLoadingBar() {
     </If>
   );
 }
+
+/**
+ * Retrieves the purchases by items export menu.
+ * @returns {JSX.Element}
+ */
+export const PurchasesByItemsExportMenu = () => {
+  const toastKey = useRef(null);
+  const commonToastConfig = {
+    isCloseButtonShown: true,
+    timeout: 2000,
+  };
+  const { query } = usePurchaseByItemsContext();
+
+  const openProgressToast = (amount: number) => {
+    return (
+      <Stack spacing={8}>
+        <Text>The report has been exported successfully.</Text>
+        <ProgressBar
+          className={classNames('toast-progress', {
+            [Classes.PROGRESS_NO_STRIPES]: amount >= 100,
+          })}
+          intent={amount < 100 ? Intent.PRIMARY : Intent.SUCCESS}
+          value={amount / 100}
+        />
+      </Stack>
+    );
+  };
+
+  // Export the report to xlsx.
+  const { mutateAsync: xlsxExport } = usePurchasesByItemsXlsxExport(query, {
+    onDownloadProgress: (xlsxExportProgress: number) => {
+      if (!toastKey.current) {
+        toastKey.current = AppToaster.show({
+          message: openProgressToast(xlsxExportProgress),
+          ...commonToastConfig,
+        });
+      } else {
+        AppToaster.show(
+          {
+            message: openProgressToast(xlsxExportProgress),
+            ...commonToastConfig,
+          },
+          toastKey.current,
+        );
+      }
+    },
+  });
+  // Export the report to csv.
+  const { mutateAsync: csvExport } = usePurchasesByItemsCsvExport(query, {
+    onDownloadProgress: (xlsxExportProgress: number) => {
+      if (!toastKey.current) {
+        toastKey.current = AppToaster.show({
+          message: openProgressToast(xlsxExportProgress),
+          ...commonToastConfig,
+        });
+      } else {
+        AppToaster.show(
+          {
+            message: openProgressToast(xlsxExportProgress),
+            ...commonToastConfig,
+          },
+          toastKey.current,
+        );
+      }
+    },
+  });
+  // Handle csv export button click.
+  const handleCsvExportBtnClick = () => {
+    csvExport();
+  };
+  // Handle xlsx export button click.
+  const handleXlsxExportBtnClick = () => {
+    xlsxExport();
+  };
+
+  return (
+    <Menu>
+      <MenuItem
+        text={'XLSX (Microsoft Excel)'}
+        onClick={handleXlsxExportBtnClick}
+      />
+      <MenuItem text={'CSV'} onClick={handleCsvExportBtnClick} />
+    </Menu>
+  );
+};
diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dynamicColumns.ts b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dynamicColumns.ts
new file mode 100644
index 0000000000..48712e5b7c
--- /dev/null
+++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dynamicColumns.ts
@@ -0,0 +1,89 @@
+// @ts-nocheck
+import { getColumnWidth } from '@/utils';
+import * as R from 'ramda';
+import { Align } from '@/constants';
+import { usePurchaseByItemsContext } from './PurchasesByItemsProvider';
+
+const getTableCellValueAccessor = (index) => `cells[${index}].value`;
+
+const getReportColWidth = (data, accessor, headerText) => {
+  return getColumnWidth(
+    data,
+    accessor,
+    { magicSpacing: 10, minWidth: 100 },
+    headerText,
+  );
+};
+
+/**
+ * Account name column mapper.
+ */
+const commonColumnMapper = R.curry((data, column) => {
+  const accessor = getTableCellValueAccessor(column.cell_index);
+
+  return {
+    key: column.key,
+    Header: column.label,
+    accessor,
+    className: column.key,
+    textOverview: true,
+  };
+});
+
+/**
+ * Numeric columns accessor.
+ */
+const numericColumnAccessor = R.curry((data, column) => {
+  const accessor = getTableCellValueAccessor(column.cell_index);
+  const width = getReportColWidth(data, accessor, column.label);
+
+  return {
+    ...column,
+    align: Align.Right,
+    width,
+  };
+});
+
+/**
+ * Item name column accessor.
+ */
+const itemNameColumnAccessor = R.curry((data, column) => {
+  return {
+    ...column,
+    width: 180,
+  };
+});
+
+const dynamiColumnMapper = R.curry((data, column) => {
+  const _numericColumnAccessor = numericColumnAccessor(data);
+  const _itemNameColumnAccessor = itemNameColumnAccessor(data);
+
+  return R.compose(
+    R.when(R.pathEq(['key'], 'item_name'), _itemNameColumnAccessor),
+    R.when(R.pathEq(['key'], 'quantity_purchases'), _numericColumnAccessor),
+    R.when(R.pathEq(['key'], 'purchase_amount'), _numericColumnAccessor),
+    R.when(R.pathEq(['key'], 'average_cost'), _numericColumnAccessor),
+    commonColumnMapper(data),
+  )(column);
+});
+
+/**
+ * Composes the dynamic columns that fetched from request to columns to table component.
+ */
+export const dynamicColumns = R.curry((data, columns) => {
+  return R.map(dynamiColumnMapper(data), columns);
+});
+
+/**
+ * Retrieves the purchases by items sheet table columns for table component.
+ */
+export const usePurchasesByItemsTableColumns = () => {
+  const { purchaseByItems } = usePurchaseByItemsContext();
+
+  if (!purchaseByItems) {
+    throw new Error('Purchases by items context not found');
+  }
+  const { table } = purchaseByItems;
+
+  return dynamicColumns(table.rows, table.columns);
+};
diff --git a/packages/webapp/src/hooks/query/financialReports.tsx b/packages/webapp/src/hooks/query/financialReports.tsx
index d1d59aa249..8821982a16 100644
--- a/packages/webapp/src/hooks/query/financialReports.tsx
+++ b/packages/webapp/src/hooks/query/financialReports.tsx
@@ -426,20 +426,58 @@ export function usePurchasesByItems(query, props) {
       params: query,
     },
     {
-      select: (res) => ({
-        tableRows: purchasesByItemsReducer(res.data.data),
-        ...res.data,
-      }),
-      defaultData: {
-        tableRows: [],
-        data: [],
-        query: {},
+      select: (res) => res.data,
+      ...props,
+    },
+  );
+}
+
+export function usePurchasesByItemsTable(query, props) {
+  return useRequestQuery(
+    [t.FINANCIAL_REPORT, t.PURCHASES_BY_ITEMS, query],
+    {
+      method: 'get',
+      url: '/financial_statements/purchases-by-items',
+      params: query,
+      headers: {
+        accept: 'application/json+table',
       },
+    },
+    {
+      select: (res) => res.data,
       ...props,
     },
   );
 }
 
+export const usePurchasesByItemsCsvExport = (query, args) => {
+  return useDownloadFile({
+    url: '/financial_statements/purchases-by-items',
+    config: {
+      headers: {
+        accept: 'application/csv',
+      },
+      params: query,
+    },
+    filename: 'purchases_by_items.csv',
+    ...args,
+  });
+};
+
+export const usePurchasesByItemsXlsxExport = (query, args) => {
+  return useDownloadFile({
+    url: '/financial_statements/purchases-by-items',
+    config: {
+      headers: {
+        accept: 'application/xlsx',
+      },
+      params: query,
+    },
+    filename: 'purchases_by_items.xlsx',
+    ...args,
+  });
+};
+
 /**
  * Retrieve sales by items.
  */

From b4712acc21753121911e7d6d2d3a4ea68513c0df Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Tue, 23 Jan 2024 12:20:14 +0200
Subject: [PATCH 5/6] feat: tweak the columns label of purchases by items table

---
 .../PurchasesByItems/PurchasesByItemsTable.ts                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts
index 23480de461..a7b6ee7352 100644
--- a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.ts
@@ -46,9 +46,9 @@ export class PurchasesByItemsTable extends R.compose(
   private commonTableColumns(): ITableColumn[] {
     return [
       { label: 'Item name', key: 'item_name' },
-      { label: 'Quantity Purchases', key: 'quantity_purchases' },
+      { label: 'Quantity Purchased', key: 'quantity_purchases' },
       { label: 'Purchase Amount', key: 'purchase_amount' },
-      { label: 'Average Cost', key: 'average_cost' },
+      { label: 'Average Price', key: 'average_cost' },
     ];
   }
 

From 05057a2a911bb0477350fdae357cf7d0b7a96859 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Tue, 23 Jan 2024 12:31:31 +0200
Subject: [PATCH 6/6] fix TS types

---
 .../src/interfaces/PurchasesByItemsSheet.ts   |  2 +-
 .../PurchasesByItems/PurchasesByItems.ts      | 34 +++++++++----------
 .../PurchasesByItemsApplication.ts            |  6 +++-
 .../PurchasesByItemsExport.ts                 | 13 ++++---
 .../PurchasesByItemsService.ts                | 32 ++++++++---------
 5 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/packages/server/src/interfaces/PurchasesByItemsSheet.ts b/packages/server/src/interfaces/PurchasesByItemsSheet.ts
index 33c24d309a..f08fb97afc 100644
--- a/packages/server/src/interfaces/PurchasesByItemsSheet.ts
+++ b/packages/server/src/interfaces/PurchasesByItemsSheet.ts
@@ -42,7 +42,7 @@ export type IPurchasesByItemsSheetData = {
   total: IPurchasesByItemsTotal;
 };
 
-export interface ISalesByItemsSheet {
+export interface IPurchasesByItemsSheet {
   data: IPurchasesByItemsSheetData;
   query: IPurchasesByItemsReportQuery;
   meta: IPurchasesByItemsSheetMeta;
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItems.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItems.ts
index 32904ef221..b679334c6e 100644
--- a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItems.ts
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItems.ts
@@ -2,36 +2,34 @@ import { get, isEmpty, sumBy } from 'lodash';
 import * as R from 'ramda';
 import FinancialSheet from '../FinancialSheet';
 import { allPassedConditionsPass, transformToMap } from 'utils';
+import { IAccountTransaction, IItem } from '@/interfaces';
 import {
-  IAccountTransaction,
-  IInventoryValuationTotal,
-  IInventoryValuationItem,
-  IInventoryValuationReportQuery,
-  IInventoryValuationStatement,
-  IItem,
-} from '@/interfaces';
+  IPurchasesByItemsItem,
+  IPurchasesByItemsReportQuery,
+  IPurchasesByItemsSheetData,
+  IPurchasesByItemsTotal,
+} from '@/interfaces/PurchasesByItemsSheet';
 
 export class PurchasesByItems extends FinancialSheet {
   readonly baseCurrency: string;
   readonly items: IItem[];
   readonly itemsTransactions: Map<number, IAccountTransaction>;
-  readonly query: IInventoryValuationReportQuery;
+  readonly query: IPurchasesByItemsReportQuery;
 
   /**
    * Constructor method.
-   * @param {IInventoryValuationReportQuery} query
+   * @param {IPurchasesByItemsReportQuery} query
    * @param {IItem[]} items
    * @param {IAccountTransaction[]} itemsTransactions
    * @param {string} baseCurrency
    */
   constructor(
-    query: IInventoryValuationReportQuery,
+    query: IPurchasesByItemsReportQuery,
     items: IItem[],
     itemsTransactions: IAccountTransaction[],
     baseCurrency: string
   ) {
     super();
-
     this.baseCurrency = baseCurrency;
     this.items = items;
     this.itemsTransactions = transformToMap(itemsTransactions, 'itemId');
@@ -98,7 +96,7 @@ export class PurchasesByItems extends FinancialSheet {
    * @param {IInventoryValuationItem} item
    * @returns
    */
-  private itemSectionMapper = (item: IItem): IInventoryValuationItem => {
+  private itemSectionMapper = (item: IItem): IPurchasesByItemsItem => {
     const meta = this.getItemTransaction(item.id);
 
     return {
@@ -145,9 +143,9 @@ export class PurchasesByItems extends FinancialSheet {
 
   /**
    * Retrieve the items sections.
-   * @returns {IInventoryValuationItem[]}
+   * @returns {IPurchasesByItemsItem[]}
    */
-  private itemsSection = (): IInventoryValuationItem[] => {
+  private itemsSection = (): IPurchasesByItemsItem[] => {
     return R.compose(
       R.when(this.isItemsPostFilter, this.itemsFilter),
       this.itemsMapper
@@ -156,10 +154,10 @@ export class PurchasesByItems extends FinancialSheet {
 
   /**
    * Retrieve the total section of the sheet.
-   * @param {IInventoryValuationItem[]} items
-   * @returns {IInventoryValuationTotal}
+   * @param {IPurchasesByItemsItem[]} items
+   * @returns {IPurchasesByItemsTotal}
    */
-  private totalSection(items: IInventoryValuationItem[]): IInventoryValuationTotal {
+  private totalSection(items: IPurchasesByItemsItem[]): IPurchasesByItemsTotal {
     const quantityPurchased = sumBy(items, (item) => item.quantityPurchased);
     const purchaseCost = sumBy(items, (item) => item.purchaseCost);
 
@@ -178,7 +176,7 @@ export class PurchasesByItems extends FinancialSheet {
    * Retrieve the sheet data.
    * @returns {IInventoryValuationStatement}
    */
-  public reportData(): IInventoryValuationStatement {
+  public reportData(): IPurchasesByItemsSheetData {
     const items = this.itemsSection();
     const total = this.totalSection(items);
 
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts
index e6086262a6..c9a94bdbc8 100644
--- a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication.ts
@@ -2,6 +2,7 @@ import { Service, Inject } from 'typedi';
 import { PurchasesByItemsExport } from './PurchasesByItemsExport';
 import {
   IPurchasesByItemsReportQuery,
+  IPurchasesByItemsSheet,
   IPurchasesByItemsTable,
 } from '@/interfaces/PurchasesByItemsSheet';
 import { PurchasesByItemsTableInjectable } from './PurchasesByItemsTableInjectable';
@@ -24,7 +25,10 @@ export class PurcahsesByItemsApplication {
    * @param {IPurchasesByItemsReportQuery} query
    * @returns
    */
-  public sheet(tenantId: number, query: any) {
+  public sheet(
+    tenantId: number,
+    query: IPurchasesByItemsReportQuery
+  ): Promise<IPurchasesByItemsSheet> {
     return this.purchasesByItemsSheet.purchasesByItems(tenantId, query);
   }
 
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsExport.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsExport.ts
index 2a96ac1e2c..96ed4daf7f 100644
--- a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsExport.ts
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsExport.ts
@@ -1,7 +1,7 @@
 import { Inject, Service } from 'typedi';
 import { TableSheet } from '@/lib/Xlsx/TableSheet';
-import { ISalesByItemsReportQuery } from '@/interfaces';
 import { PurchasesByItemsTableInjectable } from './PurchasesByItemsTableInjectable';
+import { IPurchasesByItemsReportQuery } from '@/interfaces/PurchasesByItemsSheet';
 
 @Service()
 export class PurchasesByItemsExport {
@@ -11,10 +11,13 @@ export class PurchasesByItemsExport {
   /**
    * Retrieves the purchases by items sheet in XLSX format.
    * @param {number} tenantId
-   * @param {ISalesByItemsReportQuery} query
+   * @param {IPurchasesByItemsReportQuery} query
    * @returns {Promise<Buffer>}
    */
-  public async xlsx(tenantId: number, query: ISalesByItemsReportQuery) {
+  public async xlsx(
+    tenantId: number,
+    query: IPurchasesByItemsReportQuery
+  ): Promise<Buffer> {
     const table = await this.purchasesByItemsTable.table(tenantId, query);
 
     const tableSheet = new TableSheet(table.table);
@@ -26,12 +29,12 @@ export class PurchasesByItemsExport {
   /**
    * Retrieves the purchases by items sheet in CSV format.
    * @param {number} tenantId
-   * @param {ISalesByItemsReportQuery} query
+   * @param {IPurchasesByItemsReportQuery} query
    * @returns {Promise<Buffer>}
    */
   public async csv(
     tenantId: number,
-    query: ISalesByItemsReportQuery
+    query: IPurchasesByItemsReportQuery
   ): Promise<string> {
     const table = await this.purchasesByItemsTable.table(tenantId, query);
 
diff --git a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts
index 31f11afa7e..b9455be398 100644
--- a/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts
+++ b/packages/server/src/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService.ts
@@ -1,13 +1,13 @@
-import { Service, Inject } from 'typedi';
 import moment from 'moment';
-import {
-  IInventoryValuationReportQuery,
-  IInventoryValuationStatement,
-  IInventoryValuationSheetMeta,
-} from '@/interfaces';
+import { Service, Inject } from 'typedi';
 import TenancyService from '@/services/Tenancy/TenancyService';
 import { PurchasesByItems } from './PurchasesByItems';
 import { Tenant } from '@/system/models';
+import {
+  IPurchasesByItemsReportQuery,
+  IPurchasesByItemsSheet,
+  IPurchasesByItemsSheetMeta,
+} from '@/interfaces/PurchasesByItemsSheet';
 
 @Service()
 export class PurchasesByItemsService {
@@ -15,10 +15,10 @@ export class PurchasesByItemsService {
   private tenancy: TenancyService;
 
   /**
-   * Defaults balance sheet filter query.
-   * @return {IBalanceSheetQuery}
+   * Defaults purchases by items filter query.
+   * @return {IPurchasesByItemsReportQuery}
    */
-  get defaultQuery(): IInventoryValuationReportQuery {
+  get defaultQuery(): IPurchasesByItemsReportQuery {
     return {
       fromDate: moment().startOf('month').format('YYYY-MM-DD'),
       toDate: moment().format('YYYY-MM-DD'),
@@ -40,7 +40,7 @@ export class PurchasesByItemsService {
    * @param {number} tenantId -
    * @returns {IBalanceSheetMeta}
    */
-  reportMetadata(tenantId: number): IInventoryValuationSheetMeta {
+  reportMetadata(tenantId: number): IPurchasesByItemsSheetMeta {
     const settings = this.tenancy.settings(tenantId);
 
     const organizationName = settings.get({
@@ -62,17 +62,13 @@ export class PurchasesByItemsService {
    * Retrieve balance sheet statement.
    * -------------
    * @param {number} tenantId
-   * @param {IBalanceSheetQuery} query
-   * @return {IBalanceSheetStatement}
+   * @param {IPurchasesByItemsReportQuery} query
+   * @return {Promise<IPurchasesByItemsSheet>}
    */
   public async purchasesByItems(
     tenantId: number,
-    query: IInventoryValuationReportQuery
-  ): Promise<{
-    data: IInventoryValuationStatement;
-    query: IInventoryValuationReportQuery;
-    meta: IInventoryValuationSheetMeta;
-  }> {
+    query: IPurchasesByItemsReportQuery
+  ): Promise<IPurchasesByItemsSheet> {
     const { Item, InventoryTransaction } = this.tenancy.models(tenantId);
 
     const tenant = await Tenant.query()