Improve company valuation

Author: Matthiee

FinancialModelingPrepApi/Abstractions/CompanyValuation/ICompanyValuation.cs

@@ -1,12 +1,11 @@
 using FinancialModelingPrepApi.Model;
 using FinancialModelingPrepApi.Model.CompanyValuation;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace FinancialModelingPrepApi.Abstractions.CompanyValuation
 {
     public interface ICompanyValuation
     {
-        public Task<ApiResponse<List<CompanyProfileResponse>>> GetCompanyProfileAsync(string symbol);
+        public Task<ApiResponse<CompanyProfileResponse>> GetCompanyProfileAsync(string symbol);
     }
 }

FinancialModelingPrepApi/Core/CompanyValuation/CompanyValuation.cs

@@ -5,6 +5,7 @@
 using FinancialModelingPrepApi.Model.CompanyValuation;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace FinancialModelingPrepApi.Core.CompanyValuation
@@ -18,7 +19,7 @@ public CompanyValuation(FinancialModelingPrepHttpClient client)
             this.client = client ?? throw new System.ArgumentNullException(nameof(client));
         }
 
-        public Task<ApiResponse<List<CompanyProfileResponse>>> GetCompanyProfileAsync(string symbol)
+        public async Task<ApiResponse<CompanyProfileResponse>> GetCompanyProfileAsync(string symbol)
         {
             const string url = "[version]/profile/[symbol]";
 
@@ -28,7 +29,14 @@ public Task<ApiResponse<List<CompanyProfileResponse>>> GetCompanyProfileAsync(st
                 { "symbol", symbol }
             };
 
-            return client.GetAsync<List<CompanyProfileResponse>>(url, pathParams, null);
+            var result = await client.GetAsync<List<CompanyProfileResponse>>(url, pathParams, null);
+
+            if (result.HasError)
+            {
+                return ApiResponse.FromError<CompanyProfileResponse>(result.Error);
+            }
+
+            return ApiResponse.FromSucces(result.Data.First());
         }
     }
 }

FinancialModelingPrepApi/Core/Http/FinancialModelingPrepHttpClient.cs

@@ -1,4 +1,5 @@
 using FinancialModelingPrepApi.Model;
+using FinancialModelingPrepApi.Model.Error;
 using System;
 using System.Collections.Specialized;
 using System.Net.Http;
@@ -31,6 +32,19 @@ public async Task<ApiResponse<T>> GetAsync<T>(string urlPattern, NameValueCollec
             try
             {
                 var response = await CallApiAsync(urlPattern, pathParams, queryString);
+
+                if (response.HasError)
+                {
+                    ApiResponse.FromError<T>(response.Data);
+                }
+
+                if (response.Data.Contains("Error Message"))
+                {
+                    var errorData = JsonSerializer.Deserialize<ErrorResponse>(response.Data);
+
+                    return ApiResponse.FromError<T>(errorData.ErrorMessage);
+                }
+
                 var data = JsonSerializer.Deserialize<T>(response.Data, jsonSerializerOptions);
 
                 return ApiResponse.FromSucces(data);

FinancialModelingPrepApi/Model/Error/ErrorResponse.cs

@@ -0,0 +1,10 @@
+using System.Text.Json.Serialization;
+
+namespace FinancialModelingPrepApi.Model.Error
+{
+    public class ErrorResponse
+    {
+        [JsonPropertyName("Error Message")]
+        public string ErrorMessage { get; set; }
+    }
+}

Tests/CompanyValuation/CompanyValuationTests.cs

@@ -18,10 +18,22 @@ public async Task GetCompanyProfileTests()
         {
             var api = ServiceProvider.GetRequiredService<IFinancialModelingPrepApiClient>();
 
-            var result = await api.CompanyValuation.GetCompanyProfileAsync("AAPL,MSFT");
+            var result = await api.CompanyValuation.GetCompanyProfileAsync("AAPL");
 
             Assert.NotNull(result);
             Assert.False(result.HasError);
+            Assert.Equal("AAPL", result.Data.symbol);
+        }
+
+        [Fact]
+        public async Task GetCompanyProfile_Unknown_Symbol_Returns_HasError_True()
+        {
+            var api = ServiceProvider.GetRequiredService<IFinancialModelingPrepApiClient>();
+
+            var result = await api.CompanyValuation.GetCompanyProfileAsync("doesnotexist");
+
+            Assert.NotNull(result);
+            Assert.True(result.HasError);
         }
     }
 }