Merge pull request #2698 from JaySoni1/WEB-314-replace-custom-api-of-tasks-service-ts

WEB-314 replace custom api of tasks-service.ts

Author: gkbishnoi07

src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.component.ts

@@ -20,7 +20,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { LoansService } from '@fineract/client';
 import { ErrorDialogComponent } from 'app/shared/error-dialog/error-dialog.component';
 import { SystemService } from 'app/system/system.service';
-import { TasksService } from 'app/tasks/tasks.service';
+import { LoanAccountLockService } from '@fineract/client';
 import { MatButton, MatIconButton } from '@angular/material/button';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { MatCheckbox } from '@angular/material/checkbox';
@@ -94,13 +94,14 @@ export class LoanLockedComponent implements OnInit {
    * @param {Router} router Router for navigation.
    * @param {MatDialog} dialog Dialog reference.
    * @param {TranslateService} translateService Translate Service.
+   * @param {LoanAccountLockService} tasksService Loan Account Lock Service.
    */
   constructor(
     private route: ActivatedRoute,
     private router: Router,
     private loansService: LoansService,
     private systemService: SystemService,
-    private tasksService: TasksService,
+    private loanAccountLockService: LoanAccountLockService,
     private dialog: MatDialog,
     private translateService: TranslateService
   ) {}
@@ -122,7 +123,7 @@ export class LoanLockedComponent implements OnInit {
   }
 
   getLoansLocked(page: number) {
-    this.tasksService.getAllLoansLocked(page, this.itemsToRead).subscribe((data: any) => {
+    this.loanAccountLockService.retrieveLockedAccounts({ page: page }).subscribe((data: any) => {
       this.loans = data.content;
       this.dataSource = new MatTableDataSource(this.loans);
       this.dataSource.paginator = this.paginator;

src/app/system/manage-jobs/cob-workflow/loan-locked/loan-locked.resolver.ts

@@ -1,22 +1,22 @@
 import { Injectable } from '@angular/core';
 import { Router, RouterStateSnapshot, ActivatedRouteSnapshot } from '@angular/router';
-import { TasksService } from 'app/tasks/tasks.service';
+import { LoanAccountLockService } from '@fineract/client';
 import { Observable, of } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
 })
 export class LoanLockedResolver {
   /**
-   * @param {TasksService} tasksService Tasks service.
+   * @param {LoanAccountLockService} loanAccountLockService Loan Account Lock service.
    */
-  constructor(private tasksService: TasksService) {}
+  constructor(private loanAccountLockService: LoanAccountLockService) {}
 
   /**
    * Returns all the loans data.
    * @returns {Observable<any>}
    */
   resolve(): Observable<any> {
-    return this.tasksService.getAllLoansLocked(0, 200);
+    return this.loanAccountLockService.retrieveLockedAccounts();
   }
 }

src/app/tasks/checker-inbox-and-tasks-tabs/checker-inbox/checker-inbox.component.ts

@@ -19,7 +19,7 @@ import {
 import { MatDialog } from '@angular/material/dialog';
 
 /** Custom Services */
-import { TasksService } from '../../tasks.service';
+import { MakerCheckerOr4EyeFunctionalityService } from '@fineract/client';
 import { SettingsService } from 'app/settings/settings.service';
 
 /** Dialog Components */
@@ -89,7 +89,7 @@ export class CheckerInboxComponent implements OnInit {
    * @param {Dates} dateUtils Date Utils.
    * @param {router} router Router.
    * @param {SettingsService} settingsService Settings Service.
-   * @param {TasksService} tasksService Tasks Service.
+   * @param {MakerCheckerOr4EyeFunctionalityService} makerCheckerService Maker Checker Service.
    * @param {FormBuilder} formBuilder Form Builder.
    */
   constructor(
@@ -98,7 +98,7 @@ export class CheckerInboxComponent implements OnInit {
     private dateUtils: Dates,
     private router: Router,
     private translateService: TranslateService,
-    private tasksService: TasksService,
+    private makerCheckerService: MakerCheckerOr4EyeFunctionalityService,
     private settingsService: SettingsService,
     private formBuilder: UntypedFormBuilder
   ) {
@@ -137,7 +137,7 @@ export class CheckerInboxComponent implements OnInit {
       makerDateTimeFrom: this.dateUtils.formatDate(this.makerCheckerSearchForm.value.makerDateTimeFrom, dateFormat),
       makerDateTimeto: this.dateUtils.formatDate(this.makerCheckerSearchForm.value.makerDateTimeto, dateFormat)
     };
-    this.tasksService.getMakerCheckerData(makerCheckerSearchParams).subscribe((response: any) => {
+    this.makerCheckerService.retrieveCommands(makerCheckerSearchParams).subscribe((response: any) => {
       this.searchData = response;
       if (this.searchData.length === 0) {
         this.noSearchedData = true;
@@ -218,7 +218,7 @@ export class CheckerInboxComponent implements OnInit {
     const listSelectedAccounts = this.selection.selected;
     let approvedAccounts = 0;
     listSelectedAccounts.forEach((element: any) => {
-      this.tasksService.executeMakerCheckerAction(element.id, action).subscribe((response: any) => {
+      this.makerCheckerService.approveMakerCheckerEntry(element.id, action).subscribe((response: any) => {
         approvedAccounts++;
         if (selectedAccounts === approvedAccounts) {
           this.reload();
@@ -232,7 +232,7 @@ export class CheckerInboxComponent implements OnInit {
     const listSelectedAccounts = this.selection.selected;
     let approvedAccounts = 0;
     listSelectedAccounts.forEach((element: any) => {
-      this.tasksService.deleteMakerChecker(element.id).subscribe((response: any) => {
+      this.makerCheckerService.deleteMakerCheckerEntry(element.id).subscribe((response: any) => {
         approvedAccounts++;
         if (selectedAccounts === approvedAccounts) {
           this.reload();

src/app/tasks/checker-inbox-and-tasks-tabs/client-approval/client-approval.component.ts

@@ -24,7 +24,7 @@ import { FormfieldBase } from 'app/shared/form-dialog/formfield/model/formfield-
 import { DatepickerBase } from 'app/shared/form-dialog/formfield/model/datepicker-base';
 
 /** Custom Services */
-import { TasksService } from '../../tasks.service';
+import { BatchAPIService } from '@fineract/client';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
 import { NgIf, NgFor, KeyValuePipe } from '@angular/common';
@@ -81,15 +81,15 @@ export class ClientApprovalComponent {
    * @param {Dates} dateUtils Date Utils.
    * @param {router} router Router.
    * @param {SettingsService} settingsService Settings Service.
-   * @param {TasksService} tasksService Tasks Service.
+   * @param {BatchAPIService} batchAPIService Batch API Service.
    */
   constructor(
     private route: ActivatedRoute,
     private dialog: MatDialog,
     private dateUtils: Dates,
     private router: Router,
     private settingsService: SettingsService,
-    private tasksService: TasksService
+    private batchAPIService: BatchAPIService
   ) {
     this.route.data.subscribe((data: { groupedClientData: any }) => {
       this.groupedClients = _.groupBy(data.groupedClientData.pageItems, 'officeName');
@@ -170,7 +170,7 @@ export class ClientApprovalComponent {
       const batchData = { requestId: reqId++, relativeUrl: url, method: 'POST', body: bodyData };
       this.batchRequests.push(batchData);
     });
-    this.tasksService.submitBatchData(this.batchRequests).subscribe((response: any) => {
+    this.batchAPIService.handleBatchRequests({ batchRequest: this.batchRequests }).subscribe((response: any) => {
       response.forEach((responseEle: any) => {
         if ((responseEle.statusCode = '200')) {
           activatedAccounts++;

src/app/tasks/checker-inbox-and-tasks-tabs/loan-approval/loan-approval.component.ts

@@ -22,7 +22,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { ConfirmationDialogComponent } from 'app/shared/confirmation-dialog/confirmation-dialog.component';
 
 /** Custom Services */
-import { TasksService } from '../../tasks.service';
+import { BatchAPIService, LoansService } from '@fineract/client';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
 import { TranslateService } from '@ngx-translate/core';
@@ -91,7 +91,8 @@ export class LoanApprovalComponent {
    * @param {Dates} dateUtils Date Utils.
    * @param {router} router Router.
    * @param {SettingsService} settingsService Settings Service.
-   * @param {TasksService} tasksService Tasks Service.
+   * @param {BatchAPIService} batchAPIService Batch API Service.
+   * @param {LoansService} loan Loan Service.
    */
   constructor(
     private route: ActivatedRoute,
@@ -100,7 +101,8 @@ export class LoanApprovalComponent {
     private router: Router,
     private translateService: TranslateService,
     private settingsService: SettingsService,
-    private tasksService: TasksService
+    private batchAPIService: BatchAPIService,
+    private loansService: LoansService
   ) {
     this.route.data.subscribe((data: { officesData: any; loansData: any }) => {
       this.offices = data.officesData;
@@ -200,7 +202,7 @@ export class LoanApprovalComponent {
       const batchData = { requestId: reqId++, relativeUrl: url, method: 'POST', body: bodyData };
       this.batchRequests.push(batchData);
     });
-    this.tasksService.submitBatchData(this.batchRequests).subscribe((response: any) => {
+    this.batchAPIService.handleBatchRequests({ batchRequest: this.batchRequests }).subscribe((response: any) => {
       response.forEach((responseEle: any) => {
         if ((responseEle.statusCode = '200')) {
           approvedAccounts++;
@@ -219,7 +221,7 @@ export class LoanApprovalComponent {
   }
 
   loanResource() {
-    this.tasksService.getAllLoansToBeApproved().subscribe((response: any) => {
+    this.loansService.retrieveAll27().subscribe((response: any) => {
       this.loans = response.pageItems;
       this.loans = this.loans.filter((account: any) => {
         return account.status.waitingForDisbursal === true;

src/app/tasks/checker-inbox-and-tasks-tabs/loan-disbursal/loan-disbursal.component.ts

@@ -21,7 +21,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { ConfirmationDialogComponent } from 'app/shared/confirmation-dialog/confirmation-dialog.component';
 
 /** Custom Services */
-import { TasksService } from '../../tasks.service';
+import { BatchAPIService, LoansService } from '@fineract/client';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
 import { TranslateService } from '@ngx-translate/core';
@@ -76,15 +76,17 @@ export class LoanDisbursalComponent {
    * @param {Dates} dateUtils Date Utils.
    * @param {router} router Router.
    * @param {SettingsService} settingsService Settings Service.
-   * @param {TasksService} tasksService Tasks Service.
+   * @param {BatchAPIService} batchAPIService Batch API Service.
+   * @param {LoansService} loansService Loans Service.
    */
   constructor(
     private route: ActivatedRoute,
     private dialog: MatDialog,
     private dateUtils: Dates,
     private settingsService: SettingsService,
     private translateService: TranslateService,
-    private tasksService: TasksService
+    private batchAPIService: BatchAPIService,
+    private loansService: LoansService
   ) {
     this.route.data.subscribe((data: { loansData: any }) => {
       this.loans = data.loansData.pageItems;
@@ -152,7 +154,7 @@ export class LoanDisbursalComponent {
       const batchData = { requestId: reqId++, relativeUrl: url, method: 'POST', body: bodyData };
       this.batchRequests.push(batchData);
     });
-    this.tasksService.submitBatchData(this.batchRequests).subscribe((response: any) => {
+    this.batchAPIService.handleBatchRequests({ batchRequest: this.batchRequests }).subscribe((response: any) => {
       response.forEach((responseEle: any) => {
         if ((responseEle.statusCode = '200')) {
           approvedAccounts++;
@@ -166,7 +168,7 @@ export class LoanDisbursalComponent {
   }
 
   loanResource() {
-    this.tasksService.getAllLoansToBeDisbursed().subscribe((response: any) => {
+    this.loansService.retrieveAll27().subscribe((response: any) => {
       this.loans = response.pageItems;
       this.loans = this.loans.filter((account: any) => {
         return account.status.waitingForDisbursal === true;

src/app/tasks/checker-inbox-and-tasks-tabs/reschedule-loan/reschedule-loan.component.ts

@@ -22,7 +22,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { ConfirmationDialogComponent } from 'app/shared/confirmation-dialog/confirmation-dialog.component';
 
 /** Custom Services */
-import { TasksService } from '../../tasks.service';
+import { BatchAPIService } from '@fineract/client';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
 import { TranslateService } from '@ngx-translate/core';
@@ -85,7 +85,7 @@ export class RescheduleLoanComponent {
    * @param {Dates} dateUtils Date Utils.
    * @param {router} router Router.
    * @param {SettingsService} settingsService Settings Service.
-   * @param {TasksService} tasksService Tasks Service.
+   * @param {BatchAPIService} batchAPIService Batch API Service.
    */
   constructor(
     private route: ActivatedRoute,
@@ -94,7 +94,7 @@ export class RescheduleLoanComponent {
     private router: Router,
     private settingsService: SettingsService,
     private translateService: TranslateService,
-    private tasksService: TasksService
+    private batchAPIService: BatchAPIService
   ) {
     this.route.data.subscribe((data: { recheduleLoansData: any }) => {
       this.loans = data.recheduleLoansData;
@@ -164,7 +164,7 @@ export class RescheduleLoanComponent {
       const batchData = { requestId: reqId++, relativeUrl: url, method: 'POST', body: bodyData };
       this.batchRequests.push(batchData);
     });
-    this.tasksService.submitBatchData(this.batchRequests).subscribe((response: any) => {
+    this.batchAPIService.handleBatchRequests({ batchRequest: this.batchRequests }).subscribe((response: any) => {
       this.reload();
     });
   }

src/app/tasks/common-resolvers/getCheckerInboxDetail.resolver.ts

@@ -6,24 +6,24 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { TasksService } from '../tasks.service';
+import { AuditsService } from '@fineract/client';
 
 /**
  * Checker Inbox Detail resolver.
  */
 @Injectable()
 export class GetCheckerInboxDetailResolver {
   /**
-   * @param {TasksService} tasksService Tasks service.
+   * @param {AuditsService} auditsService Audits service.
    */
-  constructor(private tasksService: TasksService) {}
+  constructor(private auditsService: AuditsService) {}
 
   /**
    * Returns the detail data of the checker inbox.
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
-    const checkerId = route.paramMap.get('id');
-    return this.tasksService.getCheckerInboxDetail(checkerId);
+    const checkerId = Number(route.paramMap.get('id'));
+    return this.auditsService.retrieveAuditEntries({ resourceId: checkerId });
   }
 }

src/app/tasks/common-resolvers/getGroupedClientsData.resolver.ts

@@ -5,23 +5,23 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { TasksService } from '../tasks.service';
+import { ClientService } from '@fineract/client';
 
 /**
  * Grouped Client Data data resolver.
  */
 @Injectable()
 export class GetGroupedClientsData {
   /**
-   * @param {TasksService} tasksService Tasks service.
+   * @param {ClientService} clientService Client service.
    */
-  constructor(private tasksService: TasksService) {}
+  constructor(private clientService: ClientService) {}
 
   /**
    * Returns the grouped client data.
    * @returns {Observable<any>}
    */
   resolve(): Observable<any> {
-    return this.tasksService.getGroupedClientsData();
+    return this.clientService.retrieveAll21();
   }
 }

src/app/tasks/common-resolvers/getLoansToBeApproved.resolver.ts

@@ -5,23 +5,23 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { TasksService } from '../tasks.service';
+import { LoansService } from '@fineract/client';
 
 /**
  * Loans data resolver.
  */
 @Injectable()
 export class GetLoansToBeApproved {
   /**
-   * @param {TasksService} tasksService Tasks service.
+   * @param {LoansService} loansService Loans service.
    */
-  constructor(private tasksService: TasksService) {}
+  constructor(private loansService: LoansService) {}
 
   /**
    * Returns all the loans data.
    * @returns {Observable<any>}
    */
   resolve(): Observable<any> {
-    return this.tasksService.getAllLoansToBeApproved();
+    return this.loansService.retrieveAll27();
   }
 }