clean up fyle_category

src/app/core/models/public-policy-expense.model.ts

@@ -1,4 +1,5 @@
 import { Destination } from './destination.model';
+import { PlatformCategory } from './platform/platform-category.model';
 import { File } from './platform/v1/file.model';
 
 export interface PublicPolicyExpense {
@@ -8,7 +9,7 @@ export interface PublicPolicyExpense {
   amount: number;
   billable: boolean;
   bus_travel_class: string;
-  category: string;
+  category: Pick<PlatformCategory, 'code' | 'id' | 'display_name' | 'name' | 'sub_category' | 'system_category'>;
   cost_center_id: number;
   created_at: Date;
   creator_id: string;
@@ -33,7 +34,6 @@ export interface PublicPolicyExpense {
   flight_journey_travel_class: string;
   flight_return_travel_class: string;
   from_dt: Date;
-  fyle_category: string;
   hotel_is_breakfast_provided: boolean;
   id: string;
   is_matching_ccc_expense: boolean;

src/app/core/models/v1/transaction.model.ts

@@ -37,7 +37,6 @@ export interface Transaction {
   flight_journey_travel_class?: string;
   flight_return_travel_class?: string;
   from_dt?: Date;
-  fyle_category?: string;
   hotel_is_breakfast_provided?: boolean;
   id?: string;
   invoice_number?: number;

src/app/core/services/custom-inputs.service.spec.ts

@@ -271,16 +271,6 @@ describe('CustomInputsService', () => {
     expect(result).toEqual(expectedProperty);
   });
 
-  it('should fill dependent field properties', (done) => {
-    authService.getEou.and.resolveTo(authRespone);
-    spenderPlatformV1ApiService.get.and.returnValue(of(platformApiResponse));
-    const result = customInputsService.fillDependantFieldProperties(expensesWithDependentFields[0]);
-    result.subscribe((res) => {
-      expect(res).toEqual(filledDependentFields);
-      done();
-    });
-  });
-
   it('should fill custom properties', (done) => {
     authService.getEou.and.resolveTo(authRespone);
     spenderPlatformV1ApiService.get.and.returnValue(of(platformApiResponse));

src/app/core/services/custom-inputs.service.ts

@@ -6,7 +6,6 @@ import { from, Observable, Subject } from 'rxjs';
 import { AuthService } from './auth.service';
 import { ExpenseField } from '../models/v1/expense-field.model';
 import { CustomField } from '../models/custom_field.model';
-import { Expense } from '../models/expense.model';
 import { SpenderPlatformV1ApiService } from './spender-platform-v1-api.service';
 import { PlatformApiResponse } from '../models/platform/platform-api-response.model';
 import { PlatformExpenseField } from '../models/platform/platform-expense-field.model';
@@ -181,27 +180,6 @@ export class CustomInputsService {
     return displayValue;
   }
 
-  fillDependantFieldProperties(etxn: Expense): Observable<CustomField[]> {
-    return this.getAll(true).pipe(
-      map((allCustomInputs) => allCustomInputs.filter((customInput) => customInput.type === 'DEPENDENT_SELECT')),
-      map((allCustomInputs) =>
-        allCustomInputs.map((customInput) => {
-          const customProperty = etxn.tx_custom_properties.find(
-            (txCustomProperty) => txCustomProperty.name === customInput.field_name,
-          );
-          return {
-            id: customInput.id,
-            name: customInput.field_name,
-            value: customProperty?.value,
-            type: customInput.type,
-            displayValue: customProperty?.value || '-',
-            mandatory: customInput.is_mandatory,
-          };
-        }),
-      ),
-    );
-  }
-
   private formatBooleanCustomProperty(customProperty: CustomField): string {
     return customProperty.value
       ? this.translocoService.translate('services.customInputs.yes')

src/app/core/services/platform/v1/spender/expenses.service.ts

@@ -354,18 +354,18 @@ export class ExpensesService {
     };
 
     if (
-      transaction.fyle_category?.toLowerCase() === 'flight' ||
-      transaction.fyle_category?.toLowerCase() === 'airlines'
+      transaction.category?.system_category.toLowerCase() === 'flight' ||
+      transaction.category?.system_category.toLowerCase() === 'airlines'
     ) {
       if (transaction.flight_journey_travel_class) {
         expense.travel_classes.push(transaction.flight_journey_travel_class);
       }
       if (transaction.flight_return_travel_class) {
         expense.travel_classes.push(transaction.flight_return_travel_class);
       }
-    } else if (transaction.fyle_category?.toLowerCase() === 'bus' && transaction.bus_travel_class) {
+    } else if (transaction.category?.system_category.toLowerCase() === 'bus' && transaction.bus_travel_class) {
       expense.travel_classes.push(transaction.bus_travel_class);
-    } else if (transaction.fyle_category?.toLowerCase() === 'train' && transaction.train_travel_class) {
+    } else if (transaction.category?.system_category.toLowerCase() === 'train' && transaction.train_travel_class) {
       expense.travel_classes.push(transaction.train_travel_class);
     }
 

src/app/core/services/policy.service.ts

@@ -67,18 +67,18 @@ export class PolicyService {
     };
 
     if (
-      transaction.fyle_category?.toLowerCase() === 'flight' ||
-      transaction.fyle_category?.toLowerCase() === 'airlines'
+      transaction.category?.system_category.toLowerCase() === 'flight' ||
+      transaction.category?.system_category.toLowerCase() === 'airlines'
     ) {
       if (transaction.flight_journey_travel_class) {
         platformPolicyExpense.travel_classes.push(transaction.flight_journey_travel_class);
       }
       if (transaction.flight_return_travel_class) {
         platformPolicyExpense.travel_classes.push(transaction.flight_return_travel_class);
       }
-    } else if (transaction.fyle_category?.toLowerCase() === 'bus' && transaction.bus_travel_class) {
+    } else if (transaction.category?.system_category.toLowerCase() === 'bus' && transaction.bus_travel_class) {
       platformPolicyExpense.travel_classes.push(transaction.bus_travel_class);
-    } else if (transaction.fyle_category?.toLowerCase() === 'train' && transaction.train_travel_class) {
+    } else if (transaction.category?.system_category.toLowerCase() === 'train' && transaction.train_travel_class) {
       platformPolicyExpense.travel_classes.push(transaction.train_travel_class);
     }
 

src/app/core/services/split-expense.service.ts

@@ -196,7 +196,7 @@ export class SplitExpenseService {
   }
 
   transformSplitFlightClasses(transaction: Transaction, platformSplitObject: SplitPayload): void {
-    if (transaction.fyle_category?.toLowerCase() === 'airlines') {
+    if (transaction.category?.system_category.toLowerCase() === 'airlines') {
       if (transaction.flight_journey_travel_class) {
         platformSplitObject.travel_classes.push(transaction.flight_journey_travel_class);
       }
@@ -207,13 +207,13 @@ export class SplitExpenseService {
   }
 
   tranformSplitBusClasses(transaction: Transaction, platformSplitObject: SplitPayload): void {
-    if (transaction.fyle_category?.toLowerCase() === 'bus' && transaction.bus_travel_class) {
+    if (transaction.category?.system_category.toLowerCase() === 'bus' && transaction.bus_travel_class) {
       platformSplitObject.travel_classes.push(transaction.bus_travel_class);
     }
   }
 
   transformSplitTrainClasses(transaction: Transaction, platformSplitObject: SplitPayload): void {
-    if (transaction.fyle_category?.toLowerCase() === 'train' && transaction.train_travel_class) {
+    if (transaction.category?.system_category.toLowerCase() === 'train' && transaction.train_travel_class) {
       platformSplitObject.travel_classes.push(transaction.train_travel_class);
     }
   }

src/app/core/services/transaction.service.spec.ts

@@ -394,18 +394,6 @@ describe('TransactionService', () => {
     expect(transactionService.generateStateOrFilter(filters, params)).toEqual(stateOrFilter);
   });
 
-  it('generateTypeOrFilter(): should generate type Or filters', () => {
-    const filters = { type: ['Mileage', 'PerDiem', 'RegularExpenses'] };
-    const typeOrFilter = [
-      'tx_fyle_category.eq.Mileage',
-      'tx_fyle_category.eq.Per Diem',
-      'and(tx_fyle_category.not.eq.Mileage, tx_fyle_category.not.eq.Per Diem)',
-    ];
-
-    // @ts-ignore
-    expect(transactionService.generateTypeOrFilter(filters)).toEqual(typeOrFilter);
-  });
-
   it('getPaymentModeforEtxn(): should return payment mode for etxn', () => {
     spyOn(transactionService, 'isEtxnInPaymentMode').and.returnValue(true);
     const paymentModeList = [
@@ -633,28 +621,6 @@ describe('TransactionService', () => {
     expect(transactionService.getPaymentModeForEtxn).toHaveBeenCalledTimes(3);
   });
 
-  it('generateTypeFilters(): should generate type filters', () => {
-    const filters = { type: ['Mileage', 'PerDiem', 'RegularExpenses'] };
-    const newQueryParams = { or: [] };
-    const typeOrFilterRes = [
-      'tx_fyle_category.eq.Mileage',
-      'tx_fyle_category.eq.Per Diem',
-      'and(tx_fyle_category.not.eq.Mileage, tx_fyle_category.not.eq.Per Diem)',
-    ];
-    spyOn(lodash, 'cloneDeep').and.returnValue(newQueryParams);
-    // @ts-ignore
-    spyOn(transactionService, 'generateTypeOrFilter').and.returnValue(typeOrFilterRes);
-
-    expect(transactionService.generateTypeFilters(newQueryParams, filters)).toEqual({
-      or: [
-        '(tx_fyle_category.eq.Mileage, tx_fyle_category.eq.Per Diem, and(tx_fyle_category.not.eq.Mileage, tx_fyle_category.not.eq.Per Diem))',
-      ],
-    });
-    expect(lodash.cloneDeep).toHaveBeenCalledOnceWith(newQueryParams);
-    // @ts-ignore
-    expect(transactionService.generateTypeOrFilter).toHaveBeenCalledOnceWith(filters);
-  });
-
   it('unmatchCCCExpense(): should unmatch ccc expense', (done) => {
     spenderPlatformV1ApiService.post.and.returnValue(of(unmatchCCCExpenseResponseData));
 

src/app/core/services/transaction.service.ts

@@ -1,5 +1,4 @@
 import { Injectable, inject } from '@angular/core';
-import { ApiService } from './api.service';
 import { DateService } from './date.service';
 import { map, switchMap, tap, catchError } from 'rxjs/operators';
 import { StorageService } from './storage.service';
@@ -12,8 +11,6 @@ import { CacheBuster } from 'ts-cacheable';
 import { UserEventService } from './user-event.service';
 
 import { cloneDeep } from 'lodash';
-import { DateFilters } from 'src/app/shared/components/fy-filters/date-filters.enum';
-import { PAGINATION_SIZE } from 'src/app/constants';
 import { PaymentModesService } from './payment-modes.service';
 import { OrgSettingsService } from './org-settings.service';
 import { AccountsService } from './accounts.service';
@@ -25,7 +22,6 @@ import { FileObject } from '../models/file-obj.model';
 import { UnflattenedTransaction } from '../models/unflattened-transaction.model';
 import { CurrencySummary } from '../models/currency-summary.model';
 import { FilterQueryParams } from '../models/filter-query-params.model';
-import { SortFiltersParams } from '../models/sort-filters-params.model';
 import { PaymentModeSummary } from '../models/payment-mode-summary.model';
 import { TxnCustomProperties } from '../models/txn-custom-properties.model';
 import { PlatformMissingMandatoryFields } from '../models/platform/platform-missing-mandatory-fields.model';
@@ -46,12 +42,8 @@ import { TranslocoService } from '@jsverse/transloco';
   providedIn: 'root',
 })
 export class TransactionService {
-  private paginationSize = inject(PAGINATION_SIZE);
-
   private storageService = inject(StorageService);
 
-  private apiService = inject(ApiService);
-
   private dateService = inject(DateService);
 
   private platformEmployeeSettingsService = inject(PlatformEmployeeSettingsService);
@@ -476,19 +468,6 @@ export class TransactionService {
     return newQueryParamsCopy;
   }
 
-  generateTypeFilters(newQueryParams: FilterQueryParams, filters: Partial<ExpenseFilters>): FilterQueryParams {
-    const newQueryParamsCopy = cloneDeep(newQueryParams);
-    const typeOrFilter = this.generateTypeOrFilter(filters);
-
-    if (typeOrFilter.length > 0) {
-      let combinedTypeOrFilter = typeOrFilter.reduce((param1, param2) => `${param1}, ${param2}`);
-      combinedTypeOrFilter = `(${combinedTypeOrFilter})`;
-      (newQueryParamsCopy.or as string[]).push(combinedTypeOrFilter);
-    }
-
-    return newQueryParamsCopy;
-  }
-
   getPaymentModeWiseSummary(etxns: Expense[]): PaymentModeSummary {
     const paymentModes = [
       {
@@ -607,7 +586,6 @@ export class TransactionService {
         categoryDisplayName: expense.category?.display_name,
         files: expense.files,
         category: expense.category,
-        fyle_category: expense.category?.system_category,
         state: expense.state,
         admin_amount: expense.admin_amount,
         policy_amount: expense.policy_amount,
@@ -769,26 +747,6 @@ export class TransactionService {
     return stateOrFilter;
   }
 
-  private generateTypeOrFilter(filters: Partial<ExpenseFilters>): string[] {
-    const typeOrFilter: string[] = [];
-    if (filters.type) {
-      if (filters.type.includes('Mileage')) {
-        typeOrFilter.push('tx_fyle_category.eq.Mileage');
-      }
-
-      if (filters.type.includes('PerDiem')) {
-        // The space encoding is done by angular into %20 so no worries here
-        typeOrFilter.push('tx_fyle_category.eq.Per Diem');
-      }
-
-      if (filters.type.includes('RegularExpenses')) {
-        typeOrFilter.push('and(tx_fyle_category.not.eq.Mileage, tx_fyle_category.not.eq.Per Diem)');
-      }
-    }
-
-    return typeOrFilter;
-  }
-
   // to be used only when updating created expense with form values during capture recept flow
   private cleanupExpensePayload(txn: Partial<Transaction>): Partial<Transaction> {
     const newTxn: Partial<Transaction> = {};

src/app/core/services/transactions-outbox.service.ts

@@ -13,7 +13,6 @@ import { CurrencyService } from './currency.service';
 import { Transaction } from '../models/v1/transaction.model';
 import { FileObject } from '../models/file-obj.model';
 import { OutboxQueue } from '../models/outbox-queue.model';
-import { ParsedResponse } from '../models/parsed_response.model';
 import { SpenderFileService } from './platform/v1/spender/file.service';
 import { ApproverFileService } from './platform/v1/approver/file.service';
 import { PlatformFile } from '../models/platform/platform-file.model';