WEB-813: Working Capital loan account modification

Author: alberto-art3ch

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

@@ -40,7 +40,7 @@ export class LoanDetailsResolver {
       if (resolvedProductType === LOAN_PRODUCT_TYPE.LOAN) {
         return this.loansService.getLoanAccountAssociationDetails(loanId);
       } else {
-        return this.loansService.getWorkingCapitalLoannDetails(loanId);
+        return this.loansService.getWorkingCapitalLoanDetails(loanId);
       }
     }
   }

src/app/loans/common-resolvers/loans-account-and-template.resolver.ts

@@ -15,20 +15,24 @@ import { Observable } from 'rxjs';
 
 /** Custom Services */
 import { LoansService } from '../loans.service';
+import { LoanProductService } from 'app/products/loan-products/services/loan-product.service';
 
 /**
  * Loan accounts template data resolver.
  */
 @Injectable()
 export class LoansAccountAndTemplateResolver {
   private loansService = inject(LoansService);
+  private loanProductService = inject(LoanProductService);
 
   /**
    * Returns the loan account template data.
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
     const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
-    return this.loansService.getLoansAccountAndTemplateResource(loanId);
+    return this.loanProductService.isLoanProduct
+      ? this.loansService.getLoansAccountAndTemplateResource(loanId)
+      : this.loansService.getWorkingCapitalLoanDetails(loanId);
   }
 }

src/app/loans/edit-loans-account/edit-loans-account.component.ts

@@ -77,14 +77,23 @@ export class EditLoansAccountComponent extends LoanProductBaseComponent {
     super();
     this.loanProductService.initialize(LoanProductBaseComponent.resolveProductTypeDefault(this.route, 'loan'));
 
+    this.loanId = this.route.snapshot.params['loanId'];
     this.route.data.subscribe(
       (data: { loansAccountAndTemplate: any; loanProductsBasicDetails: LoanProductBasicDetails[] }) => {
         this.loansAccountAndTemplate = data.loansAccountAndTemplate;
-        this.loansAccountProductTemplate = data.loansAccountAndTemplate;
+        this.loansAccountAndTemplate['edit'] = true;
+        if (this.loanProductService.isLoanProduct) {
+          this.loansAccountProductTemplate = data.loansAccountAndTemplate;
+        } else if (this.loanProductService.isWorkingCapital) {
+          this.loansAccountProductTemplate = data.loansAccountAndTemplate;
+          this.getWorkingCapitalLoanProductTemplate(
+            this.loansAccountProductTemplate.client.id,
+            this.loansAccountProductTemplate.product.id
+          );
+        }
         this.loanProductsBasicDetails = data.loanProductsBasicDetails;
       }
     );
-    this.loanId = this.route.snapshot.params['loanId'];
   }
 
   /**
@@ -95,6 +104,15 @@ export class EditLoansAccountComponent extends LoanProductBaseComponent {
     const templateData: any = $event;
     this.loansAccountProductTemplate = templateData.loanData ? templateData.loanData : templateData;
     this.currencyCode = this.loansAccountProductTemplate.currency.code;
+    this.productDetails = this.loansAccountProductTemplate.product;
+    if (templateData.loanData) {
+      this.loansAccountProductTemplate = templateData.loanData;
+      this.loansAccountProductTemplate.options = {
+        delinquencyBucketOptions: templateData.delinquencyBucketOptions,
+        fundOptions: templateData.fundOptions,
+        periodFrequencyTypeOptions: templateData.periodFrequencyTypeOptions
+      };
+    }
     if (this.loansAccountProductTemplate.loanProductId) {
       this.loansService
         .getLoansCollateralTemplateResource(this.loansAccountProductTemplate.loanProductId)
@@ -104,6 +122,12 @@ export class EditLoansAccountComponent extends LoanProductBaseComponent {
     }
   }
 
+  getWorkingCapitalLoanProductTemplate(clientId: number, productId: number) {
+    this.loansService.getWorkingCapitalLoansAccountTemplate(clientId, productId).subscribe((response: any) => {
+      this.setTemplate(response);
+    });
+  }
+
   setProductType($event: any): void {
     this.productType = $event;
     this.loanProductService.initialize(this.productType);
@@ -131,7 +155,11 @@ export class EditLoansAccountComponent extends LoanProductBaseComponent {
           !this.loansAccountChargesStep?.pristine)
       );
     } else if (this.loanProductService.isWorkingCapital) {
-      return false;
+      return (
+        this.loansAccountDetailsForm.valid &&
+        this.loansAccountTermsForm.valid &&
+        (!this.loansAccountDetailsForm.pristine || !this.loansAccountTermsForm.pristine)
+      );
     }
   }
 
@@ -241,15 +269,60 @@ export class EditLoansAccountComponent extends LoanProductBaseComponent {
     loansAccountData.allowPartialPeriodInterestCalculation = loansAccountData.allowPartialPeriodInterestCalculation;
     delete loansAccountData.allowPartialPeriodInterestCalculation;
 
-    this.loansService.updateLoansAccount(this.loanId, loansAccountData).subscribe((response: any) => {
-      this.router.navigate(['../'], {
-        queryParams: {
-          productType: this.loanProductService.productType.value
-        },
-        relativeTo: this.route
+    this.loansService
+      .updateLoansAccount(this.loanProductService.loanAccountPath, this.loanId, loansAccountData)
+      .subscribe((response: any) => {
+        this.router.navigate(['../'], {
+          queryParams: {
+            productType: this.loanProductService.productType.value
+          },
+          relativeTo: this.route
+        });
       });
-    });
   }
 
-  submitWorkingCapitalProduct(): void {}
+  submitWorkingCapitalProduct(): void {
+    const locale = this.settingsService.language.code;
+    const dateFormat = this.settingsService.dateFormat;
+    const payload = {
+      ...this.loansAccount,
+      clientId: this.loansAccountProductTemplate.client.id,
+      submittedOnDate: this.dateUtils.formatDate(this.loansAccount.submittedOnDate, dateFormat),
+      expectedDisbursementDate: this.dateUtils.formatDate(this.loansAccount.expectedDisbursementDate, dateFormat),
+      locale,
+      dateFormat
+    };
+
+    if (this.productDetails.allowAttributeOverrides) {
+      if (
+        !Object.hasOwn(this.productDetails.allowAttributeOverrides, 'periodPaymentFrequency') ||
+        this.productDetails.allowAttributeOverrides.periodPaymentFrequency === false
+      ) {
+        delete payload['repaymentEvery'];
+      }
+      if (
+        !Object.hasOwn(this.productDetails.allowAttributeOverrides, 'periodPaymentFrequencyType') ||
+        this.productDetails.allowAttributeOverrides.periodPaymentFrequencyType === false
+      ) {
+        delete payload['repaymentFrequencyType'];
+      }
+      if (
+        !Object.hasOwn(this.productDetails.allowAttributeOverrides, 'discountDefault') ||
+        this.productDetails.allowAttributeOverrides.discountDefault === false
+      ) {
+        delete payload['discount'];
+      }
+    }
+
+    this.loansService
+      .updateLoansAccount(this.loanProductService.loanAccountPath, this.loanId, payload)
+      .subscribe((response: any) => {
+        this.router.navigate(['../'], {
+          queryParams: {
+            productType: this.loanProductService.productType.value
+          },
+          relativeTo: this.route
+        });
+      });
+  }
 }

src/app/loans/loans-account-stepper/loans-account-details-step/loans-account-details-step.component.html

@@ -172,7 +172,11 @@ <h3 class="mat-h3 flex-fill">{{ 'labels.heading.Savings Linkage' | translate }}<
       <fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
     </button>
     @if (loanId) {
-      <button mat-raised-button [routerLink]="['../', 'general']">
+      <button
+        mat-raised-button
+        [routerLink]="['../', 'general']"
+        [queryParams]="{ productType: loanProductService.productType.value }"
+      >
         {{ 'labels.buttons.Cancel' | translate }}
       </button>
     }

src/app/loans/loans-account-stepper/loans-account-details-step/loans-account-details-step.component.ts

@@ -118,34 +118,40 @@ export class LoansAccountDetailsStepComponent extends LoanProductBaseComponent i
     this.placeHolderLabel = this.translateService.instant('labels.text.Search');
     this.noEntriesFoundLabel = this.translateService.instant('labels.text.No data found');
     this.maxDate = this.settingsService.maxFutureDate;
-    this.productList = this.loanProductsBasicDetails.sort(this.commons.dynamicSort('name'));
+    this.productList = this.loanProductsBasicDetails
+      ? this.loanProductsBasicDetails.sort(this.commons.dynamicSort('name'))
+      : [];
     if (this.loansAccountTemplate) {
+      this.addFormControlsBasedOnProductType();
+      let loanProductId: number | null = null;
+      this.loansAccountDetailsForm.patchValue({
+        fundId: this.loansAccountTemplate.fundId,
+        submittedOnDate:
+          this.loansAccountTemplate.timeline.submittedOnDate &&
+          new Date(this.loansAccountTemplate.timeline.submittedOnDate),
+        expectedDisbursementDate:
+          this.loansAccountTemplate.timeline.expectedDisbursementDate &&
+          new Date(this.loansAccountTemplate.timeline.expectedDisbursementDate),
+        externalId: this.loansAccountTemplate.externalId
+      });
       if (this.loansAccountTemplate.loanProductId) {
-        this.addFormControlsBasedOnProductType();
+        loanProductId = this.loansAccountTemplate.loanProductId;
         this.loansAccountDetailsForm.patchValue({
-          productId: this.loansAccountTemplate.loanProductId,
-          submittedOnDate:
-            this.loansAccountTemplate.timeline.submittedOnDate &&
-            new Date(this.loansAccountTemplate.timeline.submittedOnDate),
           loanOfficerId: this.loansAccountTemplate.loanOfficerId,
-          loanPurposeId: this.loansAccountTemplate.loanPurposeId,
-          fundId: this.loansAccountTemplate.fundId,
-          expectedDisbursementDate:
-            this.loansAccountTemplate.timeline.expectedDisbursementDate &&
-            new Date(this.loansAccountTemplate.timeline.expectedDisbursementDate),
-          externalId: this.loansAccountTemplate.externalId
+          loanPurposeId: this.loansAccountTemplate.loanPurposeId
         });
-        this.productSelected = this.loanProductsBasicDetails.find(
-          (p: LoanProductBasicDetails) =>
-            p.productType === this.loanProductService.productType.value &&
-            p.id === this.loansAccountTemplate.loanProductId
-        );
-        if (this.productSelected) {
-          this.loansAccountDetailsForm.patchValue({
-            productId: this.productSelected.shortName
-          });
-          this.loanProductSelected = true;
-        }
+      } else if (this.loanProductService.isWorkingCapital) {
+        loanProductId = this.loansAccountTemplate.product.id;
+      }
+      this.productSelected = this.loanProductsBasicDetails.find(
+        (p: LoanProductBasicDetails) =>
+          p.productType === this.loanProductService.productType.value && p.id === loanProductId
+      );
+      if (this.productSelected) {
+        this.loansAccountDetailsForm.patchValue({
+          productId: this.productSelected.shortName
+        });
+        this.loanProductSelected = true;
       }
     }
     this.filterFormCtrl.valueChanges.pipe(takeUntil(this._onDestroy)).subscribe(() => {

src/app/loans/loans-account-stepper/loans-account-preview-step/loans-account-preview-step.component.html

@@ -457,7 +457,11 @@ <h3 class="mat-h3 flex-98">{{ 'labels.heading.Overdue Charges' | translate }}</h
     <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
     {{ 'labels.buttons.Previous' | translate }}
   </button>
-  <button mat-raised-button [routerLink]="['../..']">
+  <button
+    mat-raised-button
+    [routerLink]="['../..']"
+    [queryParams]="{ productType: loanProductService.productType.value }"
+  >
     {{ 'labels.buttons.Cancel' | translate }}
   </button>
   <button mat-raised-button color="primary" (click)="submitEvent.emit()">

src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html

@@ -791,7 +791,11 @@ <h4 class="mat-h4 flex-98">{{ 'labels.heading.Collaterals Data' | translate }}</
       <fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
     </button>
     @if (loanId) {
-      <button mat-raised-button [routerLink]="['../', 'general']">
+      <button
+        mat-raised-button
+        [routerLink]="['../', 'general']"
+        [queryParams]="{ productType: loanProductService.productType.value }"
+      >
         {{ 'labels.buttons.Cancel' | translate }}
       </button>
     }

src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts

@@ -317,10 +317,22 @@ export class LoansAccountTermsStepComponent extends LoanProductBaseComponent imp
     } else if (this.loanProductService.isWorkingCapital && this.loansAccountProductTemplate) {
       this.loansAccountTermsData = this.loansAccountProductTemplate;
       this.currency = this.loansAccountTermsData.currency;
-      this.termFrequencyTypeData = this.loansAccountTermsData.options.periodFrequencyTypeOptions;
-      this.loansAccountTermsForm.patchValue({
-        principalAmount: this.loansAccountTermsData.product.principal
-      });
+      this.termFrequencyTypeData = this.loansAccountTermsData.options?.periodFrequencyTypeOptions;
+      if (this.loanId != null && 'accountNo' in this.loansAccountTemplate) {
+        this.loansAccountTermsData = this.loansAccountTemplate;
+        this.loansAccountTermsForm.patchValue({
+          discount: this.loansAccountTermsData.discount || '',
+          principalAmount: this.loansAccountTermsData.proposedPrincipal,
+          periodPaymentRate: this.loansAccountTermsData.periodPaymentRate,
+          totalPayment: this.loansAccountTermsData.balance?.totalPayment,
+          repaymentEvery: this.loansAccountTermsData.repaymentEvery,
+          periodPaymentFrequencyType: this.loansAccountTermsData.repaymentFrequencyType?.id
+        });
+      } else {
+        this.loansAccountTermsForm.patchValue({
+          principalAmount: this.loansAccountTermsData.product.principal
+        });
+      }
       this.allowAttributeOverrides = this.loansAccountProductTemplate.product.allowAttributeOverrides;
       if (
         !this.allowAttributeOverrides.periodPaymentFrequency ||

src/app/loans/loans.service.ts

@@ -203,7 +203,7 @@ export class LoansService {
     return this.http.get(`/loans/${loanId}`, { params: httpParams });
   }
 
-  getWorkingCapitalLoannDetails(loanId: string) {
+  getWorkingCapitalLoanDetails(loanId: string) {
     const httpParams = new HttpParams().set('associations', 'all');
     return this.http.get(`/working-capital-loans/${loanId}`, { params: httpParams });
   }
@@ -536,8 +536,8 @@ export class LoansService {
     return this.http.get(`/standinginstructions`, { params: httpParams });
   }
 
-  updateLoansAccount(loanId: any, loanData: any): Observable<any> {
-    return this.http.put(`/loans/${loanId}`, loanData);
+  updateLoansAccount(productType: string, loanId: any, loanData: any): Observable<any> {
+    return this.http.put(`/${productType}/${loanId}`, loanData);
   }
 
   getTemplateData(templateId: any, loanId: any): Observable<any> {