From 30fc345bb040682968835788c5ee7b6a53d3ecad Mon Sep 17 00:00:00 2001
From: Paul Huliganga <paje0101@gmail.com>
Date: Tue, 3 Mar 2026 23:10:10 -0500
Subject: [PATCH] Sort templates alphabetically by Short_Name__c in email
 subject and document order

- Updated DocusignCompositeEnvelopeBuilder.cls to sort documents and subject by Short_Name__c
- Modified Docusign_Envelope_Templates_V3.flow-meta.xml: repositioned elements and added filter for Short_Name__c not null
---
 .../DocusignCompositeEnvelopeBuilder.cls      |  17 +-
 ...ocusignCompositeEnvelopeBuilder.cls.backup | 251 ++++++++++++++++++
 ...cusign_Envelope_Templates_V3.flow-meta.xml |  41 +--
 3 files changed, 289 insertions(+), 20 deletions(-)
 create mode 100644 composite-envelope-builder/force-app/main/default/classes/DocusignCompositeEnvelopeBuilder.cls.backup

diff --git a/composite-envelope-builder/force-app/main/default/classes/DocusignCompositeEnvelopeBuilder.cls b/composite-envelope-builder/force-app/main/default/classes/DocusignCompositeEnvelopeBuilder.cls
index de6f2d6..405c814 100644
--- a/composite-envelope-builder/force-app/main/default/classes/DocusignCompositeEnvelopeBuilder.cls
+++ b/composite-envelope-builder/force-app/main/default/classes/DocusignCompositeEnvelopeBuilder.cls
@@ -65,6 +65,7 @@ global with sharing class DocusignCompositeEnvelopeBuilder {
             
             List<dfsle.Document> documents = new List<dfsle.Document>();
             List<String> docNames = new List<String>();
+            Map<String, String> labelToId = new Map<String, String>();
             for (String templateId : sortedTemplateIds) {
                 String label;
                 if (templateShortNames.containsKey(templateId)) {
@@ -74,13 +75,23 @@ global with sharing class DocusignCompositeEnvelopeBuilder {
                 } else {
                     label = templateId;
                 }
+                labelToId.put(label, templateId);
+                docNames.add(label);
+            }
+            docNames.sort();
+            List<String> sortedIds = new List<String>();
+            for (String label : docNames) {
+                sortedIds.add(labelToId.get(label));
+            }
+            for (Integer i = 0; i < sortedIds.size(); i++) {
+                String templateId = sortedIds[i];
+                String label = docNames[i];
                 documents.add(
                     dfsle.Document.fromTemplate(
                         dfsle.UUID.parse(templateId),
                         label
                     )
                 );
-                docNames.add(label);
             }
             myEnvelope = myEnvelope.withDocuments(documents);
             
@@ -93,7 +104,7 @@ global with sharing class DocusignCompositeEnvelopeBuilder {
             // Use combined name as the first document label so it appears in Status
             if (!documents.isEmpty()) {
                 documents[0] = dfsle.Document.fromTemplate(
-                    dfsle.UUID.parse(sortedTemplateIds[0]),
+                    dfsle.UUID.parse(sortedIds[0]),
                     combinedName
                 );
                 myEnvelope = myEnvelope.withDocuments(documents);
@@ -116,7 +127,7 @@ global with sharing class DocusignCompositeEnvelopeBuilder {
                 }
             }
             List<String> bodyParts = new List<String>();
-            for (String templateId : sortedTemplateIds) {
+            for (String templateId : sortedIds) {
                 if (templateBodies.containsKey(templateId)) {
                     bodyParts.add(templateBodies.get(templateId));
                 }
diff --git a/composite-envelope-builder/force-app/main/default/classes/DocusignCompositeEnvelopeBuilder.cls.backup b/composite-envelope-builder/force-app/main/default/classes/DocusignCompositeEnvelopeBuilder.cls.backup
new file mode 100644
index 0000000..c5c26a5
--- /dev/null
+++ b/composite-envelope-builder/force-app/main/default/classes/DocusignCompositeEnvelopeBuilder.cls.backup
@@ -0,0 +1,251 @@
+/**
+ * @description Combines multiple Docusign templates into a single composite envelope
+ *              using the dfsle Apex Toolkit (Docusign for Salesforce managed package).
+ *              Recipients are resolved from Client_Case__c lookup fields.
+ * @author Paul Huliganga
+ * @date 2026-02-25
+ */
+global with sharing class DocusignCompositeEnvelopeBuilder {
+    
+    // ============================================================
+    // CONFIGURATION: Update these constants if field/role names change
+    // ============================================================
+    
+    // API names of the lookup fields on Client_Case__c that point to recipient records
+    // These are the "Select Lookup Field" values from the Docusign template recipient config
+    private static final String FIELD_SERVICE_COORDINATOR = 'Service_Coordinator__c';
+    private static final String FIELD_DOCUSIGN_RECIPIENT  = 'Docusign_Recipient_1__c';
+    
+    // Role names must match EXACTLY what's configured in the Docusign templates
+    private static final String ROLE_SERVICE_COORDINATOR  = 'Service Coordinator';
+    private static final String ROLE_DOCUSIGN_RECIPIENT   = 'Docusign Recipient #1';
+    
+    @InvocableMethod(
+        label='Send Composite Docusign Envelope' 
+        description='Combines multiple Docusign templates into a single envelope using dfsle Apex Toolkit'
+        category='Docusign'
+    )
+    public static List<DocusignEnvelopeResult> sendCompositeEnvelope(List<DocusignEnvelopeRequest> requests) {
+        List<DocusignEnvelopeResult> results = new List<DocusignEnvelopeResult>();
+        
+        if (requests == null || requests.isEmpty()) {
+            return buildErrorResult('No request provided');
+        }
+        
+        DocusignEnvelopeRequest req = requests[0];
+        DocusignEnvelopeResult result = new DocusignEnvelopeResult();
+        
+        try {
+            // Validate request
+            DocusignEnvelopeRequestHandler.validateRequest(req);
+            
+            // Create empty envelope linked to the source record
+            dfsle.Envelope myEnvelope = dfsle.EnvelopeService.getEmptyEnvelope(
+                new dfsle.Entity(req.recordId)
+            );
+            
+            // Build document list from templates (deduplicated and sorted)
+            List<String> sortedTemplateIds = new List<String>(new Set<String>(req.templateIds));
+            sortedTemplateIds.sort();
+            
+            // Query template names for document labels (shows in Docusign Status)
+            Map<String, String> templateNames = new Map<String, String>();
+            for (dfsle__EnvelopeConfiguration__c config : [
+                SELECT dfsle__DocuSignId__c, Name 
+                FROM dfsle__EnvelopeConfiguration__c
+                WHERE dfsle__DocuSignId__c IN :sortedTemplateIds
+            ]) {
+                templateNames.put(config.dfsle__DocuSignId__c, config.Name);
+            }
+            
+            List<dfsle.Document> documents = new List<dfsle.Document>();
+            List<String> docNames = new List<String>();
+            for (String templateId : sortedTemplateIds) {
+                String label = templateNames.containsKey(templateId) 
+                    ? stripLanguageSuffix(templateNames.get(templateId))
+                    : templateId;
+                documents.add(
+                    dfsle.Document.fromTemplate(
+                        dfsle.UUID.parse(templateId),
+                        label
+                    )
+                );
+                docNames.add(label);
+            }
+            myEnvelope = myEnvelope.withDocuments(documents);
+            
+            // Set combined template names as the envelope document name
+            // (shows in Docusign Status "Document Name" column)
+            String combinedName = String.join(docNames, ', ');
+            if (combinedName.length() > 255) {
+                combinedName = combinedName.left(252) + '...';
+            }
+            // Use combined name as the first document label so it appears in Status
+            if (!documents.isEmpty()) {
+                documents[0] = dfsle.Document.fromTemplate(
+                    dfsle.UUID.parse(sortedTemplateIds[0]),
+                    combinedName
+                );
+                myEnvelope = myEnvelope.withDocuments(documents);
+            }
+            
+            // Resolve recipients from Client_Case__c lookup fields
+            List<dfsle.Recipient> recipients = resolveRecipients(req.recordId);
+            myEnvelope = myEnvelope.withRecipients(recipients);
+            
+            // Set email subject if provided
+            if (String.isNotBlank(req.emailSubject)) {
+                myEnvelope = myEnvelope.withEmail(req.emailSubject, '');
+            }
+            
+            // Send the envelope
+            myEnvelope = dfsle.EnvelopeService.sendEnvelope(myEnvelope, true);
+            
+            // Success
+            result.envelopeId = String.valueOf(myEnvelope.docuSignId);
+            result.success = true;
+            result.errorMessage = null;
+            
+            logResult(sortedTemplateIds.size(), result.envelopeId, 'Success (' + String.join(docNames, ', ') + ')', null);
+            
+        } catch (Exception e) {
+            result.success = false;
+            result.errorMessage = e.getMessage();
+            result.envelopeId = null;
+            
+            logResult(
+                req.templateIds != null ? req.templateIds.size() : 0,
+                null, 'Error',
+                e.getMessage() + '\n' + e.getStackTraceString()
+            );
+            
+            if (e instanceof System.LimitException) {
+                throw e;
+            }
+        }
+        
+        results.add(result);
+        return results;
+    }
+    
+    /**
+     * @description Resolves recipients from Client_Case__c lookup fields.
+     *              Queries the case record and related contacts to get name/email.
+     * @param recordId The Client_Case__c record ID
+     * @return List of dfsle.Recipient objects with role mappings
+     */
+    private static List<dfsle.Recipient> resolveRecipients(String recordId) {
+        // Query the Client_Case__c record with recipient lookup fields
+        // NOTE: Adjust field API names if they differ in your org
+        String query = 'SELECT Id, '
+            + FIELD_SERVICE_COORDINATOR + ', '
+            + FIELD_DOCUSIGN_RECIPIENT
+            + ' FROM Client_Case__c WHERE Id = :recordId LIMIT 1';
+        
+        Client_Case__c caseRecord = Database.query(query);
+        
+        List<dfsle.Recipient> recipients = new List<dfsle.Recipient>();
+        Integer routingOrder = 1;
+        
+        // Recipient 1: Service Coordinator
+        Id serviceCoordinatorId = (Id) caseRecord.get(FIELD_SERVICE_COORDINATOR);
+        if (serviceCoordinatorId != null) {
+            recipients.add(buildRecipient(serviceCoordinatorId, ROLE_SERVICE_COORDINATOR, routingOrder++, recordId));
+        }
+        
+        // Recipient 2: Docusign Recipient #1
+        Id docusignRecipientId = (Id) caseRecord.get(FIELD_DOCUSIGN_RECIPIENT);
+        if (docusignRecipientId != null) {
+            recipients.add(buildRecipient(docusignRecipientId, ROLE_DOCUSIGN_RECIPIENT, routingOrder++, recordId));
+        }
+        
+        if (recipients.isEmpty()) {
+            throw new IllegalArgumentException('No recipients found on the Client Case record. '
+                + 'Please ensure Service Coordinator and Docusign Recipient #1 are populated.');
+        }
+        
+        return recipients;
+    }
+    
+    /**
+     * @description Builds a dfsle.Recipient from a Contact/User lookup ID
+     * @param recipientId The Contact or User record ID
+     * @param roleName The Docusign template role name
+     * @param routingOrder Signing order
+     * @param sourceRecordId The source Client_Case__c record ID
+     * @return dfsle.Recipient configured for the role
+     */
+    private static dfsle.Recipient buildRecipient(Id recipientId, String roleName, Integer routingOrder, String sourceRecordId) {
+        // Determine if this is a Contact or User
+        String objectType = recipientId.getSObjectType().getDescribe().getName();
+        
+        String recipientName;
+        String recipientEmail;
+        
+        if (objectType == 'Contact') {
+            Contact c = [SELECT Id, Name, Email FROM Contact WHERE Id = :recipientId LIMIT 1];
+            recipientName = c.Name;
+            recipientEmail = c.Email;
+        } else if (objectType == 'User') {
+            User u = [SELECT Id, Name, Email FROM User WHERE Id = :recipientId LIMIT 1];
+            recipientName = u.Name;
+            recipientEmail = u.Email;
+        } else {
+            throw new IllegalArgumentException('Unsupported recipient type: ' + objectType 
+                + '. Expected Contact or User.');
+        }
+        
+        if (String.isBlank(recipientEmail)) {
+            throw new IllegalArgumentException('No email found for ' + roleName + ' (' + recipientName + '). '
+                + 'Please ensure the recipient has a valid email address.');
+        }
+        
+        return dfsle.Recipient.fromSource(
+            recipientName,
+            recipientEmail,
+            null,                                    // phone (optional)
+            roleName,                                // must match template role exactly
+            new dfsle.Entity(sourceRecordId)          // source record for merge fields
+        );
+    }
+    
+    private static void logResult(Integer templateCount, String envelopeId, String status, String errorMessage) {
+        System.debug(LoggingLevel.INFO, '=== Docusign Composite Envelope ===');
+        System.debug(LoggingLevel.INFO, 'Templates: ' + templateCount);
+        System.debug(LoggingLevel.INFO, 'Envelope ID: ' + envelopeId);
+        System.debug(LoggingLevel.INFO, 'Status: ' + status);
+        if (String.isNotBlank(errorMessage)) {
+            System.debug(LoggingLevel.ERROR, 'Error: ' + errorMessage);
+        }
+    }
+    
+    /**
+     * @description Strips language suffixes like " - English" or " - Spanish" from template names
+     * @param name Template name
+     * @return Cleaned template name
+     */
+    @TestVisible
+    private static String stripLanguageSuffix(String name) {
+        if (String.isBlank(name)) return name;
+        // Remove common language suffixes (case-insensitive)
+        String cleaned = name;
+        for (String suffix : new List<String>{
+            ' - English', ' - Spanish', ' - French',
+            ' - Anglais', ' - Espagnol', ' - Français'
+        }) {
+            if (cleaned.endsWithIgnoreCase(suffix)) {
+                cleaned = cleaned.left(cleaned.length() - suffix.length());
+                break;
+            }
+        }
+        return cleaned.trim();
+    }
+    
+    private static List<DocusignEnvelopeResult> buildErrorResult(String errorMessage) {
+        DocusignEnvelopeResult result = new DocusignEnvelopeResult();
+        result.success = false;
+        result.errorMessage = errorMessage;
+        result.envelopeId = null;
+        return new List<DocusignEnvelopeResult>{ result };
+    }
+}
diff --git a/composite-envelope-builder/force-app/main/default/flows/Docusign_Envelope_Templates_V3.flow-meta.xml b/composite-envelope-builder/force-app/main/default/flows/Docusign_Envelope_Templates_V3.flow-meta.xml
index f7c980b..b47d4f2 100644
--- a/composite-envelope-builder/force-app/main/default/flows/Docusign_Envelope_Templates_V3.flow-meta.xml
+++ b/composite-envelope-builder/force-app/main/default/flows/Docusign_Envelope_Templates_V3.flow-meta.xml
@@ -3,8 +3,8 @@
     <actionCalls>
         <name>Send_Composite_Envelope</name>
         <label>Send Composite Envelope</label>
-        <locationX>50</locationX>
-        <locationY>1000</locationY>
+        <locationX>182</locationX>
+        <locationY>1082</locationY>
         <actionName>DocusignCompositeEnvelopeBuilder</actionName>
         <actionType>apex</actionType>
         <connector>
@@ -49,7 +49,7 @@
     <assignments>
         <name>Add_Template_ID</name>
         <label>Add Template ID</label>
-        <locationX>50</locationX>
+        <locationX>270</locationX>
         <locationY>890</locationY>
         <assignmentItems>
             <assignToReference>compositeTemplateIds</assignToReference>
@@ -65,8 +65,8 @@
     <decisions>
         <name>Check_Envelope_Result</name>
         <label>Check Envelope Result</label>
-        <locationX>50</locationX>
-        <locationY>1108</locationY>
+        <locationX>182</locationX>
+        <locationY>1190</locationY>
         <defaultConnector>
             <targetReference>Error_Screen</targetReference>
         </defaultConnector>
@@ -90,7 +90,7 @@
     <decisions>
         <name>Check_Row_Selection</name>
         <label>Check Row Selection</label>
-        <locationX>182</locationX>
+        <locationX>380</locationX>
         <locationY>674</locationY>
         <defaultConnector>
             <targetReference>Row_not_selected</targetReference>
@@ -115,7 +115,7 @@
     <decisions>
         <name>Is_Language_Selected</name>
         <label>Is Language Selected?</label>
-        <locationX>380</locationX>
+        <locationX>611</locationX>
         <locationY>242</locationY>
         <defaultConnector>
             <targetReference>Language_Not_Added_Screen</targetReference>
@@ -143,7 +143,7 @@
     <loops>
         <name>Build_Template_ID_Collection</name>
         <label>Build Template ID Collection</label>
-        <locationX>50</locationX>
+        <locationX>182</locationX>
         <locationY>782</locationY>
         <collectionReference>data.selectedRows</collectionReference>
         <iterationOrder>Asc</iterationOrder>
@@ -176,7 +176,7 @@
     <recordLookups>
         <name>DocuSign_Envelope_Templates</name>
         <label>DocuSign Envelope Templates</label>
-        <locationX>182</locationX>
+        <locationX>380</locationX>
         <locationY>458</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
@@ -190,6 +190,13 @@
                 <elementReference>Get_Records.Docusign_Envelope_Language__c</elementReference>
             </value>
         </filters>
+        <filters>
+            <field>Short_Name__c</field>
+            <operator>IsNull</operator>
+            <value>
+                <booleanValue>false</booleanValue>
+            </value>
+        </filters>
         <getFirstRecordOnly>false</getFirstRecordOnly>
         <object>dfsle__EnvelopeConfiguration__c</object>
         <queriedFields>Id</queriedFields>
@@ -202,7 +209,7 @@
     <recordLookups>
         <name>Get_Records</name>
         <label>Get Records</label>
-        <locationX>380</locationX>
+        <locationX>611</locationX>
         <locationY>134</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
@@ -225,7 +232,7 @@
     <screens>
         <name>Envelope_template_records</name>
         <label>Envelope template records</label>
-        <locationX>182</locationX>
+        <locationX>380</locationX>
         <locationY>566</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
@@ -292,7 +299,7 @@
         <name>Error_Screen</name>
         <label>Error Screen</label>
         <locationX>314</locationX>
-        <locationY>1216</locationY>
+        <locationY>1298</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -316,7 +323,7 @@
     <screens>
         <name>Language_Not_Added_Screen</name>
         <label>Language Not Added Screen</label>
-        <locationX>578</locationX>
+        <locationX>842</locationX>
         <locationY>350</locationY>
         <allowBack>false</allowBack>
         <allowFinish>true</allowFinish>
@@ -340,7 +347,7 @@
     <screens>
         <name>Language_Warning_Screen</name>
         <label>Language Warning Screen</label>
-        <locationX>182</locationX>
+        <locationX>380</locationX>
         <locationY>350</locationY>
         <allowBack>false</allowBack>
         <allowFinish>true</allowFinish>
@@ -368,7 +375,7 @@
     <screens>
         <name>Row_not_selected</name>
         <label>Row not selected</label>
-        <locationX>314</locationX>
+        <locationX>578</locationX>
         <locationY>782</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
@@ -394,7 +401,7 @@
         <name>Success_Screen</name>
         <label>Success Screen</label>
         <locationX>50</locationX>
-        <locationY>1216</locationY>
+        <locationY>1298</locationY>
         <allowBack>false</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -415,7 +422,7 @@
         <showHeader>false</showHeader>
     </screens>
     <start>
-        <locationX>254</locationX>
+        <locationX>485</locationX>
         <locationY>0</locationY>
         <connector>
             <targetReference>Get_Records</targetReference>