WEB-813: Working Capital loan account modification

src/app/core/http/error-handler.interceptor.ts

@@ -59,8 +59,18 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
     }
 
     // Combine both messages if both exist
-    const errorMessage = nestedMessage ? `${topLevelMessage} ${nestedMessage}` : topLevelMessage;
-
+    let errorMessage = nestedMessage ? `${topLevelMessage} ${nestedMessage}` : topLevelMessage;
+    let parameterName: string | null = null;
+    if (response.error.errors) {
+      if (response.error.errors[0]) {
+        errorMessage =
+          response.error.errors[0].defaultUserMessage.replace(/\\./g, ' ') ||
+          response.error.errors[0].developerMessage.replace(/\\./g, ' ');
+      }
+      if ('parameterName' in response.error.errors[0]) {
+        parameterName = response.error.errors[0].parameterName;
+      }
+    }
     const isClientImage404 = status === 404 && request.url.includes('/clients/') && request.url.includes('/images');
 
     if (!environment.production && !isClientImage404) {
@@ -81,9 +91,12 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
         message: this.translate.instant('errors.error.token.invalid.message')
       });
     } else if (status === 400) {
+      const message = parameterName
+        ? `[${parameterName}] ${errorMessage || 'Invalid parameters were passed in the request!'}`
+        : `${errorMessage || 'Invalid parameters were passed in the request!'}`;
       this.alertService.alert({
         type: this.translate.instant('errors.error.bad.request.type'),
-        message: errorMessage || this.translate.instant('errors.error.bad.request.message')
+        message: message || this.translate.instant('errors.error.bad.request.message')
       });
     } else if (status === 403) {
       this.alertService.alert({

src/app/directives/directives.module.ts

@@ -14,6 +14,7 @@ import { CommonModule } from '@angular/common';
 import { HasPermissionDirective } from './has-permission/has-permission.directive';
 import { FormatAmountDirective } from './format-amount.directive';
 import { ValidateOnFocusDirective } from './validate-on-focus.directive';
+import { PositiveNumberDirective } from './positive-number.directive';
 
 /**
  *  Directives Module
@@ -25,12 +26,14 @@ import { ValidateOnFocusDirective } from './validate-on-focus.directive';
     CommonModule,
     HasPermissionDirective,
     FormatAmountDirective,
-    ValidateOnFocusDirective
+    ValidateOnFocusDirective,
+    PositiveNumberDirective
   ],
   exports: [
     HasPermissionDirective,
     FormatAmountDirective,
-    ValidateOnFocusDirective
+    ValidateOnFocusDirective,
+    PositiveNumberDirective
   ]
 })
 export class DirectivesModule {}

src/app/directives/positive-number.directive.ts

@@ -0,0 +1,29 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Directive, ElementRef, HostListener, inject } from '@angular/core';
+
+@Directive({ selector: '[mifosxPositiveNumber]' })
+export class PositiveNumberDirective {
+  private el = inject(ElementRef);
+
+  @HostListener('keydown', ['$event'])
+  onKeyDown(event: KeyboardEvent): void {
+    const inputElement = this.el.nativeElement;
+
+    // Check if the key is ArrowUp or ArrowDown
+    if (event.key === 'ArrowUp' || event.key === 'ArrowDown') {
+      const currentValue = parseFloat(inputElement.value) || 0;
+
+      if (event.key === 'ArrowDown' && currentValue <= 0) {
+        // Prevent default if trying to decrement below or at 0
+        event.preventDefault();
+      }
+    }
+  }
+}

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

@@ -0,0 +1,48 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { LOAN_PRODUCT_TYPE, LoanProductType } from 'app/products/loan-products/models/loan-product.model';
+import { ActivatedRouteSnapshot } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class LoanBaseResolver {
+  productType = new BehaviorSubject<LoanProductType>(LOAN_PRODUCT_TYPE.LOAN);
+
+  constructor() {}
+
+  protected initialize(route: ActivatedRouteSnapshot): void {
+    const productType = route.queryParams['productType'];
+    if (productType !== null) {
+      if (productType === 'loan') {
+        this.productType.next(LOAN_PRODUCT_TYPE.LOAN);
+      } else if (productType === 'working-capital') {
+        this.productType.next(LOAN_PRODUCT_TYPE.WORKING_CAPITAL);
+      }
+    }
+  }
+
+  get isWorkingCapital(): boolean {
+    return LOAN_PRODUCT_TYPE.WORKING_CAPITAL === this.productType.value;
+  }
+
+  get isLoanProduct(): boolean {
+    return LOAN_PRODUCT_TYPE.LOAN === this.productType.value;
+  }
+
+  get loanProductPath(): string {
+    return this.isLoanProduct ? 'loanproducts' : 'working-capital-loan-products';
+  }
+
+  get loanAccountPath(): string {
+    return this.isLoanProduct ? 'loans' : 'working-capital-loans';
+  }
+}

src/app/loans/common-resolvers/loan-delinquency-actions.resolver.ts

@@ -10,19 +10,25 @@ import { Injectable, inject } from '@angular/core';
 import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 import { LoansService } from '../loans.service';
+import { LoanBaseResolver } from './loan-base.resolver';
 
 @Injectable({
   providedIn: 'root'
 })
-export class LoanDelinquencyActionsResolver {
+export class LoanDelinquencyActionsResolver extends LoanBaseResolver {
   private loansService = inject(LoansService);
 
+  constructor() {
+    super();
+  }
+
   /**
    * Returns the Loans with Association data.
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
+    this.initialize(route);
     const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
-    return this.loansService.getDelinquencyActions(loanId);
+    return this.loansService.getDelinquencyActions(this.loanAccountPath, loanId);
   }
 }

src/app/loans/common-resolvers/loan-delinquency-data.resolver.ts

@@ -15,20 +15,29 @@ import { Observable } from 'rxjs';
 
 /** Custom Services */
 import { LoansService } from '../loans.service';
+import { LoanBaseResolver } from './loan-base.resolver';
 
 /**
  * Loan Delinquency data resolver.
  */
 @Injectable()
-export class LoanDelinquencyDataResolver {
+export class LoanDelinquencyDataResolver extends LoanBaseResolver {
   private loansService = inject(LoansService);
 
+  constructor() {
+    super();
+  }
   /**
    * Returns the Loans with Association data.
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
+    this.initialize(route);
     const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
-    return this.loansService.getDelinquencyData(loanId);
+    if (!isNaN(+loanId)) {
+      if (this.isLoanProduct) {
+        return this.loansService.getDelinquencyData(loanId);
+      }
+    }
   }
 }

src/app/loans/common-resolvers/loan-delinquency-tags.resolver.ts

@@ -15,20 +15,28 @@ import { Observable } from 'rxjs';
 
 /** Custom Services */
 import { LoansService } from '../loans.service';
+import { LoanBaseResolver } from './loan-base.resolver';
 
 /**
- * Clients data resolver.
+ * Loan Delinquency Tags data resolver.
  */
 @Injectable()
-export class LoanDelinquencyTagsResolver {
+export class LoanDelinquencyTagsResolver extends LoanBaseResolver {
   private loansService = inject(LoansService);
 
+  constructor() {
+    super();
+  }
+
   /**
    * Returns the Loans with Association data.
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
+    this.initialize(route);
     const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
-    return this.loansService.getDelinquencyTags(loanId);
+    if (!isNaN(+loanId)) {
+      return this.loansService.getDelinquencyTags(this.loanAccountPath, loanId);
+    }
   }
 }

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);
   }
 }