fix(arc-saas): change is structure

Deepika516 · Deepika516 · commit 6bb58f21117a · 2024-05-14T13:29:59.000+05:30
change is structure GH-34
diff --git a/projects/saas-ui/src/app/main/commands/add-plan.command.ts b/projects/saas-ui/src/app/main/commands/add-plan.command.ts
@@ -1,7 +1,6 @@
 import {PostAPICommand, ApiService, IAdapter} from '@project-lib/core/api';
 import {IAnyObject} from '@project-lib/core/i-any-object';
-import {Plan} from '../../on-boarding/models';
-
+import {Plan} from '../../shared/models';
 export class AddPlanCommand<T> extends PostAPICommand<Plan> {
   parameters: any;
 
diff --git a/projects/saas-ui/src/app/main/commands/add-tenant.command.ts b/projects/saas-ui/src/app/main/commands/add-tenant.command.ts
@@ -1,7 +1,7 @@
 import {ApiService, IAdapter, PostAPICommand} from '@project-lib/core/api';
 
 import {IAnyObject} from '@project-lib/core/i-any-object';
-import {Tenant} from '../../on-boarding/models';
+import {Tenant} from '../../shared/models';
 
 export class AddTenantCommand<T> extends PostAPICommand<T> {
   parameters: {
diff --git a/projects/saas-ui/src/app/main/commands/edit-tenant.command.ts b/projects/saas-ui/src/app/main/commands/edit-tenant.command.ts
@@ -1,7 +1,7 @@
 import {ApiService, IAdapter, PatchAPICommand} from '@project-lib/core/api';
 
 import {IAnyObject} from '@project-lib/core/i-any-object';
-import {Tenant} from '../model/tenant.model';
+import {Tenant} from '../../shared/models/tenant.model';
 
 export class EditTenantCommand<T> extends PatchAPICommand<T> {
   data: Tenant;
diff --git a/projects/saas-ui/src/app/main/commands/get-plan-by-id.command.ts b/projects/saas-ui/src/app/main/commands/get-plan-by-id.command.ts
@@ -3,7 +3,7 @@ import {IApiService, IAdapter, GetAPICommand} from '@project-lib/core/api';
 import {Inject} from '@angular/core';
 import {APP_CONFIG} from '@project-lib/app-config';
 import {IAnyObject} from '@project-lib/core/i-any-object';
-import {Plan} from '../../on-boarding/models';
+import {Plan} from '../../shared/models';
 export class GetPlanByIdCommand<T> extends GetAPICommand<Plan> {
   parameters: {};
   constructor(
diff --git a/projects/saas-ui/src/app/main/commands/get-plan.command.ts b/projects/saas-ui/src/app/main/commands/get-plan.command.ts
@@ -3,7 +3,7 @@ import {Observable} from 'rxjs';
 import {Inject} from '@angular/core';
 import {APP_CONFIG} from '@project-lib/app-config';
 import {IAnyObject} from '@project-lib/core/i-any-object';
-import {Plan} from '../../on-boarding/models';
+import {Plan} from '../../shared/models';
 
 export class GetPlanCommand<T> extends GetAPICommand<Plan[]> {
   constructor(
diff --git a/projects/saas-ui/src/app/main/components/add-plan/add-plan.component.ts b/projects/saas-ui/src/app/main/components/add-plan/add-plan.component.ts
@@ -3,13 +3,11 @@ import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 import {ActivatedRoute, Router} from '@angular/router';
 import {NbToastrService} from '@nebular/theme';
 import {Location} from '@angular/common';
-import {OnBoardingService} from '../../../on-boarding/on-boarding-service';
-import {catchError, of, pipe, takeUntil} from 'rxjs';
-import {TenantStatus} from '../../enums/tenant-status.enum';
+import {OnBoardingService} from '../../../shared/services/on-boarding-service';
 import {AnyObject} from '@project-lib/core/api';
 import {IAnyObject} from '../../../../../../arc-lib/src/lib/core/i-any-object';
 import {APP_CONFIG} from '@project-lib/app-config';
-import {BillingPlanService} from '../../services/billing-plan-service';
+import {BillingPlanService} from '../../../shared/services/billing-plan-service';
 @Component({
   selector: 'add-plan',
   templateUrl: './add-plan.component.html',
diff --git a/projects/saas-ui/src/app/main/components/billing-plan/billing-plan.component.ts b/projects/saas-ui/src/app/main/components/billing-plan/billing-plan.component.ts
@@ -5,8 +5,9 @@ import {RouteComponentBaseDirective} from '@project-lib/core/route-component-bas
 import {ColDef} from 'ag-grid-community';
 import {takeUntil} from 'rxjs';
 import {Location} from '@angular/common';
-import {SubscriptionStatus} from '../../enums/subscription-status.enum';
-import {BillingPlanService} from '../../services/billing-plan-service';
+
+import {BillingPlanService} from '../../../shared/services/billing-plan-service';
+import {SubscriptionStatus} from '../../../shared/enum/subscription-status.enum';
 
 @Component({
   selector: 'app-billing-plan',
diff --git a/projects/saas-ui/src/app/main/components/button-renderer/button-renderer.component.ts b/projects/saas-ui/src/app/main/components/button-renderer/button-renderer.component.ts
@@ -3,7 +3,7 @@ import {Router} from '@angular/router';
 import {ToasterService} from '@project-lib/theme/toaster';
 import {ICellRendererAngularComp} from 'ag-grid-angular';
 import {GridApi, ICellRendererParams} from 'ag-grid-community';
-import {BillingPlanService} from '../../services/billing-plan-service';
+import {BillingPlanService} from '../../../shared/services/billing-plan-service';
 import {AddPlanComponent} from '../add-plan/add-plan.component';
 import {FormBuilder, Validators} from '@angular/forms';
 import {Location} from '@angular/common';
diff --git a/projects/saas-ui/src/app/main/components/lead-list/lead-list.component.ts b/projects/saas-ui/src/app/main/components/lead-list/lead-list.component.ts
@@ -4,8 +4,8 @@ import {RouteComponentBaseDirective} from '@project-lib/core/route-component-bas
 import {ColDef} from 'ag-grid-community';
 import {Location} from '@angular/common';
 import {takeUntil} from 'rxjs';
-import {OnBoardingService} from '../../../on-boarding/on-boarding-service';
-import {Lead} from '../../../on-boarding/models';
+import {OnBoardingService} from '../../../shared/services/on-boarding-service';
+import {Lead} from '../../../shared/models';
 import {AnyObject, BackendFilter} from '@project-lib/core/index';
 
 @Component({
diff --git a/projects/saas-ui/src/app/main/components/manage-plans/manage-plans.component.ts b/projects/saas-ui/src/app/main/components/manage-plans/manage-plans.component.ts
@@ -1,15 +1,15 @@
 import {Component, OnInit} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {ColDef, GridApi} from 'ag-grid-community';
-import {OnBoardingService} from '../../../on-boarding/on-boarding-service';
+import {OnBoardingService} from '../../../shared/services/on-boarding-service';
 import {NbToastrService} from '@nebular/theme';
 import {Location} from '@angular/common';
 import {takeUntil} from 'rxjs';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {Plan} from '../../../on-boarding/models';
+import {Plan} from '../../../shared/models';
 import {RouteComponentBaseDirective} from '@project-lib/core/route-component-base';
 import {AnyObject, BackendFilter} from '@project-lib/core/api';
-import {BillingPlanService} from '../../services/billing-plan-service';
+import {BillingPlanService} from '../../../shared/services/billing-plan-service';
 import {ToasterService} from '@project-lib/theme/toaster';
 import {ButtonRendererComponent} from '../button-renderer/button-renderer.component';
 @Component({
diff --git a/projects/saas-ui/src/app/main/components/onboarding-tenant-list/onboarding-tenant-list.component.ts b/projects/saas-ui/src/app/main/components/onboarding-tenant-list/onboarding-tenant-list.component.ts
@@ -4,10 +4,10 @@ import {RouteComponentBaseDirective} from '@project-lib/core/route-component-bas
 import {ColDef} from 'ag-grid-community';
 import {Location} from '@angular/common';
 import {takeUntil} from 'rxjs';
-import {TenantFacadeService} from '../../services/tenant-list-facade.service';
-import {Tenant} from '../../../on-boarding/models';
+import {TenantFacadeService} from '../../../shared/services/tenant-list-facade.service';
+import {Tenant} from '../../../shared/models';
 import {BackendFilter} from '@project-lib/core/api';
-import {TenantStatus} from '../../enums/tenant-status.enum';
+import {TenantStatus} from '../../../shared/enum/tenant-status.enum';
 
 @Component({
   selector: 'app-onboarding-tenant-list',
diff --git a/projects/saas-ui/src/app/main/main.module.ts b/projects/saas-ui/src/app/main/main.module.ts
@@ -7,11 +7,11 @@ import {LeadListComponent} from './components/lead-list/lead-list.component';
 import {NbRadioModule} from '@nebular/theme';
 import {OnboardingTenantListComponent} from './components/onboarding-tenant-list/onboarding-tenant-list.component';
 import {AgGridModule} from 'ag-grid-angular';
-import {TenantFacadeService} from './services/tenant-list-facade.service';
+import {TenantFacadeService} from '../shared/services/tenant-list-facade.service';
 import {ManagePlansComponent} from './components/manage-plans/manage-plans.component';
 import {BillingPlanComponent} from './components/billing-plan/billing-plan.component';
 import {AddPlanComponent} from './components/add-plan/add-plan.component';
-import {BillingPlanService} from './services/billing-plan-service';
+import {BillingPlanService} from '../shared/services/billing-plan-service';
 import {ToasterService} from '@project-lib/theme/toaster';
 import {ButtonRendererComponent} from './components/button-renderer/button-renderer.component';
 
diff --git a/projects/saas-ui/src/app/main/model/tenant.model.ts b/projects/saas-ui/src/app/main/model/tenant.model.ts
diff --git a/projects/saas-ui/src/app/on-boarding/adapters/get-plan-adapter.service.ts b/projects/saas-ui/src/app/on-boarding/adapters/get-plan-adapter.service.ts
@@ -1,5 +1,5 @@
 import {Injectable} from '@angular/core';
-import {Plan} from '../models';
+import {Plan} from '../../shared/models';
 import {pl} from 'date-fns/locale';
 import {ApiModule, IAdapter} from '@project-lib/core/api';
 
diff --git a/projects/saas-ui/src/app/on-boarding/commands/add-lead-command.ts b/projects/saas-ui/src/app/on-boarding/commands/add-lead-command.ts
@@ -1,5 +1,5 @@
 import {ApiService, IAdapter, PostAPICommand} from '@project-lib/core/api';
-import {Lead} from '../models';
+import {Lead} from '../../shared/models';
 
 import {IAnyObject} from '@project-lib/core/i-any-object';
 
diff --git a/projects/saas-ui/src/app/on-boarding/commands/add-tenant-lead.command.ts b/projects/saas-ui/src/app/on-boarding/commands/add-tenant-lead.command.ts
@@ -1,5 +1,5 @@
 import {ApiService, IAdapter, PostAPICommand} from '@project-lib/core/api';
-import {Tenant} from '../models';
+import {Tenant} from '../../shared/models';
 
 import {IAnyObject} from '@project-lib/core/i-any-object';
 
diff --git a/projects/saas-ui/src/app/on-boarding/commands/get-lead-by-id.command.ts b/projects/saas-ui/src/app/on-boarding/commands/get-lead-by-id.command.ts
@@ -1,6 +1,6 @@
 import {GetAPICommand, IAdapter, IApiService} from '@project-lib/core/api';
 
-import {Lead} from '../models';
+import {Lead} from '../../shared/models';
 
 import {IAnyObject} from '@project-lib/core/i-any-object';
 
diff --git a/projects/saas-ui/src/app/on-boarding/commands/get-lead-command.ts b/projects/saas-ui/src/app/on-boarding/commands/get-lead-command.ts
@@ -1,5 +1,5 @@
 import {ApiService, GetListAPICommand, IAdapter} from '@project-lib/core/api';
-import {Lead} from '../models';
+import {Lead} from '../../shared/models';
 
 import {IAnyObject} from '@project-lib/core/i-any-object';
 
diff --git a/projects/saas-ui/src/app/on-boarding/commands/get-plan.command.ts b/projects/saas-ui/src/app/on-boarding/commands/get-plan.command.ts
@@ -1,5 +1,5 @@
 import {IApiService, IAdapter, GetAPICommand} from '@project-lib/core/api';
-import {Plan} from '../models';
+import {Plan} from '../../shared/models';
 
 import {IAnyObject} from '@project-lib/core/i-any-object';
 
diff --git a/projects/saas-ui/src/app/on-boarding/components/add-lead/add-lead.component.ts b/projects/saas-ui/src/app/on-boarding/components/add-lead/add-lead.component.ts
@@ -3,7 +3,7 @@ import {ActivatedRoute, Router} from '@angular/router';
 import {NbToastrService} from '@nebular/theme';
 import {Location} from '@angular/common';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {OnBoardingService} from '../../on-boarding-service';
+import {OnBoardingService} from '../../../shared/services/on-boarding-service';
 import {id} from 'date-fns/locale';
 import {verifyHostBindings} from '@angular/compiler';
 
diff --git a/projects/saas-ui/src/app/on-boarding/components/add-tenant/add-tenant.component.ts b/projects/saas-ui/src/app/on-boarding/components/add-tenant/add-tenant.component.ts
@@ -3,10 +3,10 @@ import {FormGroup, FormBuilder, Validators} from '@angular/forms';
 import {ActivatedRoute, Router} from '@angular/router';
 import {NbToastrService} from '@nebular/theme';
 import {takeUntil} from 'rxjs';
-import {TenantFacadeService} from '../../../main/services/tenant-list-facade.service';
-import {OnBoardingService} from '../../on-boarding-service';
+import {TenantFacadeService} from '../../../shared/services/tenant-list-facade.service';
+import {OnBoardingService} from '../../../shared/services/on-boarding-service';
 import {Location} from '@angular/common';
-import {BillingPlanService} from '../../../main/services/billing-plan-service';
+import {BillingPlanService} from '../../../shared/services/billing-plan-service';
 
 @Component({
   selector: 'app-add-tenant',
diff --git a/projects/saas-ui/src/app/on-boarding/guards/email-verify.guard.ts b/projects/saas-ui/src/app/on-boarding/guards/email-verify.guard.ts
@@ -6,7 +6,7 @@ import {
 } from '@angular/router';
 import {UserSessionStoreService} from '@project-lib/core/index';
 import {Observable, catchError, map, of, tap} from 'rxjs';
-import {OnBoardingService} from '../on-boarding-service';
+import {OnBoardingService} from '../../shared/services/on-boarding-service';
 
 @Injectable({
   providedIn: 'root',
diff --git a/projects/saas-ui/src/app/on-boarding/on-boarding.module.ts b/projects/saas-ui/src/app/on-boarding/on-boarding.module.ts
@@ -7,8 +7,8 @@ import {NbRadioModule} from '@nebular/theme';
 import {EmailVerificationComponent} from './components/email-verification/email-verification.component';
 import {VerificationCompleteComponent} from './components/verification-complete/verification-complete.component';
 import {ReactiveFormsModule} from '@angular/forms';
-import {OnBoardingService} from './on-boarding-service';
-import {TenantFacadeService} from '../main/services/tenant-list-facade.service';
+import {OnBoardingService} from '../shared/services/on-boarding-service';
+import {TenantFacadeService} from '../shared/services/tenant-list-facade.service';
 import {AddTenantComponent} from './components/add-tenant/add-tenant.component';
 
 @NgModule({
diff --git a/projects/saas-ui/src/app/shared/enum/subscription-status.enum.ts b/projects/saas-ui/src/app/shared/enum/subscription-status.enum.ts
diff --git a/projects/saas-ui/src/app/shared/enum/tenant-status.enum.ts b/projects/saas-ui/src/app/shared/enum/tenant-status.enum.ts
diff --git a/projects/saas-ui/src/app/shared/models/address.model.ts b/projects/saas-ui/src/app/shared/models/address.model.ts
diff --git a/projects/saas-ui/src/app/shared/models/index.ts b/projects/saas-ui/src/app/shared/models/index.ts
diff --git a/projects/saas-ui/src/app/shared/models/lead.model.ts b/projects/saas-ui/src/app/shared/models/lead.model.ts
diff --git a/projects/saas-ui/src/app/shared/models/plan.model.ts b/projects/saas-ui/src/app/shared/models/plan.model.ts
@@ -1,5 +1,5 @@
 import {AnyObject} from '@project-lib/core/api';
-import {PlanTier} from '../../shared/enum/plan-tier.enum';
+import {PlanTier} from '../enum/plan-tier.enum';
 
 export class Plan {
   id?: string;
diff --git a/projects/saas-ui/src/app/shared/models/tenant.model.ts b/projects/saas-ui/src/app/shared/models/tenant.model.ts
diff --git a/projects/saas-ui/src/app/shared/services/billing-plan-service.ts b/projects/saas-ui/src/app/shared/services/billing-plan-service.ts
@@ -12,17 +12,16 @@ import {AuthTokenSkipHeader} from '@project-lib/core/constants';
 import {Observable, Subject} from 'rxjs';
 import {GetPlanAdapter} from '../../on-boarding/adapters';
 import {GetPlanCommand} from '../../on-boarding/commands';
-import {Lead, Plan} from '../../on-boarding/models';
-import {Tenant} from '../model/tenant.model';
-import {GetBillingCycles} from '../commands/get-billing-cycles-command';
-import {GetCurrencyDetails} from '../commands/get-currency-command';
-import {GetBillingDetails} from '../commands/get-billing.command';
+import {Lead, Plan} from '../models';
+import {GetBillingCycles} from '../../main/commands/get-billing-cycles-command';
+import {GetCurrencyDetails} from '../../main/commands/get-currency-command';
+import {GetBillingDetails} from '../../main/commands/get-billing.command';
 import {IAnyObject} from '@project-lib/core/i-any-object';
 import {APP_CONFIG} from '@project-lib/app-config';
-import {AddPlanCommand} from '../commands/add-plan.command';
-import {DeletePlanCommand} from '../commands/delete-plan.command';
-import {EditPlanCommand} from '../commands/edit-plan.command';
-import {GetPlanByIdCommand} from '../commands/get-plan-by-id.command';
+import {AddPlanCommand} from '../../main/commands/add-plan.command';
+import {DeletePlanCommand} from '../../main/commands/delete-plan.command';
+import {EditPlanCommand} from '../../main/commands/edit-plan.command';
+import {GetPlanByIdCommand} from '../../main/commands/get-plan-by-id.command';
 
 interface BackendFilter<MT extends object = AnyObject> {
   where?: Where<MT>;
diff --git a/projects/saas-ui/src/app/shared/services/index.ts b/projects/saas-ui/src/app/shared/services/index.ts
@@ -0,0 +1,3 @@
+export * from './billing-plan-service';
+export * from './on-boarding-service';
+export * from './tenant-list-facade.service';
diff --git a/projects/saas-ui/src/app/shared/services/on-boarding-service.ts b/projects/saas-ui/src/app/shared/services/on-boarding-service.ts
@@ -16,9 +16,9 @@ import {
   AddTenantFromLeadCommand,
   AddLeadCommand,
   GetLeadListCommand,
-} from './commands';
-import {GetPlanAdapter} from './adapters';
-import {Lead, Tenant} from './models';
+} from '../../on-boarding/commands';
+import {GetPlanAdapter} from '../../on-boarding/adapters';
+import {Lead, Tenant} from '../models';
 import {APP_CONFIG} from '@project-lib/app-config';
 import {IAnyObject} from '@project-lib/core/i-any-object';
 interface BackendFilter<MT extends object = AnyObject> {
diff --git a/projects/saas-ui/src/app/shared/services/tenant-list-facade.service.ts b/projects/saas-ui/src/app/shared/services/tenant-list-facade.service.ts
@@ -6,14 +6,14 @@ import {
   BackendFilter,
 } from '@project-lib/core/api';
 import {Observable} from 'rxjs';
-import {Tenant} from '../../on-boarding/models';
+import {Tenant} from '../models';
 import {
   AddTenantCommand,
   GetTenantLeadListCommand,
   GetTenantByIdCommand,
   EditTenantCommand,
   DeleteTenantCommand,
-} from '../commands';
+} from '../../main/commands';
 
 import {HttpParams} from '@angular/common/http';
 import {APP_CONFIG} from '@project-lib/app-config';
