Added changes to support nested folders

Author: annahileta

src/main/java/com/docusign/controller/eSignature/examples/EG045ControllerDeleteRestoreEnvelope.java

@@ -62,7 +62,12 @@ protected Object doWork(WorkArguments args, ModelMap model,
                 null);
 
         DoneExample.createDefault(getTextForCodeExampleByApiType().ExampleName)
-                .withMessage(getTextForCodeExampleByApiType().AdditionalPage.get(0).ResultsPageText)
+                .withMessage(
+                    MessageFormat.format(
+                        getTextForCodeExampleByApiType().AdditionalPage.get(0).ResultsPageText,
+                        envelopeId
+                    )
+                )
                 .withRedirect(EXAMPLE_NUMBER + RESTORE_ENVELOPE)
                 .addToModel(model, config);
 
@@ -94,14 +99,16 @@ public String postRestoreEnvelope(WorkArguments args, ModelMap model) throws Exc
         ApiClient apiClient = createApiClient(session.getBasePath(), user.getAccessToken());
 
         FoldersResponse availableFolders = DeleteRestoreEnvelopeService.getFolders(apiClient, accountId);
-        Folder folder = availableFolders.getFolders().stream()
-                .filter(f -> f.getName().equals(folderName))
-                .findFirst()
-                .orElse(null);
+        Folder folder = DeleteRestoreEnvelopeService.getFolderIdByName(availableFolders.getFolders(), folderName);
 
         if(folder == null) {
             DoneExample.createDefault(getTextForCodeExampleByApiType().ExampleName)
-                    .withMessage(getTextForCodeExampleByApiType().AdditionalPage.get(1).ResultsPageText)
+                    .withMessage(
+                        MessageFormat.format(
+                            getTextForCodeExampleByApiType().AdditionalPage.get(1).ResultsPageText,
+                            folderName
+                        )
+                    )
                     .withRedirect(EXAMPLE_NUMBER + RESTORE_ENVELOPE)
                     .addToModel(model, config);
 
@@ -119,6 +126,7 @@ public String postRestoreEnvelope(WorkArguments args, ModelMap model) throws Exc
                 .withMessage(
                         MessageFormat.format(
                                 getTextForCodeExampleByApiType().ResultsPageText,
+                                envelopeId,
                                 folder.getType(),
                                 folderName
                         )

src/main/java/com/docusign/controller/eSignature/services/DeleteRestoreEnvelopeService.java

@@ -2,10 +2,12 @@
 
 import com.docusign.esign.api.FoldersApi;
 import com.docusign.esign.client.ApiClient;
+import com.docusign.esign.model.Folder;
 import com.docusign.esign.model.FoldersRequest;
 import com.docusign.esign.model.FoldersResponse;
 
 import java.util.Collections;
+import java.util.List;
 
 public final class DeleteRestoreEnvelopeService {
     public static FoldersResponse moveEnvelopeToFolder(
@@ -31,4 +33,20 @@ public static FoldersResponse getFolders(
         FoldersApi foldersApi = new FoldersApi(apiClient);
         return foldersApi.callList(accountId);
     }
+
+    public static Folder getFolderIdByName(List<Folder> folders, String targetName) {
+        for (Folder folder : folders) {
+            if (folder.getName().equals(targetName)) {
+                return folder;
+            }
+
+            if (folder.getFolders() != null && !folder.getFolders().isEmpty()) {
+                Folder nestedFolder = DeleteRestoreEnvelopeService.getFolderIdByName(folder.getFolders(), targetName);
+                if (nestedFolder != null) {
+                    return nestedFolder;
+                }
+            }
+        }
+        return null;
+    }
 }