Merge pull request #24 from release-docusign/BugbashBugFixes

Added back transformPdfFields. Bug fixes from the bugbash

Author: harshitav-docusign

certified-connectors/DocuSignDemo/apiDefinition.swagger.json

@@ -916,7 +916,7 @@
           {
             "name": "recordType",
             "in": "query",
-            "required": true,              
+            "required": true,
             "enum": [
               "account",
               "opportunity",
@@ -971,7 +971,7 @@
             "name": "crmOrgUrl",
             "in": "query",
             "type": "string"
-          }           
+          }
         ],
         "responses": {
           "200": {
@@ -1024,7 +1024,7 @@
           {
             "name": "recordType",
             "in": "query",
-            "required": true,              
+            "required": true,
             "enum": [
               "account",
               "opportunity",
@@ -1072,7 +1072,7 @@
             "name": "crmOrgUrl",
             "in": "query",
             "type": "string"
-          }           
+          }
         ],
         "responses": {
           "200": {
@@ -3136,7 +3136,7 @@
                     "properties": {
                       "documentBase64": {
                         "type": "string",
-                        "x-ms-summary": "Base64 *",
+                        "x-ms-summary": "Document Base64 *",
                         "description": "Base64 of document content"
                       },
                       "fileExtension": {
@@ -3147,17 +3147,31 @@
                           "value-path": "name",
                           "value-title": "name"
                         },
-                        "x-ms-summary": "type *",
+                        "x-ms-summary": "Document type *",
                         "description": "pdf, docx etc."
                       },
                       "name": {
                         "type": "string",
-                        "x-ms-summary": "name *",
+                        "x-ms-summary": "Document name *",
                         "description": "document name"
+                      },
+                      "transformPdfFields": {
+                        "type": "string",
+                        "x-ms-summary": "Transform Pdf Fields",
+                        "description": "False",
+                        "enum": [
+                          "False",
+                          "True"
+                        ]
+                      },
+                      "assignTabsToRecipientId": {
+                        "type": "string",
+                        "x-ms-summary": "Assign tabs to recipient",
+                        "description": "Recipient Id"
                       }
                     }
                   },
-                  "x-ms-summary": "document"
+                  "x-ms-summary": " "
                 }
               }
             }
@@ -4701,7 +4715,7 @@
         }
       },
       "additionalProperties": false
-    },  
+    },
     "DocumentRecord": {
       "required": [
         "recordId",

certified-connectors/DocuSignDemo/script.csx

@@ -1304,12 +1304,21 @@ public class Script : ScriptBase
     int recipientCount = envelope["recipients"]["recipientCount"].ToObject<int>();
     var recipientCountInNaturalLanguage = (recipientCount > 1) ?
         (" and " + (recipientCount - 1).ToString() + " others have ") : " "; 
-
+ 
     JArray documentArray = (envelope["envelopeDocuments"] as JArray) ?? new JArray();
-    var documentCountInNaturalLanguage = (documentArray.Count > 1) ?
-      (" and " + (documentArray.Count - 1).ToString() + " other documents ") : " ";
+    var documentCount = documentArray.Count;
+    string documentCountInNaturalLanguage = "";
+
+    if (documentCount == 3)
+    {
+      documentCountInNaturalLanguage = $" and 1 other document";
+    }
+    else if (documentCount > 3)
+    {
+      documentCountInNaturalLanguage = $" and {documentCount - 2} other documents";
+    }
 
-    if (envelope["status"].Equals("sent"))
+    if (envelope["status"].ToString().Equals("sent"))
     {
       descriptionNLP = envelope["sender"]["userName"] + " " +
         envelope["status"] + " " +
@@ -1764,6 +1773,7 @@ public class Script : ScriptBase
       }
 
       query["include"] = "custom_fields,recipients,documents";
+      query["order"] = "desc";
       uriBuilder.Query = query.ToString();
       this.Context.Request.RequestUri = uriBuilder.Uri;
     }
@@ -1784,6 +1794,7 @@ public class Script : ScriptBase
         query.Get("startDateTime");
 
       query["include"] = "custom_fields, recipients, documents";
+      query["order"] = "desc";
       uriBuilder.Query = query.ToString();
       this.Context.Request.RequestUri = uriBuilder.Uri;
     }
@@ -2122,8 +2133,9 @@ public class Script : ScriptBase
       var query = HttpUtility.ParseQueryString(this.Context.Request.RequestUri.Query);
       JObject newBody = new JObject();
 
-      JArray Activity = (body["envelopes"] as JArray) ?? new JArray();
+      JArray envelopes = (body["envelopes"] as JArray) ?? new JArray();
       JArray filteredActivities = new JArray();
+      JArray activities = new JArray();
       int top = string.IsNullOrEmpty(query.Get("top")) ? 3: int.Parse(query.Get("top"));
       int skip = string.IsNullOrEmpty(query.Get("skip")) ? 0: int.Parse(query.Get("skip"));
 
@@ -2134,38 +2146,56 @@ public class Script : ScriptBase
 
       foreach (var filter in filters.Where(filter => filter != null)) 
       {
-        foreach (var envelope in Activity)
+        foreach (var envelope in envelopes)
         {
-          if (envelope.ToString().Contains(filter))
+          if (envelope.ToString().ToLower().Contains(filter.ToLower()))
           {
-            JObject additionalPropertiesForActivity = new JObject()
-            {
-              ["Recipient"] = envelope["recipients"]["signers"][0]["name"],
-              ["Owner"] = envelope["sender"]["userName"],
-              ["Status"] = envelope["status"],
-              ["EnvelopeId"] = envelope["envelopeId"],
-              ["Date"] = envelope["statusChangedDateTime"]
-            };
-            filteredActivities.Add(new JObject()
-            {
-              ["title"] = envelope["emailSubject"],
-              ["description"] = GetDescriptionNLPForRelatedActivities(envelope),
-              ["dateTime"] = envelope["statusChangedDateTime"],
-              ["url"] = GetEnvelopeUrl(envelope),
-              ["additionalProperties"] = additionalPropertiesForActivity
-            });
+            filteredActivities.Add(envelope);
           }
         }
 
         if (filteredActivities.Count > 0)
         {
-          Activity = new JArray(filteredActivities);
+          envelopes.Clear();
+          envelopes = new JArray(filteredActivities);
           filteredActivities.Clear();
         }
+        else
+        {
+          envelopes.Clear();
+          break;
+        }
+      }
+
+      foreach (var envelope in envelopes)
+      {
+        JArray recipientNames = new JArray();
+        System.Globalization.TextInfo textInfo = new System.Globalization.CultureInfo("en-US", false).TextInfo;
+        foreach (var recipient in (envelope["recipients"]["signers"] as JArray) ?? new JArray())
+        {
+          recipientNames.Add(recipient["name"]);
+        }
+
+        JObject additionalPropertiesForActivity = new JObject()
+        {
+          ["Recipients"] = recipientNames,
+          ["Owner"] = envelope["sender"]["userName"],
+          ["Status"] = textInfo.ToTitleCase(envelope["status"].ToString()),
+          ["EnvelopeId"] = envelope["envelopeId"],
+          ["Date"] = envelope["statusChangedDateTime"]
+        };
+        activities.Add(new JObject()
+        {
+          ["title"] = envelope["emailSubject"],
+          ["description"] = GetDescriptionNLPForRelatedActivities(envelope),
+          ["dateTime"] = envelope["statusChangedDateTime"],
+          ["url"] = GetEnvelopeUrl(envelope),
+          ["additionalProperties"] = additionalPropertiesForActivity,
+        });
       }
 
-      newBody["value"] = (Activity.Count < top) ? Activity : new JArray(Activity.Skip(skip).Take(top).ToArray());
-      newBody["hasMoreResults"] = (skip + top < Activity.Count) ? true : false;
+      newBody["value"] = (activities.Count < top) ? activities : new JArray(activities.Skip(skip).Take(top).ToArray());
+      newBody["hasMoreResults"] = (skip + top < activities.Count) ? true : false;
 
       response.Content = new StringContent(newBody.ToString(), Encoding.UTF8, "application/json");
     }
@@ -2176,8 +2206,9 @@ public class Script : ScriptBase
       var query = HttpUtility.ParseQueryString(this.Context.Request.RequestUri.Query);
       JObject newBody = new JObject();
 
-      JArray DocumentRecord = (body["envelopes"] as JArray) ?? new JArray();
+      JArray envelopes = (body["envelopes"] as JArray) ?? new JArray();
       JArray filteredRecords = new JArray();
+      JArray documentRecords = new JArray();
       int top = string.IsNullOrEmpty(query.Get("top")) ? 3: int.Parse(query.Get("top"));
       int skip = string.IsNullOrEmpty(query.Get("skip")) ? 0: int.Parse(query.Get("skip"));
 
@@ -2188,40 +2219,57 @@ public class Script : ScriptBase
 
       foreach (var filter in filters.Where(filter => filter != null)) 
       {
-        foreach (var envelope in DocumentRecord)
+        foreach (var envelope in envelopes)
         {
-          if (envelope.ToString().Contains(filter))
+          if (envelope.ToString().ToLower().Contains(filter.ToLower()))
           {
-            JObject additionalPropertiesForDocumentRecords = new JObject()
-            {
-              ["Recipient"] = envelope["recipients"]["signers"][0]["name"],
-              ["Owner"] = envelope["sender"]["userName"],
-              ["EnvelopeId"] = envelope["envelopeId"],
-              ["Date"] = envelope["statusChangedDateTime"]
-            };
-
-            filteredRecords.Add(new JObject()
-            {
-              ["recordId"] = envelope["envelopeId"],
-              ["recordTypeDisplayName"] = "Agreement",
-              ["recordTypePluralDisplayName"] = "Agreements",
-              ["recordType"] = "Agreement",
-              ["recordTitle"] = envelope["emailSubject"],
-              ["url"] = GetEnvelopeUrl(envelope),
-              ["additionalProperties"] = additionalPropertiesForDocumentRecords
-            });
+            filteredRecords.Add(envelope);
           }
         }
 
         if (filteredRecords.Count > 0)
         {
-          DocumentRecord = new JArray(filteredRecords);
+          envelopes.Clear();
+          envelopes = new JArray(filteredRecords);
           filteredRecords.Clear();
         }
+        else
+        {
+          envelopes.Clear();
+          break;
+        }
+      }
+
+      foreach (var envelope in envelopes)
+      {
+        JArray recipientNames = new JArray();
+        foreach (var recipient in (envelope["recipients"]["signers"] as JArray) ?? new JArray())
+        {
+          recipientNames.Add(recipient["name"]);
+        }
+
+        JObject additionalPropertiesForDocumentRecords = new JObject()
+        {
+          ["Recipients"] = recipientNames,
+          ["Owner"] = envelope["sender"]["userName"],
+          ["EnvelopeId"] = envelope["envelopeId"],
+          ["Date"] = envelope["statusChangedDateTime"]
+        };
+
+        documentRecords.Add(new JObject()
+        {
+          ["recordId"] = envelope["envelopeId"],
+          ["recordTypeDisplayName"] = "Agreement",
+          ["recordTypePluralDisplayName"] = "Agreements",
+          ["recordType"] = "Agreement",
+          ["recordTitle"] = envelope["emailSubject"],
+          ["url"] = GetEnvelopeUrl(envelope),
+          ["additionalProperties"] = additionalPropertiesForDocumentRecords
+        });
       }
 
-      newBody["value"] = (DocumentRecord.Count < top) ? DocumentRecord : new JArray(DocumentRecord.Skip(skip).Take(top).ToArray());
-      newBody["hasMoreResults"] = (skip + top < DocumentRecord.Count) ? true : false;
+      newBody["value"] = (documentRecords.Count < top) ? documentRecords : new JArray(documentRecords.Skip(skip).Take(top).ToArray());
+      newBody["hasMoreResults"] = (skip + top < documentRecords.Count) ? true : false;
 
       response.Content = new StringContent(newBody.ToString(), Encoding.UTF8, "application/json");
     }