feat: Replace ExtendedProject -> ProjectV2 (#2923)

fylein · May 3, 2024 · 322061d · 322061d
1 parent 137861e
commit 322061d
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 87 deletions.
diff --git a/src/app/core/mock-data/recently-used.data.ts b/src/app/core/mock-data/recently-used.data.ts
@@ -1,5 +1,5 @@
 import { RecentlyUsed } from '../models/v1/recently_used.model';
-import { ExtendedProject } from '../models/v2/extended-project.model';
+import { ProjectV2 } from '../models/v2/project-v2.model';
 import { Currency, CurrencyName } from '../models/currency.model';
 import { CostCenter } from '../models/v1/cost-center.model';
 
@@ -26,7 +26,7 @@ export const recentlyUsedRes: RecentlyUsed = {
   ],
 };
 
-export const recentlyUsedProjectRes: ExtendedProject[] = [
+export const recentlyUsedProjectRes: ProjectV2[] = [
   {
     ap1_email: '[email protected]',
     ap1_full_name: 'John Doe',

diff --git a/src/app/core/models/add-edit-advance-request-form-value.model.ts b/src/app/core/models/add-edit-advance-request-form-value.model.ts
@@ -1,11 +1,11 @@
 import { AdvanceRequestCustomFieldValues } from './advance-request-custom-field-values.model';
 import { CurrencyObj } from './currency-obj.model';
-import { ExtendedProject } from './v2/extended-project.model';
+import { ProjectV2 } from './v2/project-v2.model';
 
 export interface AddEditAdvanceRequestFormValue {
   currencyObj: CurrencyObj;
   purpose: string;
   notes: string;
-  project: ExtendedProject;
+  project: ProjectV2;
   customFieldValues: AdvanceRequestCustomFieldValues[];
 }
diff --git a/src/app/core/models/mileage-form-value.model.ts b/src/app/core/models/mileage-form-value.model.ts
@@ -5,7 +5,7 @@ import { PlatformMileageRates } from './platform/platform-mileage-rates.model';
 import { TxnCustomProperties } from './txn-custom-properties.model';
 import { CostCenter } from './v1/cost-center.model';
 import { OrgCategory } from './v1/org-category.model';
-import { ExtendedProject } from './v2/extended-project.model';
+import { ProjectV2 } from './v2/project-v2.model';
 import { Report } from '../models/platform/v1/report.model';
 
 export interface MileageFormValue {
@@ -22,7 +22,7 @@ export interface MileageFormValue {
   mileage_rate_name: PlatformMileageRates;
   vehicle_type: string;
   dateOfSpend: Date;
-  project: ExtendedProject;
+  project: ProjectV2;
   costCenter: CostCenter;
   billable: boolean;
   purpose: string;

diff --git a/src/app/core/models/per-diem-form-value.model.ts b/src/app/core/models/per-diem-form-value.model.ts
@@ -5,7 +5,7 @@ import { TxnCustomProperties } from './txn-custom-properties.model';
 import { CostCenter } from './v1/cost-center.model';
 import { OrgCategory } from './v1/org-category.model';
 import { PerDiemRates } from './v1/per-diem-rates.model';
-import { ExtendedProject } from './v2/extended-project.model';
+import { ProjectV2 } from './v2/project-v2.model';
 
 export interface PerDiemFormValue {
   currencyObj: {
@@ -15,7 +15,7 @@ export interface PerDiemFormValue {
     orig_amount: number;
   };
   paymentMode: ExtendedAccount;
-  project: ExtendedProject;
+  project: ProjectV2;
   sub_category: OrgCategory;
   purpose: string;
   num_days: number;

diff --git a/src/app/core/models/project-options.model.ts b/src/app/core/models/project-options.model.ts
@@ -1,7 +1,7 @@
-import { ExtendedProject } from './v2/extended-project.model';
+import { ProjectV2 } from './v2/project-v2.model';
 
 export interface ProjectOption {
   label: string;
-  value: ExtendedProject;
+  value: ProjectV2;
   selected?: boolean;
 }
diff --git a/src/app/core/models/split-expense.model.ts b/src/app/core/models/split-expense.model.ts
@@ -1,4 +1,4 @@
-import { ExtendedProject } from './v2/extended-project.model';
+import { ProjectV2 } from './v2/project-v2.model';
 
 export interface SplitExpense {
   amount: number;
@@ -17,7 +17,7 @@ export interface SplitExpense {
     sub_category: string;
     updated_at: string;
   };
-  project?: ExtendedProject;
+  project?: ProjectV2;
   cost_center?: {
     id: number;
     created_at: string;

diff --git a/.../core/models/v2/extended-project.model.ts → src/app/core/models/v2/project-v2.model.ts b/.../core/models/v2/extended-project.model.ts → src/app/core/models/v2/project-v2.model.ts
@@ -1,4 +1,4 @@
-export interface ExtendedProject {
+export interface ProjectV2 {
   ap1_email: string;
   ap1_full_name: string;
   ap2_email: string;

diff --git a/src/app/core/services/projects.service.ts b/src/app/core/services/projects.service.ts
@@ -4,7 +4,7 @@ import { ApiV2Service } from './api-v2.service';
 import { map } from 'rxjs/operators';
 import { Cacheable } from 'ts-cacheable';
 import { Observable } from 'rxjs';
-import { ExtendedProject } from '../models/v2/extended-project.model';
+import { ProjectV2 } from '../models/v2/project-v2.model';
 import { ProjectV1 } from '../models/v1/extended-project.model';
 import { ProjectParams } from '../models/project-params.model';
 import { intersection } from 'lodash';
@@ -14,10 +14,7 @@ import { OrgCategory } from '../models/v1/org-category.model';
   providedIn: 'root',
 })
 export class ProjectsService {
-  constructor(
-    private apiService: ApiService,
-    private apiV2Service: ApiV2Service,
-  ) {}
+  constructor(private apiService: ApiService, private apiV2Service: ApiV2Service) {}
 
   @Cacheable()
   getByParamsUnformatted(
@@ -31,8 +28,8 @@ export class ProjectsService {
       sortOrder: string;
       sortDirection: string;
       projectIds: number[];
-    }>,
-  ): Observable<ExtendedProject[]> {
+    }>
+  ): Observable<ProjectV2[]> {
     // eslint-disable-next-line prefer-const
     let { orgId, active, orgCategoryIds, searchNameText, limit, offset, sortOrder, sortDirection, projectIds } =
       projectParams;
@@ -59,7 +56,7 @@ export class ProjectsService {
     this.addNameSearchFilter(searchNameText, params);
 
     return this.apiV2Service
-      .get<ExtendedProject, {}>('/projects', {
+      .get<ProjectV2, {}>('/projects', {
         params,
       })
       .pipe(
@@ -68,8 +65,8 @@ export class ProjectsService {
             ...datum,
             project_created_at: new Date(datum.project_created_at),
             project_updated_at: new Date(datum.project_updated_at),
-          })),
-        ),
+          }))
+        )
       );
   }
 
@@ -86,7 +83,7 @@ export class ProjectsService {
           }
         });
         return filterdProjects.length;
-      }),
+      })
     );
   }
 
@@ -114,7 +111,7 @@ export class ProjectsService {
     }
   }
 
-  getAllowedOrgCategoryIds(project: ProjectParams | ExtendedProject, activeCategoryList: OrgCategory[]): OrgCategory[] {
+  getAllowedOrgCategoryIds(project: ProjectParams | ProjectV2, activeCategoryList: OrgCategory[]): OrgCategory[] {
     let categoryList: OrgCategory[] = [];
     if (project) {
       categoryList = activeCategoryList.filter((category: OrgCategory) => {
@@ -142,14 +139,14 @@ export class ProjectsService {
           ...datum,
           created_at: new Date(datum.created_at),
           updated_at: new Date(datum.updated_at),
-        })),
-      ),
+        }))
+      )
     );
   }
 
-  getbyId(projectId: number | string): Observable<ExtendedProject> {
+  getbyId(projectId: number | string): Observable<ProjectV2> {
     return this.apiV2Service
-      .get<ExtendedProject, {}>('/projects', {
+      .get<ProjectV2, {}>('/projects', {
         params: {
           project_id: `eq.${projectId}`,
         },
@@ -161,8 +158,8 @@ export class ProjectsService {
               ...datum,
               project_created_at: new Date(datum.project_created_at),
               project_updated_at: new Date(datum.project_updated_at),
-            }))[0],
-        ),
+            }))[0]
+        )
       );
   }
 }
diff --git a/src/app/core/services/recently-used-items.service.ts b/src/app/core/services/recently-used-items.service.ts
@@ -5,18 +5,15 @@ import { RecentlyUsed } from '../models/v1/recently_used.model';
 import { ApiService } from './api.service';
 import { ProjectsService } from 'src/app/core/services/projects.service';
 import { map } from 'rxjs/operators';
-import { ExtendedProject } from '../models/v2/extended-project.model';
+import { ProjectV2 } from '../models/v2/project-v2.model';
 import { ExtendedOrgUser } from '../models/extended-org-user.model';
 import { OrgCategoryListItem } from '../models/v1/org-category.model';
 import { Currency, CurrencyName } from '../models/currency.model';
 @Injectable({
   providedIn: 'root',
 })
 export class RecentlyUsedItemsService {
-  constructor(
-    private apiService: ApiService,
-    private projectService: ProjectsService,
-  ) {}
+  constructor(private apiService: ApiService, private projectService: ProjectsService) {}
 
   getRecentlyUsed(): Observable<RecentlyUsed> {
     return this.apiService.get('/recently_used');
@@ -26,7 +23,7 @@ export class RecentlyUsedItemsService {
     recentValues: RecentlyUsed;
     eou: ExtendedOrgUser;
     categoryIds: string[];
-  }): Observable<ExtendedProject[]> {
+  }): Observable<ProjectV2[]> {
     if (
       config.recentValues &&
       config.recentValues.recent_project_ids &&
@@ -46,12 +43,12 @@ export class RecentlyUsedItemsService {
         })
         .pipe(
           map((project) => {
-            const projectsMap: { [key: string]: ExtendedProject } = {};
+            const projectsMap: { [key: string]: ProjectV2 } = {};
             project.forEach((item) => {
               projectsMap[item.project_id] = item;
             });
             return config.recentValues.recent_project_ids.map((id) => projectsMap[id]).filter((id) => id);
-          }),
+          })
         );
     } else {
       return of(null);
@@ -60,7 +57,7 @@ export class RecentlyUsedItemsService {
 
   getRecentCostCenters(
     costCenters: CostCenters[],
-    recentValue: RecentlyUsed,
+    recentValue: RecentlyUsed
   ): Observable<{ label: string; value: CostCenter; selected?: boolean }[]> {
     if (
       costCenters &&
@@ -78,7 +75,7 @@ export class RecentlyUsedItemsService {
         .filter((id) => id);
       if (recentCostCenterList.length > 0) {
         return of(
-          recentCostCenterList.map((costCenter) => ({ label: costCenter.value.name, value: costCenter.value })),
+          recentCostCenterList.map((costCenter) => ({ label: costCenter.value.name, value: costCenter.value }))
         );
       } else {
         return of(null);
@@ -90,7 +87,7 @@ export class RecentlyUsedItemsService {
 
   getRecentCategories(
     filteredCategories: OrgCategoryListItem[],
-    recentValues: RecentlyUsed,
+    recentValues: RecentlyUsed
   ): Observable<OrgCategoryListItem[]> {
     if (
       filteredCategories &&

diff --git a/src/app/core/test-data/projects.spec.data.ts b/src/app/core/test-data/projects.spec.data.ts
@@ -1,7 +1,7 @@
 import { ProjectParams } from '../models/project-params.model';
 import { ProjectV1 } from '../models/v1/extended-project.model';
 import { OrgCategory, OrgCategoryListItem } from '../models/v1/org-category.model';
-import { ExtendedProject } from '../models/v2/extended-project.model';
+import { ProjectV2 } from '../models/v2/project-v2.model';
 
 export const apiResponseActiveOnly = [
   {
@@ -315,7 +315,7 @@ export const allowedActiveCategoriesListOptions: OrgCategoryListItem[] = [
   },
 ];
 
-export const expectedProjectsResponse: ExtendedProject[] = [
+export const expectedProjectsResponse: ProjectV2[] = [
   {
     ap1_email: null,
     ap1_full_name: null,
@@ -368,7 +368,7 @@ export const testProjectParams: ProjectParams = {
   searchNameText: 'search',
 };
 
-export const testProjectV2: ExtendedProject = {
+export const testProjectV2: ProjectV2 = {
   ap1_email: null,
   ap1_full_name: null,
   ap2_email: null,

diff --git a/src/app/fyle/add-edit-expense/add-edit-expense.page.ts b/src/app/fyle/add-edit-expense/add-edit-expense.page.ts
@@ -83,7 +83,7 @@ import { OrgCategory, OrgCategoryListItem } from 'src/app/core/models/v1/org-cat
 import { RecentlyUsed } from 'src/app/core/models/v1/recently_used.model';
 import { Transaction } from 'src/app/core/models/v1/transaction.model';
 import { DuplicateSet } from 'src/app/core/models/v2/duplicate-sets.model';
-import { ExtendedProject } from 'src/app/core/models/v2/extended-project.model';
+import { ProjectV2 } from 'src/app/core/models/v2/project-v2.model';
 import { AccountsService } from 'src/app/core/services/accounts.service';
 import { AuthService } from 'src/app/core/services/auth.service';
 import { CategoriesService } from 'src/app/core/services/categories.service';
@@ -144,7 +144,7 @@ type FormValue = {
     orig_amount: number;
   };
   paymentMode: ExtendedAccount;
-  project: ExtendedProject;
+  project: ProjectV2;
   category: OrgCategory;
   dateOfSpend: Date;
   vendor_id: {
@@ -333,13 +333,13 @@ export class AddEditExpensePage implements OnInit {
 
   orgUserSettings$: Observable<OrgUserSettings>;
 
-  recentProjects: { label: string; value: ExtendedProject; selected?: boolean }[];
+  recentProjects: { label: string; value: ProjectV2; selected?: boolean }[];
 
   recentCurrencies: Currency[];
 
   presetProjectId: number | string;
 
-  recentlyUsedProjects$: Observable<ExtendedProject[]>;
+  recentlyUsedProjects$: Observable<ProjectV2[]>;
 
   recentlyUsedCurrencies$: Observable<Currency[]>;
 
@@ -411,7 +411,7 @@ export class AddEditExpensePage implements OnInit {
 
   dependentFields$: Observable<ExpenseField[]>;
 
-  selectedProject$: BehaviorSubject<ExtendedProject | null>;
+  selectedProject$: BehaviorSubject<ProjectV2 | null>;
 
   selectedCostCenter$: BehaviorSubject<CostCenter | null>;
 
@@ -1441,7 +1441,7 @@ export class AddEditExpensePage implements OnInit {
     );
   }
 
-  getSelectedProjects(): Observable<ExtendedProject> {
+  getSelectedProjects(): Observable<ProjectV2> {
     return this.etxn$.pipe(
       switchMap((etxn) => {
         if (etxn.tx.project_id) {
@@ -1544,7 +1544,7 @@ export class AddEditExpensePage implements OnInit {
     );
   }
 
-  getRecentProjects(): Observable<ExtendedProject[]> {
+  getRecentProjects(): Observable<ProjectV2[]> {
     return forkJoin({
       recentValues: this.recentlyUsedValues$,
       eou: this.authService.getEou(),
@@ -2546,7 +2546,7 @@ export class AddEditExpensePage implements OnInit {
             }
           }),
           startWith(initialProject),
-          concatMap((project: ExtendedProject) =>
+          concatMap((project: ProjectV2) =>
             activeCategories$.pipe(
               map((activeCategories) => this.projectsService.getAllowedOrgCategoryIds(project, activeCategories))
             )
@@ -2715,7 +2715,7 @@ export class AddEditExpensePage implements OnInit {
     this.onPageExit$ = new Subject();
     this.projectDependentFieldsRef?.ngOnInit();
     this.costCenterDependentFieldsRef?.ngOnInit();
-    this.selectedProject$ = new BehaviorSubject<ExtendedProject>(null);
+    this.selectedProject$ = new BehaviorSubject<ProjectV2>(null);
     this.selectedCostCenter$ = new BehaviorSubject<CostCenter>(null);
     const fn = (): void => {
       this.showClosePopup();
@@ -2727,7 +2727,7 @@ export class AddEditExpensePage implements OnInit {
   setupSelectedProjectObservable(): void {
     this.fg.controls.project.valueChanges
       .pipe(takeUntil(this.onPageExit$))
-      .subscribe((project: ExtendedProject) => this.selectedProject$.next(project));
+      .subscribe((project: ProjectV2) => this.selectedProject$.next(project));
   }
 
   setupSelectedCostCenterObservable(): void {