Update logic of case 1 and case 2

Author: NanSigmaBohdanMoroz

DocuSign.Workspaces/DocuSign.Workspaces/ClientApp/src/components/RequestFormPhysician.js

@@ -337,7 +337,7 @@ export const RequestFormPhysician = ({
               disabled={
                 requesting ||
                 !selectedPhysician ||
-                !uploadedFiles.some((f) => f.isForSignature) ||
+                uploadedFiles.length === 0 ||
                 !request.email ||
                 errors.email
               }

DocuSign.Workspaces/DocuSign.Workspaces/ClientApp/src/components/SelectDocuments.js

@@ -9,21 +9,34 @@ const listToSign = [
     id: 21,
     name: 'Engagement Agreement.pdf',
     path: '/Engagement Agreement placeholder.pdf',
+    isForSignature: true,
   },
   {
     id: 22,
     name: 'IRA Products Agreement.pdf',
     path: '/IRA Products Agreement.pdf',
+    isForSignature: true,
   },
   {
     id: 23,
     name: 'ETF Products Agreement.pdf',
     path: '/ETF PRODUCTS AGREEMENT.pdf',
+    isForSignature: true,
   },
 ];
 const uploadRequest = [
-  { id: 11, name: 'Pay Stub.pdf', path: '/Tax Return.pdf' },
-  { id: 12, name: 'Tax Return.pdf', path: '/Pay Statement.pdf' },
+  { 
+    id: 11,
+    name: 'Pay Stub.pdf',
+    path: '/Tax Return.pdf',
+    isForSignature: false 
+},
+  { 
+    id: 12, 
+    name: 'Tax Return.pdf', 
+    path: '/Pay Statement.pdf', 
+    isForSignature: false 
+  },
 ];
 
 export const SelectDocuments = ({ onAddDocuments, requesting = false, onPrevious }) => {

DocuSign.Workspaces/DocuSign.Workspaces/ClientApp/src/pages/UseCaseOne/index.js

@@ -79,8 +79,8 @@ export const UseCaseOnePage = () => {
         body: JSON.stringify(payload),
       });
       if (!res.ok) {
-        toast.error(`${t('Common.ServerError')}${res.status}`);
-        throw new Error(`${t('Common.ServerError')}${res.status}`);
+        const message = await res.text();
+        throw new Error(message || `${t('Common.ServerError')}${res.status}`);
       }
       const workspaceId = await res.text();
 

DocuSign.Workspaces/DocuSign.Workspaces/ClientApp/src/pages/UseCaseTwo/index.js

@@ -63,7 +63,8 @@ export const UseCaseTwoPage = () => {
       });
 
       if (!res.ok) {
-        throw new Error(`${t('Common.ServerError')}${res.status}`);
+        const message = await res.text();
+        throw new Error(message || `${t('Common.ServerError')}${res.status}`);
       }
       const physician = await res.json();
       setListPhysician(physician);

DocuSign.Workspaces/DocuSign.Workspaces/Controllers/CarePlans/CarePlansController.cs

@@ -13,10 +13,28 @@ public class CarePlansController(ICarePlansService carePlansService) : Controlle
 {
     [HttpGet]
     [Route("/api/care-plans/physicians")]
-    public async Task<List<PhysicianModel>> GetPhysicians()
+    public async Task<IActionResult> GetPhysicians()
     {
-        var physicians = await carePlansService.GetPhysician();
-        return physicians;
+        try
+        {
+            var physicians = await carePlansService.GetPhysician();
+            return Ok(physicians);
+        }
+        catch (ApplicationApiException ex)
+        {
+            var message = ex.Details?.ErrorDescription ?? ex.Details?.Error ?? ex.Message;
+            return BadRequest(message);
+        }
+        catch (Docusign.IAM.SDK.Models.Errors.ErrorDetails e)
+        {
+            return e.StatusCode == 401 ?
+                BadRequest("Please check that the default account has access to the workspaces.") :
+                BadRequest(e.Message);
+        }
+        catch (Exception e)
+        {
+            return BadRequest(e.Message);
+        }
     }
 
     [HttpPost]

DocuSign.Workspaces/DocuSign.Workspaces/Controllers/WealthManagement/WealthManagementClientController.cs

@@ -1,7 +1,9 @@
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using DocuSign.Workspaces.Domain.Workspaces;
 using DocuSign.Workspaces.Domain.Workspaces.Models;
+using DocuSign.Workspaces.Infrastructure.Exceptions;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DocuSign.Workspaces.Controllers.WealthManagement;
@@ -10,17 +12,51 @@ public class WealthManagementClientController(IWealthManagementClient wealthMana
 {
     [HttpPost]
     [Route("/api/workspaces/create")]
-    public async Task<string> CreateWorkspaces([FromBody] CreateWorkspacesModel workspacesModel)
+    public async Task<IActionResult> CreateWorkspaces([FromBody] CreateWorkspacesModel workspacesModel)
     {
-        var workspaceId = await wealthManagementClient.CreateWorkspaces(workspacesModel);
-        return workspaceId;
+        try
+        {
+            var workspaceId = await wealthManagementClient.CreateWorkspaces(workspacesModel);
+            return Ok(workspaceId);
+        }
+        catch (ApplicationApiException ex)
+        {
+            var message = ex.Details?.ErrorDescription ?? ex.Details?.Error ?? ex.Message;
+            return BadRequest(message);
+        }
+        catch (Docusign.IAM.SDK.Models.Errors.ErrorDetails e)
+        {
+            return e.StatusCode == 401 ?
+                BadRequest("Please check that the default account has access to the workspaces.") :
+                BadRequest(e.Message);
+        }
+        catch (Exception e)
+        {
+            return BadRequest(e.Message);
+        }
     }
 
     [HttpPost]
     [Route("/api/workspaces/add-selected-documents")]
-    public async Task<List<EnvelopeModel>> AddSelectedDocuments([FromBody] WorkspaceAddDocumentsModel model)
+    public async Task<IActionResult> AddSelectedDocuments([FromBody] HandleDocumentsModel model)
     {
-        var envelopes = await wealthManagementClient.AddSelectedDocumentsForClientPackage(model);
-        return envelopes;
+        try
+        {
+            var envelopes = await wealthManagementClient.HandleDocuments(model);
+            return Ok(envelopes);
+        }
+        catch (ApplicationApiException ex)
+        {
+            var message = ex.Details?.ErrorDescription ?? ex.Details?.Error ?? ex.Message;
+            return BadRequest(message);
+        }
+        catch (Docusign.IAM.SDK.Models.Errors.ErrorDetails e)
+        {
+            return BadRequest(e.Message);
+        }
+        catch (Exception e)
+        {
+            return BadRequest(e.Message);
+        }
     }
 }

DocuSign.Workspaces/DocuSign.Workspaces/Domain/Workspaces/IWealthManagementClient.cs

@@ -8,5 +8,5 @@ public interface IWealthManagementClient
 {
     Task<string> CreateWorkspaces(CreateWorkspacesModel createWorkspacesModel);
 
-    Task<List<EnvelopeModel>> AddSelectedDocumentsForClientPackage(WorkspaceAddDocumentsModel createModel);
+    Task<List<ResponseWealthManagementModel>> HandleDocuments(HandleDocumentsModel createModel);
 }

DocuSign.Workspaces/DocuSign.Workspaces/Domain/Workspaces/Models/EnvelopeModel.cs

@@ -2,7 +2,7 @@
 
 namespace DocuSign.Workspaces.Domain.Workspaces.Models;
 
-public class WorkspaceAddDocumentsModel
+public class HandleDocumentsModel
 {
     public string WorkspaceId { get; set; }
     public List<Document> Documents { get; set; }
@@ -18,4 +18,5 @@ public class Document
 {
     public string Base64String { get; set; }
     public string Name { get; set; }
+    public bool IsForSignature { get; set; }
 }

…ces/Models/WorkspaceAddDocumentsModel.cs …orkspaces/Models/HandleDocumentsModel.csDocuSign.Workspaces/DocuSign.Workspaces/Domain/Workspaces/Models/WorkspaceAddDocumentsModel.cs renamed to DocuSign.Workspaces/DocuSign.Workspaces/Domain/Workspaces/Models/HandleDocumentsModel.cs DocuSign.Workspaces/DocuSign.Workspaces/Domain/Workspaces/Models/WorkspaceAddDocumentsModel.cs renamed to DocuSign.Workspaces/DocuSign.Workspaces/Domain/Workspaces/Models/HandleDocumentsModel.cs

@@ -0,0 +1,3 @@
+namespace DocuSign.Workspaces.Domain.Workspaces.Models;
+
+public record ResponseWealthManagementModel(string Name, string Status);