missing params in service, model converters, move example to integration test

Author: mediumTaj

Scripts/Services/Assistant/v1/Assistant.cs

@@ -388,6 +388,8 @@ public bool GetWorkspace(SuccessCallback<WorkspaceExport> successCallback, FailC
             req.SuccessCallback = successCallback;
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.Parameters["version"] = VersionDate;
 
             req.OnResponse = OnGetWorkspaceResponse;
@@ -479,7 +481,16 @@ public bool ListWorkspaces(SuccessCallback<WorkspaceCollection> successCallback,
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
             req.Parameters["version"] = VersionDate;
-
+            if (pageLimit != null)
+                req.Parameters["page_limit"] = pageLimit;
+            if (includeCount != null)
+                req.Parameters["include_count"] = includeCount;
+            if (!string.IsNullOrEmpty(sort))
+                req.Parameters["sort"] = sort;
+            if (!string.IsNullOrEmpty(cursor))
+                req.Parameters["cursor"] = cursor;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.OnResponse = OnListWorkspacesResponse;
 
             RESTConnector connector = RESTConnector.GetConnector(Credentials, "/v1/workspaces");
@@ -835,6 +846,8 @@ public bool GetIntent(SuccessCallback<IntentExport> successCallback, FailCallbac
             req.SuccessCallback = successCallback;
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.Parameters["version"] = VersionDate;
 
             req.OnResponse = OnGetIntentResponse;
@@ -928,7 +941,18 @@ public bool ListIntents(SuccessCallback<IntentCollection> successCallback, FailC
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
             req.Parameters["version"] = VersionDate;
-
+            if (export != null)
+                req.Parameters["export"] = export;
+            if (pageLimit != null)
+                req.Parameters["page_limit"] = pageLimit;
+            if (includeCount != null)
+                req.Parameters["include_count"] = includeCount;
+            if (!string.IsNullOrEmpty(sort))
+                req.Parameters["sort"] = sort;
+            if (!string.IsNullOrEmpty(cursor))
+                req.Parameters["cursor"] = cursor;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.OnResponse = OnListIntentsResponse;
 
             RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v1/workspaces/{0}/intents", workspaceId));
@@ -1287,7 +1311,8 @@ public bool GetExample(SuccessCallback<Example> successCallback, FailCallback fa
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
             req.Parameters["version"] = VersionDate;
-
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.OnResponse = OnGetExampleResponse;
 
             RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v1/workspaces/{0}/intents/{1}/examples/{2}", workspaceId, intent, text));
@@ -1379,7 +1404,16 @@ public bool ListExamples(SuccessCallback<ExampleCollection> successCallback, Fai
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
             req.Parameters["version"] = VersionDate;
-
+            if (pageLimit != null)
+                req.Parameters["page_limit"] = pageLimit;
+            if (includeCount != null)
+                req.Parameters["include_count"] = includeCount;
+            if (!string.IsNullOrEmpty(sort))
+                req.Parameters["sort"] = sort;
+            if (!string.IsNullOrEmpty(cursor))
+                req.Parameters["cursor"] = cursor;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.OnResponse = OnListExamplesResponse;
 
             RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v1/workspaces/{0}/intents/{1}/examples", workspaceId, intent));
@@ -1735,6 +1769,8 @@ public bool GetCounterexample(SuccessCallback<Counterexample> successCallback, F
             req.SuccessCallback = successCallback;
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.Parameters["version"] = VersionDate;
 
             req.OnResponse = OnGetCounterexampleResponse;
@@ -1826,6 +1862,16 @@ public bool ListCounterexamples(SuccessCallback<CounterexampleCollection> succes
             req.SuccessCallback = successCallback;
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
+            if (pageLimit != null)
+                req.Parameters["page_limit"] = pageLimit;
+            if (includeCount != null)
+                req.Parameters["include_count"] = includeCount;
+            if (!string.IsNullOrEmpty(sort))
+                req.Parameters["sort"] = sort;
+            if (!string.IsNullOrEmpty(cursor))
+                req.Parameters["cursor"] = cursor;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.Parameters["version"] = VersionDate;
 
             req.OnResponse = OnListCounterexamplesResponse;
@@ -2183,6 +2229,10 @@ public bool GetEntity(SuccessCallback<EntityExport> successCallback, FailCallbac
             req.SuccessCallback = successCallback;
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
+            if (export != null)
+                req.Parameters["export"] = export;
             req.Parameters["version"] = VersionDate;
 
             req.OnResponse = OnGetEntityResponse;
@@ -2276,7 +2326,18 @@ public bool ListEntities(SuccessCallback<EntityCollection> successCallback, Fail
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
             req.Parameters["version"] = VersionDate;
-
+            if (export != null)
+                req.Parameters["export"] = export;
+            if (pageLimit != null)
+                req.Parameters["page_limit"] = pageLimit;
+            if (includeCount != null)
+                req.Parameters["include_count"] = includeCount;
+            if (!string.IsNullOrEmpty(sort))
+                req.Parameters["sort"] = sort;
+            if (!string.IsNullOrEmpty(cursor))
+                req.Parameters["cursor"] = cursor;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.OnResponse = OnListEntitiesResponse;
 
             RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v1/workspaces/{0}/entities", workspaceId));
@@ -2635,6 +2696,10 @@ public bool GetValue(SuccessCallback<ValueExport> successCallback, FailCallback
             req.SuccessCallback = successCallback;
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
+            if (export != null)
+                req.Parameters["export"] = export;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.Parameters["version"] = VersionDate;
 
             req.OnResponse = OnGetValueResponse;
@@ -2729,7 +2794,18 @@ public bool ListValues(SuccessCallback<ValueCollection> successCallback, FailCal
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
             req.Parameters["version"] = VersionDate;
-
+            if (export != null)
+                req.Parameters["export"] = export;
+            if (pageLimit != null)
+                req.Parameters["page_limit"] = pageLimit;
+            if (includeCount != null)
+                req.Parameters["include_count"] = includeCount;
+            if (!string.IsNullOrEmpty(sort))
+                req.Parameters["sort"] = sort;
+            if (!string.IsNullOrEmpty(cursor))
+                req.Parameters["cursor"] = cursor;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.OnResponse = OnListValuesResponse;
 
             RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v1/workspaces/{0}/entities/{1}/values", workspaceId, entity));
@@ -3091,6 +3167,8 @@ public bool GetSynonym(SuccessCallback<Synonym> successCallback, FailCallback fa
             req.SuccessCallback = successCallback;
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.Parameters["version"] = VersionDate;
 
             req.OnResponse = OnGetSynonymResponse;
@@ -3185,7 +3263,16 @@ public bool ListSynonyms(SuccessCallback<SynonymCollection> successCallback, Fai
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
             req.Parameters["version"] = VersionDate;
-
+            if (pageLimit != null)
+                req.Parameters["page_limit"] = pageLimit;
+            if (includeCount != null)
+                req.Parameters["include_count"] = includeCount;
+            if (!string.IsNullOrEmpty(sort))
+                req.Parameters["sort"] = sort;
+            if (!string.IsNullOrEmpty(cursor))
+                req.Parameters["cursor"] = cursor;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.OnResponse = OnListSynonymsResponse;
 
             RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v1/workspaces/{0}/entities/{1}/values/{2}/synonyms", workspaceId, entity, value));
@@ -3542,6 +3629,8 @@ public bool GetDialogNode(SuccessCallback<DialogNode> successCallback, FailCallb
             req.SuccessCallback = successCallback;
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.Parameters["version"] = VersionDate;
 
             req.OnResponse = OnGetDialogNodeResponse;
@@ -3634,7 +3723,16 @@ public bool ListDialogNodes(SuccessCallback<DialogNodeCollection> successCallbac
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
             req.Parameters["version"] = VersionDate;
-
+            if (pageLimit != null)
+                req.Parameters["page_limit"] = pageLimit;
+            if (includeCount != null)
+                req.Parameters["include_count"] = includeCount;
+            if (!string.IsNullOrEmpty(sort))
+                req.Parameters["sort"] = sort;
+            if (!string.IsNullOrEmpty(cursor))
+                req.Parameters["cursor"] = cursor;
+            if (includeAudit != null)
+                req.Parameters["include_audit"] = includeAudit;
             req.OnResponse = OnListDialogNodesResponse;
 
             RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v1/workspaces/{0}/dialog_nodes", workspaceId));
@@ -3812,6 +3910,15 @@ public bool ListAllLogs(SuccessCallback<LogCollection> successCallback, FailCall
             req.SuccessCallback = successCallback;
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
+            if(!string.IsNullOrEmpty(filter))
+                req.Parameters["filter"] = filter;
+            if (!string.IsNullOrEmpty(sort))
+                req.Parameters["sort"] = sort;
+            if(pageLimit != null)
+                req.Parameters["page_imit"] = pageLimit;
+            if(!string.IsNullOrEmpty(cursor))
+                req.Parameters["cursor"] = cursor;
+
             req.Parameters["version"] = VersionDate;
 
             req.OnResponse = OnListAllLogsResponse;
@@ -3903,7 +4010,14 @@ public bool ListLogs(SuccessCallback<LogCollection> successCallback, FailCallbac
             req.FailCallback = failCallback;
             req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
             req.Parameters["version"] = VersionDate;
-
+            if (pageLimit != null)
+                req.Parameters["page_limit"] = pageLimit;
+            if (!string.IsNullOrEmpty(sort))
+                req.Parameters["sort"] = sort;
+            if (!string.IsNullOrEmpty(cursor))
+                req.Parameters["cursor"] = cursor;
+            if (!string.IsNullOrEmpty(filter))
+                req.Parameters["filter"] = filter;
             req.OnResponse = OnListLogsResponse;
 
             RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v1/workspaces/{0}/logs", workspaceId));

Scripts/Services/Assistant/v1/Model/CreateValue.cs

@@ -80,7 +80,7 @@ public enum ValueTypeEnum
         public List<string> Patterns { get; set; }
     }
 
-    #region Value Type Converter
+    #region Create Value Converter
     public class CreateValueConverter : fsConverter
     {
         private fsSerializer _serializer = new fsSerializer();

Scripts/Services/Assistant/v1/Model/UpdateValue.cs

@@ -16,6 +16,7 @@
 */
 
 using FullSerializer;
+using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
@@ -24,7 +25,7 @@ namespace IBM.Watson.DeveloperCloud.Services.Assistant.v1
     /// <summary>
     /// UpdateValue.
     /// </summary>
-    [fsObject]
+    [fsObject(Converter = typeof(UpdateValueConverter))]
     public class UpdateValue
     {
         /// <summary>
@@ -33,13 +34,13 @@ public class UpdateValue
         /// <value>Specifies the type of value.</value>
         public enum ValueTypeEnum
         {
-            
+
             /// <summary>
             /// Enum SYNONYMS for synonyms
             /// </summary>
             [EnumMember(Value = "synonyms")]
             SYNONYMS,
-            
+
             /// <summary>
             /// Enum PATTERNS for patterns
             /// </summary>
@@ -79,4 +80,64 @@ public enum ValueTypeEnum
         public List<string> Patterns { get; set; }
     }
 
+    #region Updaet Value Converter
+    public class UpdateValueConverter : fsConverter
+    {
+        private fsSerializer _serializer = new fsSerializer();
+
+        public override bool CanProcess(Type type)
+        {
+            return type == typeof(CreateValue);
+        }
+
+        public override fsResult TryDeserialize(fsData data, ref object instance, Type storageType)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override fsResult TrySerialize(object instance, out fsData serialized, Type storageType)
+        {
+            UpdateValue updateValue = (UpdateValue)instance;
+            serialized = null;
+
+            Dictionary<string, fsData> serialization = new Dictionary<string, fsData>();
+
+            fsData tempData = null;
+
+            if (updateValue.ValueType != null)
+            {
+                _serializer.TrySerialize(updateValue.ValueType, out tempData);
+                serialization.Add("type", tempData);
+            }
+
+            if (updateValue.Value != null)
+            {
+                _serializer.TrySerialize(updateValue.Value, out tempData);
+                serialization.Add("value", tempData);
+            }
+
+            if (updateValue.Metadata != null)
+            {
+                _serializer.TrySerialize(updateValue.Metadata, out tempData);
+                serialization.Add("metadata", tempData);
+            }
+
+            if (updateValue.Synonyms != null)
+            {
+                _serializer.TrySerialize(updateValue.Synonyms, out tempData);
+                serialization.Add("synonyms", tempData);
+            }
+
+            if (updateValue.Patterns != null)
+            {
+                _serializer.TrySerialize(updateValue.Patterns, out tempData);
+                serialization.Add("patterns", tempData);
+            }
+
+            serialized = new fsData(serialization);
+
+            return fsResult.Success;
+        }
+        #endregion
+    }
 }