refactor: Loans Module (#1150)

Fixes: #1149

src/app/loans/common-resolvers/loan-action-button.resolver.ts

@@ -58,6 +58,8 @@ export class LoanActionButtonResolver implements Resolve<Object> {
             return this.loansService.getLoanScreenReportsData();
         } else if (loanActionButton === 'approve') {
             return this.loansService.getLoanApprovalTemplate(loanId);
+        } else if (loanActionButton === 'add-loan-charge') {
+            return this.loansService.getLoanChargeTemplateResource(loanId);
         } else {
             return undefined;
         }

src/app/loans/common-resolvers/loan-charge-template.resolver.ts

@@ -1,31 +0,0 @@
-/** Angular Imports */
-import { Injectable } from '@angular/core';
-import { Resolve, ActivatedRouteSnapshot  } from '@angular/router';
-
-/** rxjs Imports */
-import { Observable } from 'rxjs';
-
-/** Custom Services */
-import { LoansService } from '../loans.service';
-
-/**
- * Loan Charge Template data resolver.
- */
-@Injectable()
-export class LoanChargeTemplateResolver implements Resolve<Object> {
-
-  /**
-   * @param {LoansService} LoansService loans service.
-   */
-  constructor(private loansService: LoansService) {}
-
-  /**
-   * Returns the Loan Charge Template.
-   * @returns {Observable<any>}
-   */
-  resolve(route: ActivatedRouteSnapshot): Observable<any> {
-    const loanId = route.paramMap.get('loanId');
-    return this.loansService.getLoanChargeTemplateResource(loanId);
-  }
-
-}

src/app/loans/common-resolvers/loan-details-general.resolver.ts

@@ -1,31 +0,0 @@
-/** Angular Imports */
-import { Injectable } from '@angular/core';
-import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
-
-/** rxjs Imports */
-import { Observable } from 'rxjs';
-
-/** Custom Services */
-import { LoansService } from '../loans.service';
-
-/**
- * Clients data resolver.
- */
-@Injectable()
-export class LoanDetailsGeneralResolver implements Resolve<Object> {
-
-    /**
-     * @param {LoansService} LoansService Loans service.
-     */
-    constructor(private loansService: LoansService) { }
-
-    /**
-     * Returns the Loans data.
-     * @returns {Observable<any>}
-     */
-    resolve(route: ActivatedRouteSnapshot): Observable<any> {
-        const loanId = route.parent.paramMap.get('loanId');
-        return this.loansService.getLoanAccountDetails(loanId);
-    }
-
-}

src/app/loans/common-resolvers/loan-details.resolver.ts

@@ -24,7 +24,7 @@ export class LoanDetailsResolver implements Resolve<Object> {
      * @returns {Observable<any>}
      */
     resolve(route: ActivatedRouteSnapshot): Observable<any> {
-        const loanId = route.paramMap.get('loanId');
+        const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
         return this.loansService.getLoanAccountAssociationDetails(loanId);
     }