Skip to content

feat(map-of-complextypes): add the support for map of complex type in query parameters #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 10, 2023
Merged

feat(map-of-complextypes): add the support for map of complex type in query parameters #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3c6546
feat(map-of-complextypes): add the support for map of complex type
hamzashoukat94 Jan 4, 2023
971a4f0
Update the test cases
hamzashoukat94 Jan 4, 2023
9db80e4
Resolved comments
hamzashoukat94 Jan 10, 2023
4bfb861
Added the missing tests
hamzashoukat94 Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 68 additions & 1 deletion APIMatic.Core.Test/Utilities/CoreHelperTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,73 @@ public void AppendQueryParameter_NullParameter()
Assert.AreEqual(expected, actual);
}

[Test]
public void AppendQueryParameter_NullListParameter()
{
StringBuilder queryBuilder = new StringBuilder();
queryBuilder.Append(SERVER_URL);
List<string> parametersKeys = new List<string>()
{
"list"
};

List<string> obj = null;
string expected = $"{SERVER_URL}";
CoreHelper.AppendUrlWithQueryParameters(queryBuilder, GetParameters(parametersKeys, obj));
string actual = queryBuilder.ToString();
Assert.AreEqual(expected, actual);
}

[Test]
public void AppendQueryParameter_EmptyListParameter()
{
StringBuilder queryBuilder = new StringBuilder();
queryBuilder.Append(SERVER_URL);
List<string> parametersKeys = new List<string>()
{
"list"
};

List<string> obj = new List<string>();
string expected = $"{SERVER_URL}";
CoreHelper.AppendUrlWithQueryParameters(queryBuilder, GetParameters(parametersKeys, obj));
string actual = queryBuilder.ToString();
Assert.AreEqual(expected, actual);
}

[Test]
public void AppendQueryParameter_NullDictionaryParameter()
{
StringBuilder queryBuilder = new StringBuilder();
queryBuilder.Append(SERVER_URL);
List<string> parametersKeys = new List<string>()
{
"dictionary"
};

Dictionary<string, string> dictionary = null;
string expected = $"{SERVER_URL}";
CoreHelper.AppendUrlWithQueryParameters(queryBuilder, GetParameters(parametersKeys, dictionary));
string actual = queryBuilder.ToString();
Assert.AreEqual(expected, actual);
}

[Test]
public void AppendQueryParameter_EmptyDictionaryParameter()
{
StringBuilder queryBuilder = new StringBuilder();
queryBuilder.Append(SERVER_URL);
List<string> parametersKeys = new List<string>()
{
"dictionary"
};

Dictionary<string, string> dictionary = new Dictionary<string, string>();
string expected = $"{SERVER_URL}";
CoreHelper.AppendUrlWithQueryParameters(queryBuilder, GetParameters(parametersKeys, dictionary));
string actual = queryBuilder.ToString();
Assert.AreEqual(expected, actual);
}

[Test]
public void AppendQueryParameter_UnIndexedCollectionParameter()
Expand Down Expand Up @@ -317,7 +384,7 @@ public void AppendQueryParameter_TabSeparatedCollectionParameter()
"dateTime"
};

string expected = $"{SERVER_URL}?dateTime=testtcollection";
string expected = $"{SERVER_URL}?dateTime=test\tcollection";
CoreHelper.AppendUrlWithQueryParameters(queryBuilder, GetParameters(parametersKeys, stringCollection), ArraySerialization.TSV);
string actual = queryBuilder.ToString();
Assert.AreEqual(expected, actual);
Expand Down
59 changes: 40 additions & 19 deletions APIMatic.Core/Utilities/CoreHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ private static char GetSeparator(ArraySerialization arraySerialization)
}
if (arraySerialization == ArraySerialization.TSV)
{
return 't';
return '\t';
}
return '&';
}
Expand Down Expand Up @@ -567,31 +567,52 @@ private static void HandleCustomType(List<KeyValuePair<string, object>> processe

private static void HandlePrimitiveTypes(List<KeyValuePair<string, object>> processedParameters, KeyValuePair<string, object> kvp)
{
if (kvp.Value is IList)
if (kvp.Value is IList list)
{
var list = kvp.Value as IList;
HandleListParameter(processedParameters, kvp, list);
return;
}
if (kvp.Value is IDictionary dictionary)
{
HandleDictionaryParameter(processedParameters, kvp, dictionary);
return;
}
// Scalar type
processedParameters.Add(kvp);
}

if (list?.Count != 0)
{
var item = list[0];
private static void HandleListParameter(List<KeyValuePair<string, object>> processedParameters, KeyValuePair<string, object> kvp, IList list)
{
if (list == null || list.Count == 0)
{
return;
}
HandleParameter(processedParameters, kvp, list[0]);
}

if (item.GetType().Namespace.StartsWith("System"))
{
// List of scalar type
processedParameters.Add(kvp);
}
else
{
// List of custom type
HandleCustomType(processedParameters, kvp);
}
}
private static void HandleDictionaryParameter(List<KeyValuePair<string, object>> processedParameters, KeyValuePair<string, object> kvp, IDictionary dictionary)
{
if (dictionary == null || dictionary.Count == 0)
{
return;
}
else
var enumerator = dictionary.GetEnumerator();
if (enumerator.MoveNext())
{
// Scalar type
var item = ((DictionaryEntry)enumerator.Current).Value;
HandleParameter(processedParameters, kvp, item);
}
}

private static void HandleParameter(List<KeyValuePair<string, object>> processedParameters, KeyValuePair<string, object> kvp, object entry)
{
if (entry.GetType().Namespace.StartsWith("System"))
{
// List of scalar type
processedParameters.Add(kvp);
return;
}
HandleCustomType(processedParameters, kvp);
}

/// <summary>
Expand Down