Merge pull request #2686 from JaySoni1/WEB-300-replace-custom-api-of-organization-service-ts

WEB-300  replace custom api of organization-service.ts

Author: gkbishnoi07

src/app/customApis.service.ts

@@ -193,3 +193,41 @@ export class AccountTransfersService {
       );
   }
 }
+
+@Injectable({
+  providedIn: 'root'
+})
+export class OrganizationService {
+  constructor(
+    private http: HttpClient,
+    private settingsService: any
+  ) {}
+
+  /**
+   * @param urlSuffix of Bulk-Import
+   * @param officeId Office ID for template retrieval
+   * @param staffId Staff ID for template retrieval
+   * @param legalFormType Legal Form type fortemplate retrieval
+   * @returns {Observable<any>} Import Template
+   */
+  getImportTemplate(urlSuffix: string, officeId: any, staffId: any, legalFormType: string): Observable<any> {
+    let httpParams = new HttpParams()
+      .set('tenantIdentifier', 'default')
+      .set('locale', this.settingsService.language.code)
+      .set('dateFormat', this.settingsService.dateFormat);
+    if (officeId) {
+      httpParams = httpParams.set('officeId', officeId.toString());
+    }
+    if (staffId) {
+      httpParams = httpParams.set('staffId', staffId.toString());
+    }
+    if (legalFormType.length) {
+      httpParams = httpParams.set('legalFormType', legalFormType);
+    }
+    return this.http.get(`${urlSuffix}/downloadtemplate`, {
+      params: httpParams,
+      responseType: 'arraybuffer',
+      observe: 'response'
+    });
+  }
+}

src/app/loans/loans-view/loan-account-actions/adjust-loan-charge/adjust-loan-charge.component.ts

@@ -7,8 +7,7 @@ import {
   ReactiveFormsModule
 } from '@angular/forms';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
-import { LoansService, LoanChargesService } from '@fineract/client';
-import { OrganizationService } from 'app/organization/organization.service';
+import { LoansService, LoanChargesService, PaymentTypeService } from '@fineract/client';
 import { SettingsService } from 'app/settings/settings.service';
 import { MatSlideToggle } from '@angular/material/slide-toggle';
 import { CdkTextareaAutosize } from '@angular/cdk/text-field';
@@ -49,6 +48,7 @@ export class AdjustLoanChargeComponent implements OnInit {
    * @param {ActivatedRoute} route Activated Route.
    * @param {Router} router Router for navigation.
    * @param {SettingsService} settingsService Settings Service
+   * @param {PaymentTypeService} paymentTypeService Payment Type Service
    */
   constructor(
     private formBuilder: UntypedFormBuilder,
@@ -57,7 +57,7 @@ export class AdjustLoanChargeComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router,
     private settingsService: SettingsService,
-    private organizationService: OrganizationService
+    private paymentTypeService: PaymentTypeService
   ) {
     this.loanId = this.route.snapshot.params['loanId'];
     this.chargeId = this.route.snapshot.params['id'];
@@ -93,7 +93,7 @@ export class AdjustLoanChargeComponent implements OnInit {
   }
 
   setRepaymentLoanDetails() {
-    this.organizationService.getPaymentTypes().subscribe((paymentTypes: any) => {
+    this.paymentTypeService.getAllPaymentTypes().subscribe((paymentTypes: any) => {
       this.paymentTypes = paymentTypes;
     });
   }

src/app/loans/loans-view/loan-account-actions/approve-loan/approve-loan.component.ts

@@ -12,7 +12,6 @@ import { InputAmountComponent } from '../../../../shared/input-amount/input-amou
 import { CdkTextareaAutosize } from '@angular/cdk/text-field';
 import { FormatNumberPipe } from '../../../../pipes/format-number.pipe';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { MatIcon } from '@angular/material/icon';
 
 /**
  * Approve Loan component.

src/app/loans/loans-view/loan-account-actions/disburse-to-savings-account/disburse-to-savings-account.component.ts

@@ -9,7 +9,6 @@ import { InputAmountComponent } from '../../../../shared/input-amount/input-amou
 import { CdkTextareaAutosize } from '@angular/cdk/text-field';
 import { FormatNumberPipe } from '../../../../pipes/format-number.pipe';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { MatIcon } from '@angular/material/icon';
 
 @Component({
   selector: 'mifosx-disburse-to-savings-account',

src/app/loans/loans-view/loan-account-actions/disburse/disburse.component.ts

@@ -13,7 +13,6 @@ import { MatSlideToggle } from '@angular/material/slide-toggle';
 import { CdkTextareaAutosize } from '@angular/cdk/text-field';
 import { FormatNumberPipe } from '../../../../pipes/format-number.pipe';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { MatIcon } from '@angular/material/icon';
 
 /**
  * Disburse Loan Option

src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts

@@ -8,7 +8,7 @@ import { LoansService, LoanTransactionsService } from '@fineract/client';
 import { ConfirmationDialogComponent } from 'app/shared/confirmation-dialog/confirmation-dialog.component';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
-import { OrganizationService } from 'app/organization/organization.service';
+import { PaymentTypeService } from '@fineract/client';
 import { FormfieldBase } from 'app/shared/form-dialog/formfield/model/formfield-base';
 import { InputBase } from 'app/shared/form-dialog/formfield/model/input-base';
 import { SelectBase } from 'app/shared/form-dialog/formfield/model/select-base';
@@ -116,7 +116,7 @@ export class ViewTransactionComponent implements OnInit {
     public dialog: MatDialog,
     private translateService: TranslateService,
     private settingsService: SettingsService,
-    private organizationService: OrganizationService,
+    private paymentTypeService: PaymentTypeService,
     private alertService: AlertService
   ) {
     this.route.data.subscribe((data: { loansAccountTransaction: any }) => {
@@ -159,8 +159,8 @@ export class ViewTransactionComponent implements OnInit {
 
   ngOnInit(): void {
     if (this.allowChargeback) {
-      this.organizationService
-        .getPaymentTypesWithCode()
+      this.paymentTypeService
+        .getAllPaymentTypes()
         .toPromise()
         .then((data) => {
           this.paymentTypeOptions = data;

src/app/organization/adhoc-query/adhoc-query-template.resolver.ts

@@ -5,23 +5,22 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { OrganizationService } from 'app/organization/organization.service';
-
+import { AdhocQueryApiService } from '@fineract/client';
 /**
  * Adhoc Query template data resolver.
  */
 @Injectable()
 export class AdhocQueryTemplateResolver {
   /**
-   * @param {OrganizationService} organizationService Organization service.
+   * @param {AdhocQueryApiService} adhocQueryApiService Adhoc Query API service.
    */
-  constructor(private organizationService: OrganizationService) {}
+  constructor(private adhocQueryApiService: AdhocQueryApiService) {}
 
   /**
    * Returns the adhoc query template data.
    * @returns {Observable<any>}
    */
   resolve(): Observable<any> {
-    return this.organizationService.getAdhocQueryTemplate();
+    return this.adhocQueryApiService.template();
   }
 }

src/app/organization/adhoc-query/common-resolvers/adhoc-queries.resolver.ts

@@ -5,23 +5,23 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { OrganizationService } from '../../organization.service';
+import { AdhocQueryApiService } from '@fineract/client';
 
 /**
  * Adhoc Queries data resolver.
  */
 @Injectable()
 export class AdhocQueriesResolver {
   /**
-   * @param {OrganizationService} organizationService Organization service.
+   * @param {AdhocQueryApiService} adhocQueryApiService Adhoc Query API service.
    */
-  constructor(private organizationService: OrganizationService) {}
+  constructor(private adhocQueryApiService: AdhocQueryApiService) {}
 
   /**
    * Returns the adhoc queries data.
    * @returns {Observable<any>}
    */
   resolve(): Observable<any> {
-    return this.organizationService.getAdhocQueries();
+    return this.adhocQueryApiService.retrieveAll2();
   }
 }

src/app/organization/adhoc-query/common-resolvers/adhoc-query-and-template.resolver.ts

@@ -6,24 +6,24 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { OrganizationService } from 'app/organization/organization.service';
+import { AdhocQueryApiService } from '@fineract/client';
 
 /**
  * Adhoc Query and template data resolver.
  */
 @Injectable()
 export class AdhocQueryAndTemplateResolver {
   /**
-   * @param {OrganizationService} organizationService Organization service.
+   * @param {AdhocQueryApiService} adhocQueryApiService Adhoc Query API service.
    */
-  constructor(private organizationService: OrganizationService) {}
+  constructor(private adhocQueryApiService: AdhocQueryApiService) {}
 
   /**
    * Returns the adhoc query and template data.
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
     const adhocQueryId = route.paramMap.get('id');
-    return this.organizationService.getAdhocQueryAndTemplate(adhocQueryId);
+    return this.adhocQueryApiService.retrieveAll2();
   }
 }

src/app/organization/adhoc-query/common-resolvers/adhoc-query.resolver.ts

@@ -6,24 +6,26 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { OrganizationService } from 'app/organization/organization.service';
+import { AdhocQueryApiService } from '@fineract/client';
 
 /**
  * Adhoc Query data resolver.
  */
 @Injectable()
 export class AdhocQueryResolver {
   /**
-   * @param {OrganizationService} organizationService Organization service.
+   * @param {AdhocQueryApiService} adhocQueryApiService Adhoc Query API service.
    */
-  constructor(private organizationService: OrganizationService) {}
+  constructor(private adhocQueryApiService: AdhocQueryApiService) {}
 
   /**
    * Returns the adhoc query data.
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
     const adhocQueryId = route.paramMap.get('id');
-    return this.organizationService.getAdhocQuery(adhocQueryId);
+    return this.adhocQueryApiService.retrieveAdHocQuery({
+      adHocId: Number(adhocQueryId)
+    });
   }
 }