Fixing issue with query strings containing curly brackets, and adjust associated test

Author: AlanCS

Examples/MovieProject/MovieProject.Logic/DTO/UserSearchModel.cs

@@ -10,7 +10,7 @@ public class UserSearchModel
             [JsonPropertyName("name")]
             public string Name { get; set; }
 
-            [JsonPropertyName("username")]
+            
             public string Username { get; set; }
 
             [JsonPropertyName("email")]

Examples/MovieProject/MovieProject.Logic/Proxy/UserProxy.cs

@@ -43,8 +43,7 @@ public UserProxy(HttpClient client,
 
         public async Task<DTO.User[]> GetSearchUsers(UserSearchModel searchModel)
         {
-            string serialisedQueryParameter = JsonSerializer.Serialize(searchModel);
-            string route = $"searchUsers?userSearchModel={serialisedQueryParameter}";
+            string route = $"searchUsers?Username={searchModel.Username}";
 
             var result = await Send(HttpMethod.Get, route, (DTO.User[] users, HttpStatusCode status) =>
             {

Examples/MovieProject/MovieProject.Tests/MovieProject.IsolatedTests/ComponentTesting/SearchUserHappyTests.cs

@@ -34,19 +34,16 @@ public async Task When_UserSearchesWithValidParameters_Then_ReturnListProperly()
                 Username = "Bret",
             };
             var serialisedComplexParameters = JsonConvert.SerializeObject(complexParameter);
-            var expectedResponse = new List<string>()
-            {
-                "Leanne Graham"
-            };
 
             var client = Fixture.Server.CreateClient();
             client.CreateSession();
             var response = ResponseFactory.FromFiddlerLikeResponseFile($"{Fixture.StubsFolder}/UserApi/Real_Responses/Happy/200_SearchListUsers.txt");
 
-            client.AppendHttpCallStub(HttpMethod.Get, new System.Uri(@$"{Url}?userSearchModel={serialisedComplexParameters}"), response);
+            var uri = new System.Uri(@$"{Url}?Username=Bret");            
+            client.AppendHttpCallStub(HttpMethod.Get, uri, response);
 
             // act
-            var httpResponse = await client.GetAsync("/api/users");
+            var httpResponse = await client.GetAsync($"/api/searchUsers?jsonSearchModel={serialisedComplexParameters}");
 
             using (new AssertionScope())
             {
@@ -57,12 +54,18 @@ public async Task When_UserSearchesWithValidParameters_Then_ReturnListProperly()
                 // assert outgoing
                 var outgoingRequests = client.GetSessionOutgoingRequests();
                 outgoingRequests.Count.Should().Be(1);
-                outgoingRequests[0].GetEndpoint().Should().Be($"GET {Url}");
+                outgoingRequests[0].GetEndpoint().Should().Be($"GET {Url}?Username=Bret");
                 outgoingRequests[0].GetHeaderValue("Referer").Should().Be(MovieProject.Logic.Constants.Website);
 
                 // assert return
                 httpResponse.StatusCode.Should().Be(HttpStatusCode.OK);
 
+                var expectedResponse = new List<string>()
+            {
+                "Leanne Graham"
+            };
+
+
                 var list = await httpResponse.ReadJsonBody<List<string>>();
                 list.Count.Should().Be(1);
                 list.Should().BeEquivalentTo(expectedResponse);

Examples/MovieProject/MovieProject.Web/Controllers/UserController.cs

@@ -5,6 +5,7 @@
 using MovieProject.Logic.DTO.MovieProject.Logic.Proxy.DTO;
 using MovieProject.Logic.Extensions;
 using MovieProject.Logic.Service;
+using Newtonsoft.Json;
 
 namespace MovieProject.Web.Controllers
 {
@@ -26,10 +27,12 @@ public async Task<List<string>> GetUsers()
             return await _userService.GetUsers();
         }      
 
-        [HttpPost("searchUsers")]
-        public async Task<List<string>> GetSearchUsers([FromBody] UserSearchModel searchModel)
+        [HttpGet("searchUsers")]
+        public async Task<List<string>> GetSearchUsers(string jsonSearchModel)
         {
-            var proxyDtoSearchModel = searchModel.MapUserSearchModelDtoToProxyDto();
+            var proxyDtoSearchModel = JsonConvert.DeserializeObject<Logic.Proxy.DTO.UserSearchModel>(jsonSearchModel);
+
+            
             // second controller with separate dependency used for testing SystemTestingTools
             return await _userService.GetSearchUsers(proxyDtoSearchModel);
         }      

Tool/SystemTestingTools/Extensions/HttpRequestMessageExtensions.cs

@@ -1,7 +1,9 @@
-using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
+using Microsoft.AspNetCore.WebUtilities;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Security.Policy;
 using System.Text.Json;
 using System.Threading.Tasks;
 using SystemTestingTools.Internal;
@@ -27,7 +29,7 @@ public static List<DateTime> GetDatesSent(this HttpRequestMessage request)
         /// </summary>
         public static string GetEndpoint(this HttpRequestMessage request)
         {
-            var endpoint = string.Format($"{request.Method} {request.RequestUri}");
+            var endpoint = string.Format("{0} {1}", request.Method, request.RequestUri);
             return endpoint;
         }
 

Tool/SystemTestingTools/Internal/StubEndpoint.cs

@@ -35,7 +35,7 @@ public StubEndpoint(HttpMethod httpMethod, Uri url, Exception exception, Diction
         private void SetEndpoint(HttpMethod httpMethod, Uri url)
         {
             if (url == null) throw new ArgumentNullException(nameof(url));
-            endpoint = string.Format($"{httpMethod} {url}");
+            endpoint = string.Format("{0} {1}", httpMethod, url);
         }
 
         public bool IsMatch(HttpRequestMessage request)