Skip to content
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.

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

fix: void type handling with return type creator #77

Merged
merged 3 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 27 additions & 0 deletions APIMatic.Core.Test/Api/HttpGet/ApiCallGetTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,33 @@ public void ApiCall_GetVoid()
Assert.Null(actual);
}

[Test]
public void ApiCall_GetVoid_WithApiResponse()
{
//Arrange
var url = "/apicall/get-void/api-response/200";

var content = JsonContent.Create("Test body");
handlerMock.When(GetCompleteUrl(url))
.With(req =>
{
Assert.AreEqual(0, req.Headers.Accept.Count);
return true;
})
.Respond(HttpStatusCode.OK, content);

var apiCall = CreateApiCall<VoidType>()
.RequestBuilder(requestBuilderAction => requestBuilderAction.Setup(HttpMethod.Get, url))
.ExecuteAsync();

// Act
ApiResponse<VoidType> actual = CoreHelper.RunTask(apiCall);

// Assert
Assert.AreEqual(200, actual.StatusCode);
Assert.Null(actual.Data);
}

[Test]
public void ApiCall_GetStream()
{
Expand Down
42 changes: 26 additions & 16 deletions APIMatic.Core/Response/ResponseHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -119,33 +119,29 @@ internal ReturnType Result<ReturnType>(CoreContext<CoreRequest, CoreResponse> co
{
return default;
}

throw ResponseError(context);
}
if (HasEmptyResponse(context.Response))
{
return default;
}

ResponseType result = ConvertResponse(context.Response);
result = contextAdder(result, compatibilityFactory.CreateHttpContext(context.Request, context.Response));
if (result is ReturnType convertedResult)
{
return convertedResult;
}

if (returnTypeCreator != null)
{
return returnTypeCreator(compatibilityFactory.CreateHttpResponse(context.Response), result);
}
throw new InvalidOperationException($"Unable to transform {typeof(ResponseType)} into {typeof(ReturnType)}. ReturnTypeCreator is not provided.");
}

private bool HasEmptyResponse(CoreResponse response)
{
var resType = typeof(ResponseType);
if (resType == typeof(VoidType))
if (EqualityComparer<ResponseType>.Default.Equals(result, default))
{
return true;
return default;
}
return string.Equals(response.Body?.Trim(), string.Empty) && CoreHelper.IsNullableType(resType);

if (result is ReturnType convertedResult)
{
return convertedResult;
}

throw new InvalidOperationException($"Unable to transform {typeof(ResponseType)} into {typeof(ReturnType)}. ReturnTypeCreator is not provided.");
}

private ApiException ResponseError(CoreContext<CoreRequest, CoreResponse> context)
Expand Down Expand Up @@ -206,6 +202,10 @@ private bool GetDefaultErrorCaseFromErrors(out ErrorCase<Request, Response, Cont

private ResponseType ConvertResponse(CoreResponse response)
{
if (HasEmptyResponse(response))
{
return default;
}
if (response.RawBody is ResponseType streamResponse)
{
return streamResponse;
Expand All @@ -216,5 +216,15 @@ private ResponseType ConvertResponse(CoreResponse response)
}
return deserializer(response.Body);
}

private bool HasEmptyResponse(CoreResponse response)
{
var resType = typeof(ResponseType);
if (typeof(VoidType).IsAssignableFrom(resType))
{
return true;
}
return string.Equals(response.Body?.Trim(), string.Empty) && CoreHelper.IsNullableType(resType);
}
}
}
Loading