Merge branch 'test'

backend/services.plr-intake/Models/PlrRecord.cs

@@ -89,8 +89,19 @@ public class PlrRecord : BaseAuditable
 
     public static bool ComputeGoodStanding(string? statusCode, string? statusReasonCode)
     {
-        var goodStandingReasons = new[] { "GS", "PRAC", "TEMPPER", "TI" };
-        return statusCode == "ACTIVE"
-            && goodStandingReasons.Contains(statusReasonCode);
+        // A Licence is in good standing if the Status is "ACTIVE" and the StatusReason is one of a few allowable values.
+        // Additionally, "TI" (Temporary Inactive) and "VW" (Voluntary Withdrawn) are "SUSPENDED" in PLR rather than "ACTIVE", but are still considered to be in good standing.
+        var goodStandingReasons = new[] { "GS", "PRAC", "TEMPPER", "TI", "VW" };
+        var suspendedAllowed = new[] { "TI", "VW" };
+
+        if (statusCode == "ACTIVE")
+        {
+            return goodStandingReasons.Contains(statusReasonCode);
+        }
+        else if (statusCode == "SUSPENDED")
+        {
+            return suspendedAllowed.Contains(statusReasonCode);
+        }
+        return false;
     }
 }

backend/webapi/Infrastructure/HttpClients/Plr/PlrClientDefinitions.cs

@@ -42,9 +42,20 @@ public class PlrRecord
 
     public virtual bool IsGoodStanding()
     {
-        var goodStatndingReasons = new[] { "GS", "PRAC", "TEMPPER", "TI" };
-        return this.StatusCode == "ACTIVE"
-            && goodStatndingReasons.Contains(this.StatusReasonCode);
+        // A Licence is in good standing if the Status is "ACTIVE" and the StatusReason is one of a few allowable values.
+        // Additionally, "TI" (Temporary Inactive) and "VW" (Voluntary Withdrawn) are "SUSPENDED" in PLR rather than "ACTIVE", but are still considered to be in good standing.
+        var goodStandingReasons = new[] { "GS", "PRAC", "TEMPPER", "TI", "VW" };
+        var suspendedAllowed = new[] { "TI", "VW" };
+
+        if (this.StatusCode == "ACTIVE")
+        {
+            return goodStandingReasons.Contains(this.StatusReasonCode);
+        }
+        else if (this.StatusCode == "SUSPENDED")
+        {
+            return suspendedAllowed.Contains(this.StatusReasonCode);
+        }
+        return false;
     }
 }
 

workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements-resource.service.ts

@@ -132,6 +132,11 @@ export class EndorsementsResource {
       )
       .pipe(
         NoContentResponse,
+        tap(() =>
+        this.toastService.openSuccessToast(
+          'Endorsement Request has been approved successfully',
+        ),
+      ),
         catchError((error: HttpErrorResponse) => {
           if (error.status === HttpStatusCode.BadRequest) {
             return of(void 0);

workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements.page.ts

@@ -21,6 +21,7 @@ import {
   map,
   of,
   switchMap,
+  tap,
 } from 'rxjs';
 
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
@@ -30,7 +31,11 @@ import {
   faUser,
   faUserGroup,
 } from '@fortawesome/free-solid-svg-icons';
-import { NavigationService } from '@pidp/presentation';
+import {
+  LOADING_OVERLAY_DEFAULT_MESSAGE,
+  LoadingOverlayService,
+  NavigationService,
+} from '@pidp/presentation';
 
 import { NoContent } from '@bcgov/shared/data-access';
 import {
@@ -115,6 +120,7 @@ export class EndorsementsPage
     viewportService: ViewportService,
     private utilsService: UtilsService,
     fb: FormBuilder,
+    private loadingOverlayService: LoadingOverlayService,
   ) {
     super(dependenciesService);
 
@@ -149,6 +155,7 @@ export class EndorsementsPage
   }
 
   public onApprove(requestId: number): void {
+    this.loadingOverlayService.open(LOADING_OVERLAY_DEFAULT_MESSAGE);
     this.resource
       .approveEndorsementRequest(this.partyService.partyId, requestId)
       .pipe(
@@ -279,6 +286,7 @@ export class EndorsementsPage
   ): Observable<EndorsementRequest[]> {
     return this.resource.getEndorsementRequests(partyId).pipe(
       map((response: EndorsementRequest[] | null) => response ?? []),
+      tap((_) => this.loadingOverlayService.close()),
       map((response: EndorsementRequest[]) =>
         response.filter((res) => res.actionable === true),
       ),