refactor: rename qbd model names (#926)

* refactor: rename qbd model names

* refactor: move qbd shared components to the appropriate folders

src/app/core/models/intacct/intacct-configuration/advanced-settings.model.ts

@@ -1,6 +1,5 @@
 import { FormGroup } from "@angular/forms";
 import { PaymentSyncDirection } from "../../enum/enum.model";
-import { EmailOptions } from "../../qbd/qbd-configuration/qbd-advanced-setting.model";
 import { AdvancedSettingsModel } from "../../common/advanced-settings.model";
 
   export interface GeneralMappingEntity {

src/app/core/models/qbd/db/qbd-iif-logs.model.ts

@@ -1,4 +1,4 @@
-export type AccountingExportsResult = {
+export type QBDAccountingExportsResult = {
     id: number;
     type: string;
     fund_source: string;
@@ -16,7 +16,7 @@ export type QbdExportTriggerResponse = {
     count: number;
     next: string | null;
     previous: string | null;
-    results: AccountingExportsResult[]
+    results: QBDAccountingExportsResult[]
 }
 
 export type QbdAccountingExportDownload = {

src/app/core/models/qbd/db/qbd-mapping.model.ts

@@ -1,31 +1,31 @@
-export type MappingPost = {
+export type QBDMappingPost = {
   attribute_type: string;
   source_value: string;
   source_id: string;
   destination_value: string | null;
 };
 
-export interface Mapping extends MappingPost {
+export interface QBDMapping extends QBDMappingPost {
   id: number;
   created_at: Date;
   updated_at: Date;
   workspace: number;
 }
 
-export type MappingResponse = {
+export type QBDMappingResponse = {
   count: number;
   next: string;
   previous: string;
-  results: Mapping[];
+  results: QBDMapping[];
 };
 
-export type MappingStats = {
+export type QBDMappingStats = {
   all_attributes_count: number;
   unmapped_attributes_count: number;
 };
 
-export class MappingModel {
-  static constructPayload(mapping: Mapping): MappingPost {
+export class QBDMappingModel {
+  static constructPayload(mapping: QBDMapping): QBDMappingPost {
     return {
       attribute_type: mapping.attribute_type,
       source_value: mapping.source_value,

src/app/core/models/qbd/qbd-configuration/qbd-advanced-setting.model.ts

@@ -1,7 +1,7 @@
 import { FormGroup } from "@angular/forms";
 import { QBDScheduleFrequency } from "../../enum/enum.model";
 
-export type EmailOptions = {
+export type QBDEmailOptions = {
     name: string,
     email: string
 }
@@ -10,7 +10,7 @@ export type QBDAdvancedSettingsPost = {
     expense_memo_structure: string[],
     top_memo_structure: string[] | null,
     schedule_is_enabled: boolean,
-    emails_selected: EmailOptions[],
+    emails_selected: QBDEmailOptions[],
     day_of_month: string | null,
     day_of_week: string | null,
     frequency: QBDScheduleFrequency | null,
@@ -25,7 +25,7 @@ export type QBDAdvancedSettingsGet = {
     top_memo_structure: string[],
     schedule_is_enabled: boolean,
     schedule_id: number | null,
-    emails_selected: EmailOptions[],
+    emails_selected: QBDEmailOptions[],
     day_of_month: string | null,
     day_of_week: string | null,
     frequency: QBDScheduleFrequency | null,
@@ -51,7 +51,7 @@ function getFrequencyTime(advancedSettingForm: FormGroup) {
     return null;
 }
 
-export class AdvancedSettingModel {
+export class QBDAdvancedSettingModel {
     static constructPayload(advancedSettingForm: FormGroup): QBDAdvancedSettingsPost {
         const topMemo: string[] = [];
         topMemo.push(advancedSettingForm.value.topMemoStructure);

src/app/core/models/qbd/qbd-configuration/qbd-export-setting.model.ts

@@ -41,7 +41,7 @@ export type QBDExportSettingPost = {
     credit_card_expense_date: QBDExportDateType | null,
 }
 
-export class ExportSettingModel {
+export class QBDExportSettingModel {
     static constructPayload(exportSettingsForm: FormGroup): QBDExportSettingPost {
       const exportSettingPayload: QBDExportSettingPost = {
             reimbursable_expenses_export_type: exportSettingsForm.get('reimbursableExportType')?.value ? exportSettingsForm.get('reimbursableExportType')?.value : null,

src/app/core/models/qbd/qbd-configuration/qbd-field-mapping.model.ts

@@ -17,7 +17,7 @@ export type QBDFieldMappingPost = {
     item_type: string | null
 }
 
-export class FieldMappingModel {
+export class QBDFieldMappingModel {
   static constructPayload(fieldMappingForm: FormGroup): QBDFieldMappingPost {
     const fieldMappingPayload: QBDFieldMappingPost = {
       class_type: fieldMappingForm.get('classType')?.value ? fieldMappingForm.get('classType')?.value : null,

src/app/core/services/qbd/qbd-mapping/qbd-mapping.service.spec.ts

@@ -4,7 +4,7 @@ import { QbdMappingService } from './qbd-mapping.service';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { environment } from 'src/environments/environment';
 import { MappingState } from 'src/app/core/models/enum/enum.model';
-import { Mapping, MappingPost, MappingResponse, MappingStats } from 'src/app/core/models/qbd/db/qbd-mapping.model';
+import { QBDMapping, QBDMappingPost, QBDMappingResponse, QBDMappingStats } from 'src/app/core/models/qbd/db/qbd-mapping.model';
 import { QBDExportSettingResponse, QBDExportSettingResponse2 } from 'src/app/integrations/qbd/qbd-shared/qbd-export-setting/qbd-export-setting.fixture';
 
 describe('QbdMappingService', () => {
@@ -30,7 +30,7 @@ describe('QbdMappingService', () => {
   });
 
   it('getMapping function check', () => {
-    const mappingResponse:MappingResponse = {
+    const mappingResponse:QBDMappingResponse = {
       "count": 16,
       "next": "http://localhost:8008/api/workspaces/4/qbd_mappings/?attribute_type=CORPORATE_CARD&limit=10&offset=10",
       "previous": "null",
@@ -78,7 +78,7 @@ describe('QbdMappingService', () => {
   });
 
     it('getMapping function check', () => {
-    const mappingResponse:MappingResponse = {
+    const mappingResponse:QBDMappingResponse = {
       "count": 16,
       "next": "http://localhost:8008/api/workspaces/4/qbd_mappings/?attribute_type=CORPORATE_CARD&limit=10&offset=10",
       "previous": "null",
@@ -142,7 +142,7 @@ describe('QbdMappingService', () => {
   });
 
   it('postMapping function check', () => {
-    const postMappingResponse: Mapping = {
+    const postMappingResponse: QBDMapping = {
       "id": 59,
       "attribute_type": "CORPORATE_CARD",
       "source_value": "Bank of America - 1319",
@@ -153,7 +153,7 @@ describe('QbdMappingService', () => {
       "workspace": 4
     };
 
-    const postMappingPayload: MappingPost = {
+    const postMappingPayload: QBDMappingPost = {
       attribute_type: "CORPORATE_CARD",
       destination_value: "eefw",
       source_id: "baccK5ssSzxv1g",
@@ -170,7 +170,7 @@ describe('QbdMappingService', () => {
   });
 
   it('getMappingStats function check', () => {
-    const mappingStat: MappingStats = {
+    const mappingStat: QBDMappingStats = {
       "all_attributes_count": 16,
       "unmapped_attributes_count": 12
     };

src/app/core/services/qbd/qbd-mapping/qbd-mapping.service.ts

@@ -1,6 +1,6 @@
 import { EventEmitter, Injectable, Output } from '@angular/core';
 import { QbdWorkspaceService } from '../qbd-core/qbd-workspace.service';
-import { Mapping, MappingPost, MappingResponse, MappingStats } from 'src/app/core/models/qbd/db/qbd-mapping.model';
+import { QBDMapping, QBDMappingPost, QBDMappingResponse, QBDMappingStats } from 'src/app/core/models/qbd/db/qbd-mapping.model';
 import { Observable } from 'rxjs';
 import { QBDExportSettingGet } from 'src/app/core/models/qbd/qbd-configuration/qbd-export-setting.model';
 import { MappingState } from 'src/app/core/models/enum/enum.model';
@@ -18,7 +18,7 @@ export class QbdMappingService {
     private workspaceService: QbdWorkspaceService
   ) { }
 
-  getMappings(limit: number, offset: number, sourceType: string, mappingState: MappingState, itemType: string | null): Observable<MappingResponse> {
+  getMappings(limit: number, offset: number, sourceType: string, mappingState: MappingState, itemType: string | null): Observable<QBDMappingResponse> {
     const params: any = {
       limit,
       offset,
@@ -34,11 +34,11 @@ export class QbdMappingService {
     return this.apiService.get(`/workspaces/${this.workspaceService.getWorkspaceId()}/qbd_mappings/`, params);
   }
 
-  postMappings(mappingPayload: MappingPost): Observable<Mapping> {
+  postMappings(mappingPayload: QBDMappingPost): Observable<QBDMapping> {
     return this.apiService.post(`/workspaces/${this.workspaceService.getWorkspaceId()}/qbd_mappings/`, mappingPayload);
   }
 
-  getMappingStats(sourceType: string, itemType?: string | null): Observable<MappingStats> {
+  getMappingStats(sourceType: string, itemType?: string | null): Observable<QBDMappingStats> {
     return this.apiService.get(`/workspaces/${this.workspaceService.getWorkspaceId()}/qbd_mappings/stats/`, {
       source_type: sourceType === 'item' ? itemType : sourceType.toUpperCase()
     });

src/app/core/services/xero/xero-configuration/xero-advanced-settings.service.ts

@@ -4,7 +4,7 @@ import { WorkspaceService } from '../../common/workspace.service';
 import { CacheBuster, Cacheable } from 'ts-cacheable';
 import { Observable, Subject } from 'rxjs';
 import { XeroAdvancedSettingGet, XeroAdvancedSettingPost } from 'src/app/core/models/xero/xero-configuration/xero-advanced-settings.model';
-import { EmailOptions } from 'src/app/core/models/qbd/qbd-configuration/qbd-advanced-setting.model';
+import { QBDEmailOptions } from 'src/app/core/models/qbd/qbd-configuration/qbd-advanced-setting.model';
 
 const advancedSettingsCache$ = new Subject<void>();
 @Injectable({
@@ -31,7 +31,7 @@ export class XeroAdvancedSettingsService {
     return this.apiService.put(`/v2/workspaces/${this.workspaceService.getWorkspaceId()}/advanced_settings/`, advancedSettingPayload);
   }
 
-  getWorkspaceAdmins(): Observable<[EmailOptions]> {
+  getWorkspaceAdmins(): Observable<[QBDEmailOptions]> {
     return this.apiService.get(`/workspaces/${this.workspaceService.getWorkspaceId()}/admins/`, {});
   }
 

src/app/integrations/intacct/intacct-shared/intacct-advanced-settings/intacct-advanced-settings.component.ts

@@ -2,7 +2,7 @@ import { Component, Inject, OnInit, ViewChild } from '@angular/core';
 import { AbstractControl, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
 import { forkJoin } from 'rxjs';
-import { EmailOptions } from 'src/app/core/models/qbd/qbd-configuration/qbd-advanced-setting.model';
+import { QBDEmailOptions } from 'src/app/core/models/qbd/qbd-configuration/qbd-advanced-setting.model';
 import { AppName, ConfigurationCta, FyleField, IntacctOnboardingState, IntacctReimbursableExpensesObject, IntacctCorporateCreditCardExpensesObject, IntacctUpdateEvent, Page, PaymentSyncDirection, ProgressPhase, ToastSeverity, TrackingApp, QBDAccountingExportsState } from 'src/app/core/models/enum/enum.model';
 import { AdvancedSetting, AdvancedSettingFormOption, AdvancedSettingsGet, AdvancedSettingsPost, HourOption } from 'src/app/core/models/intacct/intacct-configuration/advanced-settings.model';
 import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service';
@@ -50,7 +50,7 @@ export class IntacctAdvancedSettingsComponent implements OnInit {
 
   memoPreviewText: string;
 
-  adminEmails: EmailOptions[] = [];
+  adminEmails: QBDEmailOptions[] = [];
 
   hours: SelectFormOption[] = [...Array(24).keys()].map(day => {
     return {
@@ -348,7 +348,7 @@ export class IntacctAdvancedSettingsComponent implements OnInit {
 
   getAdminEmails() {
     this.isLoading= true;
-    this.advancedSettingsService.getAdditionalEmails().subscribe((emailResponse: EmailOptions[]) => {
+    this.advancedSettingsService.getAdditionalEmails().subscribe((emailResponse: QBDEmailOptions[]) => {
       this.adminEmails = emailResponse;
       this.getSettingsAndSetupForm();
     });

src/app/integrations/qbd/qbd-main/qbd-dashboard/qbd-dashboard.component.ts

@@ -2,7 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { forkJoin, from, interval, switchMap, takeWhile } from 'rxjs';
 import { ClickEvent, Page, PaginatorPage, QBDAccountingExportsState, QBDAccountingExportsType, QBDScheduleFrequency, ToastSeverity, TrackingApp } from 'src/app/core/models/enum/enum.model';
-import { AccountingExportsResult, QbdExportTriggerResponse, QbdAccountingExportDownload, QbdExportTriggerGet } from 'src/app/core/models/qbd/db/qbd-iif-logs.model';
+import { QBDAccountingExportsResult, QbdExportTriggerResponse, QbdAccountingExportDownload, QbdExportTriggerGet } from 'src/app/core/models/qbd/db/qbd-iif-logs.model';
 import { DateFilter, SelectedDateFilter } from 'src/app/core/models/qbd/misc/qbd-date-filter.model';
 import { QbdAdvancedSettingService } from 'src/app/core/services/qbd/qbd-configuration/qbd-advanced-setting.service';
 import { QbdIifLogsService } from 'src/app/core/services/qbd/qbd-iif-log/qbd-iif-logs.service';
@@ -169,7 +169,7 @@ export class QbdDashboardComponent implements OnInit {
     });
   }
 
-  getDownloadLink(exportData: AccountingExportsResult, index: number): void {
+  getDownloadLink(exportData: QBDAccountingExportsResult, index: number): void {
     this.downloadingExportId[index] = true;
     this.iifLogsService.postQbdAccountingExports(exportData.id).subscribe((postQbdAccountingExports: QbdAccountingExportDownload) => {
       const link = document.createElement('a');

src/app/integrations/qbd/qbd-main/qbd-mapping/qbd-generic-mapping/qbd-generic-mapping.component.html

@@ -3,15 +3,15 @@
 </div>
 <div *ngIf="!isLoading" class="tw-py-16-px" [ngClass]="{'tw-px-120-px': brandingConfig.brandId === 'fyle', 'tw-px-60-px': brandingConfig.brandId === 'co'}">
     <div>
-        <app-mapping-header-section [sourceType]="sourceType" [mappingStats]="mappingStats"></app-mapping-header-section>
+        <app-qbd-mapping-header-section [sourceType]="sourceType" [mappingStats]="mappingStats"></app-qbd-mapping-header-section>
     </div>
 
     <div class="tw-shadow-app-card tw-rounded-8-px tw-bg-white tw-border-1-px tw-border-separator tw-mt-16-px">
         <div class="tw-p-24-px">
             <app-mapping-filter [appName]="AppName.QBD" [mappingFilter]="selectedMappingFilter" (mappingFilterChangeEvent)="mappingStateFilter($event)" (mappingSearchingEvent)="mappingSeachingFilter($event)" [isAlphabetFilterHidden]="true"></app-mapping-filter>
         </div>
         <div *ngIf="totalCount > 0" >
-            <app-mapping-table [mappings]="filteredMappings" [destinationFieldType]="destinationFieldType.TEXT" [fyleHeaderName]="sourceType + ' in ' + brandingConfig.brandName + ''" [destinationHeaderName]="destinationHeaderName" [operatingSystem]="operationgSystem" (postMapping)="postMapping($event)"></app-mapping-table>
+            <app-qbd-mapping-table [mappings]="filteredMappings" [destinationFieldType]="destinationFieldType.TEXT" [fyleHeaderName]="sourceType + ' in ' + brandingConfig.brandName + ''" [destinationHeaderName]="destinationHeaderName" [operatingSystem]="operationgSystem" (postMapping)="postMapping($event)"></app-qbd-mapping-table>
         </div>
         <div class="tw-p-24-px tw-border tw-border-t-separator" *ngIf="totalCount > 0" >
             <app-paginator [totalCount]="totalCount" [pageType]="PaginatorPage.MAPPING" [page]="currentPage" [dropDownValue]="limit" (pageSizeChangeEvent)="pageSizeChanges($event)" (pageOffsetChangeEvent)="pageOffsetChanges($event)"></app-paginator>

src/app/integrations/qbd/qbd-main/qbd-mapping/qbd-generic-mapping/qbd-generic-mapping.component.ts

@@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
 import { forkJoin } from 'rxjs';
 import { brandingConfig } from 'src/app/branding/branding-config';
 import { AppName, FieldType, MappingState, PaginatorPage, ToastSeverity } from 'src/app/core/models/enum/enum.model';
-import { Mapping, MappingPost, MappingResponse, MappingStats } from 'src/app/core/models/qbd/db/qbd-mapping.model';
+import { QBDMapping, QBDMappingPost, QBDMappingResponse, QBDMappingStats } from 'src/app/core/models/qbd/db/qbd-mapping.model';
 import { QBDFieldMappingGet } from 'src/app/core/models/qbd/qbd-configuration/qbd-field-mapping.model';
 import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service';
 import { WindowService } from 'src/app/core/services/common/window.service';
@@ -19,11 +19,11 @@ export class QbdGenericMappingComponent implements OnInit {
 
   isLoading: boolean;
 
-  mappingStats: MappingStats;
+  mappingStats: QBDMappingStats;
 
-  mappings: MappingResponse;
+  mappings: QBDMappingResponse;
 
-  filteredMappings: Mapping[];
+  filteredMappings: QBDMapping[];
 
   sourceType: string;
 
@@ -62,7 +62,7 @@ export class QbdGenericMappingComponent implements OnInit {
   ) { }
 
   private getFilteredMappings(): void {
-    this.mappingService.getMappings(this.limit, this.pageNo, this.sourceType, this.selectedMappingFilter, this.fieldMapping?.item_type).subscribe((qbdMappingResult: MappingResponse) => {
+    this.mappingService.getMappings(this.limit, this.pageNo, this.sourceType, this.selectedMappingFilter, this.fieldMapping?.item_type).subscribe((qbdMappingResult: QBDMappingResponse) => {
       this.filteredMappings = qbdMappingResult.results.concat();
       this.totalCount = qbdMappingResult.count;
       this.isLoading = false;
@@ -75,7 +75,7 @@ export class QbdGenericMappingComponent implements OnInit {
 
   mappingSeachingFilter(searchValue: string): void {
     if (searchValue.length > 0) {
-      const results: Mapping[] = this.mappings.results.filter((mapping) =>
+      const results: QBDMapping[] = this.mappings.results.filter((mapping) =>
         mapping.source_value.toLowerCase().includes(searchValue)
       );
       this.filteredMappings = results;
@@ -85,9 +85,9 @@ export class QbdGenericMappingComponent implements OnInit {
     this.totalCount = this.filteredMappings.length;
   }
 
-  postMapping(mappingPayload: MappingPost): void {
+  postMapping(mappingPayload: QBDMappingPost): void {
     this.mappingService.postMappings(mappingPayload).subscribe(() => {
-      this.mappingService.getMappingStats(this.sourceType, this.fieldMapping?.item_type).subscribe((mappingStat: MappingStats) => {
+      this.mappingService.getMappingStats(this.sourceType, this.fieldMapping?.item_type).subscribe((mappingStat: QBDMappingStats) => {
         this.mappingStats = mappingStat;
         this.toastService.displayToastMessage(ToastSeverity.SUCCESS, 'Changes saved successfully');
       });

src/app/integrations/qbd/qbd-onboarding/qbd-onboarding-advanced-setting/qbd-onboarding-advanced-setting.component.html

@@ -1,2 +1,2 @@
-<app-onboarding-stepper [currentStep]="'Advanced'"></app-onboarding-stepper>
+<app-qbd-onboarding-stepper [currentStep]="'Advanced'"></app-qbd-onboarding-stepper>
 <app-qbd-advanced-setting></app-qbd-advanced-setting>

src/app/integrations/qbd/qbd-onboarding/qbd-onboarding-export-setting/qbd-onboarding-export-setting.component.html

@@ -1,2 +1,2 @@
-<app-onboarding-stepper [currentStep]="'Export Settings'"></app-onboarding-stepper>
+<app-qbd-onboarding-stepper [currentStep]="'Export Settings'"></app-qbd-onboarding-stepper>
 <app-qbd-export-setting></app-qbd-export-setting>

src/app/integrations/qbd/qbd-onboarding/qbd-onboarding-field-setting/qbd-onboarding-field-setting.component.html

@@ -1,2 +1,2 @@
-<app-onboarding-stepper [currentStep]="'Field Mapping'"></app-onboarding-stepper>
+<app-qbd-onboarding-stepper [currentStep]="'Field Mapping'"></app-qbd-onboarding-stepper>
 <app-qbd-field-mapping></app-qbd-field-mapping>