fix: delete sale invoice issue.

server/src/api/controllers/Contacts/Customers.ts

@@ -201,27 +201,6 @@ export default class CustomersController extends ContactsController {
     }
   }
 
-  /**
-   * Deletes the given customer from the storage.
-   * @param {Request} req 
-   * @param {Response} res 
-   * @param {NextFunction} next 
-   */
-  async deleteCustomer(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const { id: contactId } = req.params;
-
-    try {
-      await this.customersService.deleteCustomer(tenantId, contactId)
-      return res.status(200).send({
-        id: contactId,
-        message: 'The customer has been deleted successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
   /**
    * Retrieve details of the given customer id.
    * @param {Request} req 
@@ -243,6 +222,28 @@ export default class CustomersController extends ContactsController {
     }
   }
 
+  /**
+   * Deletes the given customer from the storage.
+   * @param {Request} req 
+   * @param {Response} res 
+   * @param {NextFunction} next 
+   */
+  async deleteCustomer(req: Request, res: Response, next: NextFunction) {
+    const { tenantId } = req;
+    const { id: contactId } = req.params;
+
+    try {
+      await this.customersService.deleteCustomer(tenantId, contactId);
+
+      return res.status(200).send({
+        id: contactId,
+        message: 'The customer has been deleted successfully.',
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
   /**
    * Deletes customers in bulk.
    * @param {Request} req 

server/src/services/Contacts/CustomersService.ts

@@ -4,8 +4,8 @@ import {
   EventDispatcher,
   EventDispatcherInterface,
 } from 'decorators/eventDispatcher';
-import JournalPoster from "services/Accounting/JournalPoster";
+import JournalPoster from 'services/Accounting/JournalPoster';
-import JournalCommands from "services/Accounting/JournalCommands";
+import JournalCommands from 'services/Accounting/JournalCommands';
 import ContactsService from 'services/Contacts/ContactsService';
 import {
   ICustomerNewDTO,
@@ -17,7 +17,7 @@ import {
   IContactEditDTO,
   IContact,
   ISaleInvoice,
- } from 'interfaces';
+} from 'interfaces';
 import { ServiceError } from 'exceptions';
 import TenancyService from 'services/Tenancy/TenancyService';
 import DynamicListingService from 'services/DynamicListing/DynamicListService';
@@ -47,7 +47,7 @@ export default class CustomersService {
    * @returns {IContactDTO}
    */
   private customerToContactDTO(
-    customerDTO: ICustomerNewDTO | ICustomerEditDTO,
+    customerDTO: ICustomerNewDTO | ICustomerEditDTO
   ): IContactNewDTO | IContactEditDTO {
     return {
       ...omit(customerDTO, ['customerType']),
@@ -60,12 +60,15 @@ export default class CustomersService {
    * Transforms new customer DTO to contact.
    * @param customerDTO
    */
-  private transformNewCustomerDTO(customerDTO: ICustomerNewDTO): IContactNewDTO {
+  private transformNewCustomerDTO(
+    customerDTO: ICustomerNewDTO
+  ): IContactNewDTO {
     return {
       ...this.customerToContactDTO(customerDTO),
       openingBalanceAt: customerDTO?.openingBalanceAt
-        ? moment(customerDTO.openingBalanceAt).toMySqlDateTime() : null,
+        ? moment(customerDTO.openingBalanceAt).toMySqlDateTime()
-    }
+        : null,
+    };
   }
 
   private transformContactToCustomer(contactModel: IContact) {
@@ -85,14 +88,26 @@ export default class CustomersService {
     tenantId: number,
     customerDTO: ICustomerNewDTO
   ): Promise<ICustomer> {
-    this.logger.info('[customer] trying to create a new customer.', { tenantId, customerDTO });
+    this.logger.info('[customer] trying to create a new customer.', {
+      tenantId,
+      customerDTO,
+    });
 
     const customerObj = this.transformNewCustomerDTO(customerDTO);
-    const customer = await this.contactService.newContact(tenantId, customerObj, 'customer');
+    const customer = await this.contactService.newContact(
+      tenantId,
+      customerObj,
+      'customer'
+    );
 
-    this.logger.info('[customer] created successfully.', { tenantId, customerDTO });
+    this.logger.info('[customer] created successfully.', {
+      tenantId,
+      customerDTO,
+    });
     await this.eventDispatcher.dispatch(events.customers.onCreated, {
-      customer, tenantId, customerId: customer.id,
+      customer,
+      tenantId,
+      customerId: customer.id,
     });
 
     return customer;
@@ -108,16 +123,27 @@ export default class CustomersService {
   public async editCustomer(
     tenantId: number,
     customerId: number,
-    customerDTO: ICustomerEditDTO,
+    customerDTO: ICustomerEditDTO
   ): Promise<ICustomer> {
     const contactDTO = this.customerToContactDTO(customerDTO);
 
-    this.logger.info('[customer] trying to edit customer.', { tenantId, customerId, customerDTO });
+    this.logger.info('[customer] trying to edit customer.', {
-    const customer = this.contactService.editContact(tenantId, customerId, contactDTO, 'customer');
+      tenantId,
+      customerId,
+      customerDTO,
+    });
+    const customer = this.contactService.editContact(
+      tenantId,
+      customerId,
+      contactDTO,
+      'customer'
+    );
 
     this.eventDispatcher.dispatch(events.customers.onEdited);
     this.logger.info('[customer] edited successfully.', {
-      tenantId, customerId, customer,
+      tenantId,
+      customerId,
+      customer,
     });
 
     return customer;
@@ -129,16 +155,31 @@ export default class CustomersService {
    * @param {number} customerId
    * @return {Promise<void>}
    */
-  public async deleteCustomer(tenantId: number, customerId: number): Promise<void> {
+  public async deleteCustomer(
-    this.logger.info('[customer] trying to delete customer.', { tenantId, customerId });
+    tenantId: number,
+    customerId: number
+  ): Promise<void> {
+    this.logger.info('[customer] trying to delete customer.', {
+      tenantId,
+      customerId,
+    });
 
+    // Retrieve the customer of throw not found service error.
     await this.getCustomerByIdOrThrowError(tenantId, customerId);
+
+    // Validate whether the customer has no assocaited invoices tranasctions.
     await this.customerHasNoInvoicesOrThrowError(tenantId, customerId);
 
     await this.contactService.deleteContact(tenantId, customerId, 'customer');
 
-    await this.eventDispatcher.dispatch(events.customers.onDeleted, { tenantId, customerId });
+    await this.eventDispatcher.dispatch(events.customers.onDeleted, {
-    this.logger.info('[customer] deleted successfully.', { tenantId, customerId });
+      tenantId,
+      customerId,
+    });
+    this.logger.info('[customer] deleted successfully.', {
+      tenantId,
+      customerId,
+    });
   }
 
   /**
@@ -147,12 +188,20 @@ export default class CustomersService {
    * @param {number} customerId -
    * @return {Promise<void>}
    */
-  public async revertOpeningBalanceEntries(tenantId: number, customerId: number|number[]) {
+  public async revertOpeningBalanceEntries(
+    tenantId: number,
+    customerId: number | number[]
+  ) {
     const id = Array.isArray(customerId) ? customerId : [customerId];
 
-    this.logger.info('[customer] trying to revert opening balance journal entries.', { tenantId, customerId });
+    this.logger.info(
+      '[customer] trying to revert opening balance journal entries.',
+      { tenantId, customerId }
+    );
     await this.contactService.revertJEntriesContactsOpeningBalance(
-      tenantId, id, 'customer',
+      tenantId,
+      id,
+      'customer'
     );
   }
 
@@ -162,7 +211,11 @@ export default class CustomersService {
    * @param {number} customerId
    */
   public async getCustomer(tenantId: number, customerId: number) {
-    const contact = await this.contactService.getContact(tenantId, customerId, 'customer');
+    const contact = await this.contactService.getContact(
+      tenantId,
+      customerId,
+      'customer'
+    );
     return this.transformContactToCustomer(contact);
   }
 
@@ -175,20 +228,23 @@ export default class CustomersService {
     tenantId: number,
     customersFilter: ICustomersFilter
   ): Promise<{
-    customers: ICustomer[],
+    customers: ICustomer[];
-    pagination: IPaginationMeta,
+    pagination: IPaginationMeta;
-    filterMeta: IFilterMeta,
+    filterMeta: IFilterMeta;
   }> {
     const { Customer } = this.tenancy.models(tenantId);
-    const dynamicList = await this.dynamicListService.dynamicList(tenantId, Customer, customersFilter);
+    const dynamicList = await this.dynamicListService.dynamicList(
-
+      tenantId,
-    const { results, pagination } = await Customer.query().onBuild((query) => {
+      Customer,
-      dynamicList.buildQuery()(query);
+      customersFilter
-    }).pagination(
-      customersFilter.page - 1,
-      customersFilter.pageSize,
     );
 
+    const { results, pagination } = await Customer.query()
+      .onBuild((query) => {
+        dynamicList.buildQuery()(query);
+      })
+      .pagination(customersFilter.page - 1, customersFilter.pageSize);
+
     return {
       customers: results.map(this.transformContactToCustomer),
       pagination,
@@ -206,17 +262,14 @@ export default class CustomersService {
   public async writeCustomerOpeningBalanceJournal(
     tenantId: number,
     customerId: number,
-    openingBalance: number,
+    openingBalance: number
   ) {
     const journal = new JournalPoster(tenantId);
     const journalCommands = new JournalCommands(journal);
 
-    await journalCommands.customerOpeningBalance(customerId, openingBalance)
+    await journalCommands.customerOpeningBalance(customerId, openingBalance);
 
-    await Promise.all([
+    await Promise.all([journal.saveBalance(), journal.saveEntries()]);
-      journal.saveBalance(),
-      journal.saveEntries(),
-    ]);
   }
 
   /**
@@ -225,7 +278,11 @@ export default class CustomersService {
    * @param {number} customerId
    */
   public getCustomerByIdOrThrowError(tenantId: number, customerId: number) {
-    return this.contactService.getContactByIdOrThrowError(tenantId, customerId, 'customer');
+    return this.contactService.getContactByIdOrThrowError(
+      tenantId,
+      customerId,
+      'customer'
+    );
   }
 
   /**
@@ -233,8 +290,15 @@ export default class CustomersService {
    * @param {numebr} tenantId
    * @param {number[]} customersIds
    */
-  private getCustomersOrThrowErrorNotFound(tenantId: number, customersIds: number[]) {
+  private getCustomersOrThrowErrorNotFound(
-    return this.contactService.getContactsOrThrowErrorNotFound(tenantId, customersIds, 'customer');
+    tenantId: number,
+    customersIds: number[]
+  ) {
+    return this.contactService.getContactsOrThrowErrorNotFound(
+      tenantId,
+      customersIds,
+      'customer'
+    );
   }
 
   /**
@@ -261,11 +325,16 @@ export default class CustomersService {
    * @throws {ServiceError}
    * @return {Promise<void>}
    */
-  private async customerHasNoInvoicesOrThrowError(tenantId: number, customerId: number) {
+  private async customerHasNoInvoicesOrThrowError(
+    tenantId: number,
+    customerId: number
+  ) {
     const { saleInvoiceRepository } = this.tenancy.repositories(tenantId);
 
     // Retrieve the sales invoices that assocaited to the given customer.
-    const salesInvoice = await saleInvoiceRepository.find({ customer_id: customerId });
+    const salesInvoice = await saleInvoiceRepository.find({
+      customer_id: customerId,
+    });
 
     if (salesInvoice.length > 0) {
       throw new ServiceError('customer_has_invoices');
@@ -279,16 +348,24 @@ export default class CustomersService {
    * @throws {ServiceError}
    * @return {Promise<void>}
    */
-  private async customersHaveNoInvoicesOrThrowError(tenantId: number, customersIds: number[]) {
+  private async customersHaveNoInvoicesOrThrowError(
+    tenantId: number,
+    customersIds: number[]
+  ) {
     const { saleInvoiceRepository } = this.tenancy.repositories(tenantId);
 
     const customersInvoices = await saleInvoiceRepository.findWhereIn(
-      'customer_id', customersIds
+      'customer_id',
+      customersIds
+    );
+    const customersIdsWithInvoice = customersInvoices.map(
+      (saleInvoice: ISaleInvoice) => saleInvoice.customerId
     );
-    const customersIdsWithInvoice = customersInvoices
-      .map((saleInvoice: ISaleInvoice) => saleInvoice.customerId);
 
-    const customersHaveInvoices = difference(customersIds, customersIdsWithInvoice);
+    const customersHaveInvoices = difference(
+      customersIds,
+      customersIdsWithInvoice
+    );
 
     if (customersHaveInvoices.length > 0) {
       throw new ServiceError('some_customers_have_invoices');
@@ -306,19 +383,24 @@ export default class CustomersService {
     tenantId: number,
     customerId: number,
     openingBalance: number,
-    openingBalanceAt: Date|string,
+    openingBalanceAt: Date | string
   ) {
-
     await this.contactService.changeOpeningBalance(
       tenantId,
       customerId,
       'customer',
       openingBalance,
-      openingBalanceAt,
+      openingBalanceAt
     );
     // Triggers `onOpeingBalanceChanged` event.
-    await this.eventDispatcher.dispatch(events.customers.onOpeningBalanceChanged, {
+    await this.eventDispatcher.dispatch(
-      tenantId, customerId, openingBalance, openingBalanceAt
+      events.customers.onOpeningBalanceChanged,
-    });
+      {
+        tenantId,
+        customerId,
+        openingBalance,
+        openingBalanceAt,
+      }
+    );
   }
 }

server/src/services/Sales/SalesInvoices.ts

@@ -24,7 +24,6 @@ import ItemsService from 'services/Items/ItemsService';
 import ItemsEntriesService from 'services/Items/ItemsEntriesService';
 import CustomersService from 'services/Contacts/CustomersService';
 import SaleEstimateService from 'services/Sales/SalesEstimate';
-import { PaymentReceiveEntry } from 'models';
 
 const ERRORS = {
   INVOICE_NUMBER_NOT_UNIQUE: 'INVOICE_NUMBER_NOT_UNIQUE',
@@ -33,7 +32,8 @@ const ERRORS = {
   ENTRIES_ITEMS_IDS_NOT_EXISTS: 'ENTRIES_ITEMS_IDS_NOT_EXISTS',
   NOT_SELLABLE_ITEMS: 'NOT_SELLABLE_ITEMS',
   SALE_INVOICE_NO_NOT_UNIQUE: 'SALE_INVOICE_NO_NOT_UNIQUE',
-  INVOICE_HAS_ASSOCIATED_PAYMENT_ENTRIES: 'INVOICE_HAS_ASSOCIATED_PAYMENT_ENTRIES',
+  INVOICE_HAS_ASSOCIATED_PAYMENT_ENTRIES:
+    'INVOICE_HAS_ASSOCIATED_PAYMENT_ENTRIES',
 };
 
 /**
@@ -107,11 +107,12 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
    * @param {Function} next
    */
   async getInvoiceOrThrowError(tenantId: number, saleInvoiceId: number) {
-    const { SaleInvoice } = this.tenancy.models(tenantId);
+    const { saleInvoiceRepository } = this.tenancy.repositories(tenantId);
-    const saleInvoice = await SaleInvoice.query()
-      .findById(saleInvoiceId)
-      .withGraphFetched('entries');
 
+    const saleInvoice = await saleInvoiceRepository.findOneById(
+      saleInvoiceId,
+      'entries'
+    );
     if (!saleInvoice) {
       throw new ServiceError(ERRORS.SALE_INVOICE_NOT_FOUND);
     }
@@ -223,7 +224,7 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
     saleInvoiceId: number,
     saleInvoiceDTO: any
   ): Promise<ISaleInvoice> {
-    const { SaleInvoice, ItemEntry } = this.tenancy.models(tenantId);
+    const { SaleInvoice } = this.tenancy.models(tenantId);
 
     const oldSaleInvoice = await this.getInvoiceOrThrowError(
       tenantId,
@@ -328,7 +329,7 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
     // Retrieve the sale invoice associated payment receive entries.
     const entries = await PaymentReceiveEntry.query().where(
       'invoice_id',
-      saleInvoiceId,
+      saleInvoiceId
     );
     if (entries.length > 0) {
       throw new ServiceError(ERRORS.INVOICE_HAS_ASSOCIATED_PAYMENT_ENTRIES);
@@ -346,7 +347,8 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
     tenantId: number,
     saleInvoiceId: number
   ): Promise<void> {
-    const { SaleInvoice, ItemEntry } = this.tenancy.models(tenantId);
+    const { ItemEntry } = this.tenancy.models(tenantId);
+    const { saleInvoiceRepository } = this.tenancy.repositories(tenantId);
 
     // Retrieve the given sale invoice with associated entries or throw not found error.
     const oldSaleInvoice = await this.getInvoiceOrThrowError(
@@ -369,7 +371,8 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
     );
 
     this.logger.info('[sale_invoice] delete sale invoice with entries.');
-    await SaleInvoice.query().where('id', saleInvoiceId).delete();
+    await saleInvoiceRepository.deleteById(saleInvoiceId);
+
     await ItemEntry.query()
       .where('reference_id', saleInvoiceId)
       .where('reference_type', 'SaleInvoice')
@@ -453,7 +456,7 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
     saleInvoiceId: number,
     override: boolean = false
   ): Promise<void> {
-    const { SaleInvoice } = this.tenancy.models(tenantId);
+    const { saleInvoiceRepository } = this.tenancy.repositories(tenantId);
 
     // Loads the inventory items entries of the given sale invoice.
     const inventoryEntries = await this.itemsEntriesService.getInventoryEntries(
@@ -464,9 +467,10 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
     // Can't continue if the sale invoice has inventory items entries.
     if (inventoryEntries.length > 0) return;
 
-    const saleInvoice = await SaleInvoice.query()
+    const saleInvoice = await saleInvoiceRepository.findOneById(
-      .findById(saleInvoiceId)
+      saleInvoiceId,
-      .withGraphFetched('entries.item');
+      'entries.item'
+    );
 
     await this.writeNonInventoryInvoiceEntries(tenantId, saleInvoice, override);
   }