feat: Kill compliances (Part 1) (#2651)

* WIP * More stuff * Minor * Minor * Added tests * Removed fdescribe * Minor * Minor * Minor * Minor * Revert "Minor" This reverts commit 74d6610. * Minor * Minor * Minor * feat: Kill compliances (Part 2) (#2654) * Added dismiss changes * Minor * Tests * Minor * feat:kill compliances 3 (#2664) * feat:kill compliances-3 * minor * minor * minor --------- Co-authored-by: sowmya <[email protected]> --------- Co-authored-by: SowmyaFyle <[email protected]> Co-authored-by: sowmya <[email protected]> * minor * minor * minor --------- Co-authored-by: SowmyaFyle <[email protected]> Co-authored-by: sowmya <[email protected]>
fylein · Jan 10, 2024 · 246be5f · 246be5f
1 parent 1172a24
commit 246be5f
Show file tree

Hide file tree

Showing 20 changed files with 602 additions and 115 deletions.
diff --git a/src/app/core/mock-data/duplicate-sets.data.ts b/src/app/core/mock-data/duplicate-sets.data.ts
@@ -14,3 +14,7 @@ export const duplicateSetData3: DuplicateSet = {
   fields: ['field1', 'field2'],
   transaction_ids: ['txcSFe6efB6R', 'txDDLtRaflUW'],
 };
+
+export const duplicateSetData4: DuplicateSet = {
+  transaction_ids: ['tx5fBcPBAxLv'],
+};
diff --git a/src/app/core/mock-data/org-settings.data.ts b/src/app/core/mock-data/org-settings.data.ts
@@ -1373,3 +1373,19 @@ export const orgSettingsWoV2ExpensesPage: OrgSettings = {
   ...orgSettingsRes,
   mobile_app_my_expenses_beta_enabled: false,
 };
+
+export const orgSettingsWithDuplicateDetectionV2: OrgSettings = {
+  ...orgSettingsRes,
+  duplicate_detection_v2_settings: {
+    allowed: true,
+    enabled: true,
+  },
+};
+
+export const orgSettingsWoDuplicateDetectionV2: OrgSettings = {
+  ...orgSettingsRes,
+  duplicate_detection_v2_settings: {
+    allowed: false,
+    enabled: false,
+  },
+};
diff --git a/src/app/core/mock-data/platform/v1/expense-duplicate-sets.data.ts b/src/app/core/mock-data/platform/v1/expense-duplicate-sets.data.ts
@@ -0,0 +1,29 @@
+import { ExpenseDuplicateSet } from 'src/app/core/models/platform/v1/expense-duplicate-sets.model';
+
+export const expenseDuplicateSet: ExpenseDuplicateSet = {
+  expense_ids: ['tx5fBcPBAxLv', 'tx3nHShG60zq'],
+};
+
+export const expenseDuplicateSet2: ExpenseDuplicateSet = {
+  expense_ids: ['tx5fBcPBAxLv'],
+};
+
+export const expenseDuplicateSets: ExpenseDuplicateSet[] = [
+  { expense_ids: ['tx3I0ccSGlhg', 'txvAmVCGZUZi'] },
+  { expense_ids: ['tx3rq5G9gzgf', 'txS1cDov9iZn'] },
+  { expense_ids: ['tx6KauIKfjdJ', 'txT0ZmCrVOiD'] },
+  { expense_ids: ['tx6KauIKfjdJ', 'txws78AoalC9', 'txzjWIcqYxa9'] },
+  { expense_ids: ['tx86H1wDT5aK', 'txQYb76PXaC8', 'txWTiNPneIW5'] },
+  { expense_ids: ['tx96W9dASsje', 'txJVuyoiir2c', 'txqcNXONJpiR'] },
+  {
+    expense_ids: ['txeG0ozaWXAv', 'txi5sCnM706r', 'txJfGPgyDQTj', 'txQhnRluTgSl', 'txtJUQJBvTiv'],
+  },
+  { expense_ids: ['txfQtm19a26X', 'txOoNP4AguMY'] },
+  {
+    expense_ids: ['txiqfeRdVP58', 'txKe7x7WoEfg', 'txvQepZO5jiw', 'txxSrpiC5Eaz'],
+  },
+  { expense_ids: ['txivvQdKDGfZ', 'txvqhZ4SRBx9'] },
+  { expense_ids: ['txjh5iDt7xXO', 'txkJsHIF6a9X'] },
+  { expense_ids: ['txT0ZmCrVOiD', 'txws78AoalC9'] },
+  { expense_ids: ['txT0ZmCrVOiD', 'txzjWIcqYxa9'] },
+];
diff --git a/src/app/core/models/org-settings.model.ts b/src/app/core/models/org-settings.model.ts
@@ -400,6 +400,7 @@ export interface OrgSettingsResponse {
   budget_settings?: CommonOrgSettings;
   custom_category_settings?: CommonOrgSettings;
   duplicate_detection_settings?: CommonOrgSettings;
+  duplicate_detection_v2_settings?: CommonOrgSettings;
   dynamic_form_settings?: CommonOrgSettings;
   hrms_integration_settings?: CommonOrgSettings;
   multi_org_settings?: CommonOrgSettings;
@@ -514,6 +515,7 @@ export interface OrgSettings {
   settlements_excel_settings?: SettlementsExcelSettings;
   gmail_addon_settings?: CommonOrgSettings;
   duplicate_detection_settings?: CommonOrgSettings;
+  duplicate_detection_v2_settings?: CommonOrgSettings;
   custom_category_settings?: CommonOrgSettings;
   bulk_fyle_settings?: CommonOrgSettings;
   auto_reminder_settings?: CommonOrgSettings;

diff --git a/src/app/core/models/platform/v1/expense-duplicate-sets.model.ts b/src/app/core/models/platform/v1/expense-duplicate-sets.model.ts
@@ -0,0 +1,7 @@
+export interface ExpenseDuplicateSetsResponse {
+  data: ExpenseDuplicateSet[];
+}
+
+export interface ExpenseDuplicateSet {
+  expense_ids: string[];
+}
diff --git a/src/app/core/models/v2/duplicate-sets.model.ts b/src/app/core/models/v2/duplicate-sets.model.ts
@@ -1,4 +1,4 @@
 export interface DuplicateSet {
-  fields: string[];
+  fields?: string[]; // in platform, fields aren't present -> so making it optional
   transaction_ids: string[];
 }
diff --git a/src/app/core/services/handle-duplicates.service.ts b/src/app/core/services/handle-duplicates.service.ts
@@ -20,7 +20,7 @@ export class HandleDuplicatesService {
     });
   }
 
-  dismissAll(duplicateSetTransactionIds: string[], transactionIds: string[]) {
+  dismissAll(duplicateSetTransactionIds: string[], transactionIds: string[]): Observable<void> {
     return this.apiService.post('/transactions/duplicates/dismiss', {
       duplicate_set_transaction_ids: duplicateSetTransactionIds,
       transaction_ids: transactionIds,

diff --git a/src/app/core/services/org-settings.service.ts b/src/app/core/services/org-settings.service.ts
@@ -290,6 +290,10 @@ export class OrgSettingsService {
         allowed: incoming.duplicate_detection_settings && incoming.duplicate_detection_settings.allowed,
         enabled: incoming.duplicate_detection_settings && incoming.duplicate_detection_settings.enabled,
       },
+      duplicate_detection_v2_settings: {
+        allowed: incoming.duplicate_detection_v2_settings && incoming.duplicate_detection_v2_settings.allowed,
+        enabled: incoming.duplicate_detection_v2_settings && incoming.duplicate_detection_v2_settings.enabled,
+      },
       custom_category_settings: {
         allowed: incoming.custom_category_settings && incoming.custom_category_settings.allowed,
         enabled: incoming.custom_category_settings && incoming.custom_category_settings.enabled,
@@ -527,6 +531,7 @@ export class OrgSettingsService {
       transaction_field_configurations: outgoing.transaction_field_configurations,
       gmail_addon_settings: outgoing.gmail_addon_settings,
       duplicate_detection_settings: outgoing.duplicate_detection_settings,
+      duplicate_detection_v2_settings: outgoing.duplicate_detection_v2_settings,
       custom_category_settings: outgoing.custom_category_settings,
       org_bulk_fyle_settings: outgoing.bulk_fyle_settings,
       auto_reminder_settings: outgoing.auto_reminder_settings,

diff --git a/src/app/core/services/platform/v1/spender/expenses.service.spec.ts b/src/app/core/services/platform/v1/spender/expenses.service.spec.ts
@@ -7,6 +7,7 @@ import { PAGINATION_SIZE } from 'src/app/constants';
 import { expensesResponse } from 'src/app/core/mock-data/platform/v1/expenses-response.data';
 import { getExpensesQueryParams } from 'src/app/core/mock-data/platform/v1/expenses-query-params.data';
 import { expensesCacheBuster$ } from '../../../transaction.service';
+import { expenseDuplicateSets } from 'src/app/core/mock-data/platform/v1/expense-duplicate-sets.data';
 import { completeStats } from 'src/app/core/mock-data/platform/v1/expenses-stats.data';
 import { ExpensesService as SharedExpenseService } from '../shared/expenses.service';
 
@@ -18,6 +19,7 @@ describe('ExpensesService', () => {
   beforeEach(() => {
     const spenderServiceSpy = jasmine.createSpyObj('SpenderService', ['get', 'post']);
     const sharedExpenseServiceSpy = jasmine.createSpyObj('SharedExpenseService', ['generateStatsQueryParams']);
+
     TestBed.configureTestingModule({
       providers: [
         { provide: SpenderService, useValue: spenderServiceSpy },
@@ -146,6 +148,33 @@ describe('ExpensesService', () => {
     });
   });
 
+  it('getDuplicateSets(): should return expense duplicate sets', (done) => {
+    spenderService.get.and.returnValue(of({ data: expenseDuplicateSets }));
+
+    service.getDuplicateSets().subscribe((response) => {
+      expect(response).toEqual(expenseDuplicateSets);
+
+      expect(spenderService.get).toHaveBeenCalledOnceWith('/expenses/duplicate_sets');
+      done();
+    });
+  });
+
+  it('getDuplicatesByExpense() : should get the duplicates by expense', (done) => {
+    const expenseId = 'txaiCW1efU0n';
+    spenderService.get.and.returnValue(of({ data: expenseDuplicateSets }));
+
+    service.getDuplicatesByExpense(expenseId).subscribe((response) => {
+      expect(response).toEqual(expenseDuplicateSets);
+
+      expect(spenderService.get).toHaveBeenCalledOnceWith('/expenses/duplicate_sets', {
+        params: {
+          expense_id: 'txaiCW1efU0n',
+         },
+      });
+      done();
+    });
+  });
+
   it('getExpenseStats(): should get expense stats for unreported stats', (done) => {
     spenderService.post.and.returnValue(of(completeStats));
     sharedExpenseService.generateStatsQueryParams.and.returnValue(
@@ -168,4 +197,27 @@ describe('ExpensesService', () => {
       done();
     });
   });
+
+  it('dismissDuplicates(): should dismiss duplicate expenses', (done) => {
+    spenderService.post.and.returnValue(of({}));
+
+    const duplicateExpenseIds = ['tx1234', 'tx2345'];
+    const targetExpenseIds = ['tx1234', 'tx2345'];
+
+    service.dismissDuplicates(duplicateExpenseIds, targetExpenseIds).subscribe(() => {
+      expect(spenderService.post).toHaveBeenCalledOnceWith('/expenses/dismiss_duplicates/bulk', {
+        data: [
+          {
+            id: 'tx1234',
+            duplicate_expense_ids: ['tx1234', 'tx2345'],
+          },
+          {
+            id: 'tx2345',
+            duplicate_expense_ids: ['tx1234', 'tx2345'],
+          },
+        ],
+      });
+      done();
+    });
+  });
 });
diff --git a/src/app/core/services/platform/v1/spender/expenses.service.ts b/src/app/core/services/platform/v1/spender/expenses.service.ts
@@ -7,6 +7,10 @@ import { ExpensesQueryParams } from 'src/app/core/models/platform/v1/expenses-qu
 import { PAGINATION_SIZE } from 'src/app/constants';
 import { Cacheable } from 'ts-cacheable';
 import { expensesCacheBuster$ } from '../../../transaction.service';
+import {
+  ExpenseDuplicateSet,
+  ExpenseDuplicateSetsResponse,
+} from 'src/app/core/models/platform/v1/expense-duplicate-sets.model';
 import { ExpensesService as SharedExpenseService } from '../shared/expenses.service';
 
 @Injectable({
@@ -82,6 +86,33 @@ export class ExpensesService {
       .pipe(map((expenses) => expenses.data));
   }
 
+  getDuplicateSets(): Observable<ExpenseDuplicateSet[]> {
+    return this.spenderService
+      .get<ExpenseDuplicateSetsResponse>('/expenses/duplicate_sets')
+      .pipe(map((response) => response.data));
+  }
+
+  getDuplicatesByExpense(expenseId: string): Observable<ExpenseDuplicateSet[]> {
+    return this.spenderService
+      .get<ExpenseDuplicateSetsResponse>('/expenses/duplicate_sets', {
+        params: {
+          expense_id: expenseId,
+        },
+      })
+      .pipe(map((response) => response.data));
+  }
+
+  dismissDuplicates(duplicateExpenseIds: string[], targetExpenseIds: string[]): Observable<void> {
+    const payload = targetExpenseIds.map((targetExpenseId) => ({
+      id: targetExpenseId,
+      duplicate_expense_ids: duplicateExpenseIds,
+    }));
+
+    return this.spenderService.post<void>('/expenses/dismiss_duplicates/bulk', {
+      data: payload,
+    });
+  }
+
   getExpenseStats(
     params: Record<string, string | string[] | boolean>
   ): Observable<{ data: { count: number; total_amount: number } }> {

diff --git a/src/app/core/services/tasks.service.spec.ts b/src/app/core/services/tasks.service.spec.ts
@@ -40,7 +40,10 @@ import {
   unreportedExpenseTaskSample2,
 } from '../mock-data/task.data';
 import { mastercardRTFCard } from '../mock-data/platform-corporate-card.data';
+import { OrgSettingsService } from './org-settings.service';
 import { ExpensesService } from './platform/v1/spender/expenses.service';
+import { orgSettingsWithDuplicateDetectionV2, orgSettingsWoDuplicateDetectionV2 } from '../mock-data/org-settings.data';
+import { expenseDuplicateSets } from '../mock-data/platform/v1/expense-duplicate-sets.data';
 import { completeStats, incompleteStats } from '../mock-data/platform/v1/expenses-stats.data';
 
 describe('TasksService', () => {
@@ -54,6 +57,7 @@ describe('TasksService', () => {
   let corporateCreditCardExpenseService: jasmine.SpyObj<CorporateCreditCardExpenseService>;
   let currencyService: jasmine.SpyObj<CurrencyService>;
   let humanizeCurrencyPipe: jasmine.SpyObj<HumanizeCurrencyPipe>;
+  let orgSettingsService: jasmine.SpyObj<OrgSettingsService>;
   let expensesService: jasmine.SpyObj<ExpensesService>;
 
   const mockTaskClearSubject = new Subject();
@@ -66,7 +70,7 @@ describe('TasksService', () => {
       'getAllExtendedReports',
     ]);
     const transactionServiceSpy = jasmine.createSpyObj('TransactionService', ['getTransactionStats']);
-    const expensesServiceSpy = jasmine.createSpyObj('ExpensesService', ['getExpenseStats']);
+    const expensesServiceSpy = jasmine.createSpyObj('ExpensesService', ['getExpenseStats', 'getDuplicateSets']);
     const userEventServiceSpy = jasmine.createSpyObj('UserEventService', ['onTaskCacheClear']);
     const authServiceSpy = jasmine.createSpyObj('AuthService', ['getEou']);
     const handleDuplicatesServiceSpy = jasmine.createSpyObj('HandleDuplicatesService', ['getDuplicateSets']);
@@ -76,6 +80,7 @@ describe('TasksService', () => {
     ]);
     const currencyServiceSpy = jasmine.createSpyObj('CurrencyService', ['getHomeCurrency']);
     const humanizeCurrencyPipeSpy = jasmine.createSpyObj('HumanizeCurrencyPipe', ['transform']);
+    const orgSettingsServiceSpy = jasmine.createSpyObj('OrgSettingsService', ['get']);
 
     TestBed.configureTestingModule({
       providers: [
@@ -116,6 +121,10 @@ describe('TasksService', () => {
           provide: CurrencyService,
           useValue: currencyServiceSpy,
         },
+        {
+          provide: OrgSettingsService,
+          useValue: orgSettingsServiceSpy,
+        },
         {
           provide: ExpensesService,
           useValue: expensesServiceSpy,
@@ -135,6 +144,7 @@ describe('TasksService', () => {
     ) as jasmine.SpyObj<CorporateCreditCardExpenseService>;
     currencyService = TestBed.inject(CurrencyService) as jasmine.SpyObj<CurrencyService>;
     humanizeCurrencyPipe = TestBed.inject(HumanizeCurrencyPipe) as jasmine.SpyObj<HumanizeCurrencyPipe>;
+    orgSettingsService = TestBed.inject(OrgSettingsService) as jasmine.SpyObj<OrgSettingsService>;
     expensesService = TestBed.inject(ExpensesService) as jasmine.SpyObj<ExpensesService>;
   });
 
@@ -260,13 +270,24 @@ describe('TasksService', () => {
   });
 
   it('should be able to fetch potential duplicate tasks', (done) => {
+    setupData();
     handleDuplicatesService.getDuplicateSets.and.returnValue(of(potentialDuplicatesApiResponse));
     tasksService.getPotentialDuplicatesTasks().subscribe((potentialDuplicateTasks) => {
       expect(potentialDuplicateTasks).toEqual([potentailDuplicateTaskSample]);
       done();
     });
   });
 
+  it('should be able to fetch potential duplicate tasks when duplicate detection v2 is enabled', (done) => {
+    setupData();
+    orgSettingsService.get.and.returnValue(of(orgSettingsWithDuplicateDetectionV2));
+    expensesService.getDuplicateSets.and.returnValue(of(expenseDuplicateSets));
+    tasksService.getPotentialDuplicatesTasks().subscribe((potentialDuplicateTasks) => {
+      expect(potentialDuplicateTasks).toEqual([potentailDuplicateTaskSample]);
+      done();
+    });
+  });
+
   it('should be able to fetch incomplete tasks', (done) => {
     expensesService.getExpenseStats
       .withArgs({
@@ -655,13 +676,24 @@ describe('TasksService', () => {
   });
 
   it('should be able to handle null reponse from potential duplicates get call', (done) => {
+    setupData();
     handleDuplicatesService.getDuplicateSets.and.returnValue(of(null));
     tasksService.getPotentialDuplicatesTasks().subscribe((tasks) => {
       expect(tasks).toEqual([]);
       done();
     });
   });
 
+  it('should be able to handle null response from duplicate detection v2 duplicates sets call', (done) => {
+    setupData();
+    orgSettingsService.get.and.returnValue(of(orgSettingsWithDuplicateDetectionV2));
+    expensesService.getDuplicateSets.and.returnValue(of(null));
+    tasksService.getPotentialDuplicatesTasks().subscribe((tasks) => {
+      expect(tasks).toEqual([]);
+      done();
+    });
+  });
+
   function setupData() {
     currencyService.getHomeCurrency.and.returnValue(of(homeCurrency));
     advanceRequestService.getMyAdvanceRequestStats.and.returnValue(of(sentBackAdvancesResponse));
@@ -689,6 +721,7 @@ describe('TasksService', () => {
         false
       )
       .and.returnValue(of(teamReportResponse));
+    orgSettingsService.get.and.returnValue(of(orgSettingsWoDuplicateDetectionV2));
     handleDuplicatesService.getDuplicateSets.and.returnValue(of(potentialDuplicatesApiResponse));
     expensesService.getExpenseStats
       .withArgs({