From 1b4b65641972b8cc1f58f56dc9d1da5ab5124304 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Mon, 18 Sep 2023 18:57:54 +0200
Subject: [PATCH] feat(server): order tax rates by name

---
 packages/server/src/models/TaxRate.ts                | 2 +-
 packages/server/src/services/TaxRates/EditTaxRate.ts | 4 +++-
 packages/server/src/services/TaxRates/GetTaxRates.ts | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/models/TaxRate.ts b/packages/server/src/models/TaxRate.ts
index 74df20e56..e294b897a 100644
--- a/packages/server/src/models/TaxRate.ts
+++ b/packages/server/src/models/TaxRate.ts
@@ -22,7 +22,7 @@ export default class TaxRate extends mixin(TenantModel, [ModelSearchable]) {
    * Timestamps columns.
    */
   get timestamps() {
-    return ['created_at', 'updated_at'];
+    return ['createdAt', 'updatedAt'];
   }
 
   /**
diff --git a/packages/server/src/services/TaxRates/EditTaxRate.ts b/packages/server/src/services/TaxRates/EditTaxRate.ts
index fc308a5c0..c2d0e5c1a 100644
--- a/packages/server/src/services/TaxRates/EditTaxRate.ts
+++ b/packages/server/src/services/TaxRates/EditTaxRate.ts
@@ -1,5 +1,6 @@
 import { Knex } from 'knex';
 import { Inject, Service } from 'typedi';
+import { omit } from 'lodash';
 import {
   IEditTaxRateDTO,
   ITaxRate,
@@ -54,7 +55,7 @@ export class EditTaxRateService {
   private async editTaxRateOrCreate(
     tenantId: number,
     oldTaxRate: ITaxRate,
-    editTaxRateDTO: any,
+    editTaxRateDTO: IEditTaxRateDTO,
     trx?: Knex.Transaction
   ) {
     const { TaxRate } = this.tenancy.models(tenantId);
@@ -68,6 +69,7 @@ export class EditTaxRateService {
 
       // Create a new tax rate with new edited data.
       return TaxRate.query(trx).insertAndFetch({
+        ...omit(oldTaxRate, ['id']),
         ...editTaxRateDTO,
       });
     } else {
diff --git a/packages/server/src/services/TaxRates/GetTaxRates.ts b/packages/server/src/services/TaxRates/GetTaxRates.ts
index c97b41340..8fedb1c2d 100644
--- a/packages/server/src/services/TaxRates/GetTaxRates.ts
+++ b/packages/server/src/services/TaxRates/GetTaxRates.ts
@@ -19,7 +19,8 @@ export class GetTaxRatesService {
   public async getTaxRates(tenantId: number) {
     const { TaxRate } = this.tenancy.models(tenantId);
 
-    const taxRates = await TaxRate.query();
+    // Retrieves the tax rates.
+    const taxRates = await TaxRate.query().orderBy('name', 'ASC');
 
     // Transforms the tax rates.
     return this.transformer.transform(