bugfix/EN - 5022 - Busca Testamento - Problemas na integração com o Focus

Lacuna.FocusNFSeIntegration.AppTest/Classes/TestHelpers.cs

@@ -1,11 +1,8 @@
-using Lacuna.FocusNFSeIntegration;
-using Lacuna.FocusNFSeIntegration.Models;
+using Lacuna.FocusNFSeIntegration.Models;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace Lacuna.FocusNFeIntegration.AppTest.Classes {
+namespace Lacuna.FocusNFSeIntegration.AppTest.Classes {
 	public class TestHelpers {
 
 		public static NFSeRequest GenerateRequest(FocusNFSeIntegrationOptions options, bool hasCnpj = true) {
@@ -31,7 +28,7 @@ public static ServiceInfo GenerateServiceInfo(FocusNFSeIntegrationOptions option
 		}
 
 		public static ClientInfo GenerateClientInfo(FocusNFSeIntegrationOptions options, bool hasCnpj = true) {
-			var info = new ClientInfo {				
+			var info = new ClientInfo {
 				CompanyNameOrClientName = "LACUNA SOFTWARE LTDA - EPP",
 				Email = "adm@lacunasoftware.com",
 				AddressInfo = new AddressInfo {
@@ -50,7 +47,7 @@ public static ClientInfo GenerateClientInfo(FocusNFSeIntegrationOptions options,
 				info.StateSubscription = "144408646118";
 			} else {
 				info.Cpf = "55500000160";
-			}			
+			}
 
 			return info;
 		}

Lacuna.FocusNFSeIntegration.AppTest/Controllers/FocusNFSeController.cs

@@ -1,10 +1,7 @@
-using Lacuna.FocusNFeIntegration.AppTest.Classes;
-using Microsoft.AspNetCore.Http;
+using Lacuna.FocusNFSeIntegration.AppTest.Classes;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Lacuna.FocusNFSeIntegration.AppTest.Controllers {
@@ -21,7 +18,7 @@ public FocusNFSeController(FocusNFSeClient focusClient, IOptions<FocusNFSeIntegr
 		}
 
 		[HttpPost("{reference}")]
-		public async Task<IActionResult> SubmitNFSeAsync(string reference, [FromQuery]bool hasCnpj = true) {
+		public async Task<IActionResult> SubmitNFSeAsync(string reference, [FromQuery] bool hasCnpj = true) {
 			var req = TestHelpers.GenerateRequest(focusOptions.Value, hasCnpj);
 
 			var retorno = await focusClient.CreateNFSeAsync(reference, req);

Lacuna.FocusNFSeIntegration.AppTest/Controllers/SampleDataController.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace Lacuna.FocusNFSeIntegration.AppTest.Controllers {
 	[Route("api/[controller]")]

Lacuna.FocusNFSeIntegration.AppTest/Lacuna.FocusNFSeIntegration.AppTest.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <IsPackable>false</IsPackable>
@@ -10,15 +10,19 @@
 
     <!-- Set this to true if you enable server-side prerendering -->
     <BuildServerSideRenderer>false</BuildServerSideRenderer>
-    <AssemblyName>Lacuna.FocusNFeIntegration.AppTest</AssemblyName>
-    <RootNamespace>Lacuna.FocusNFeIntegration.AppTest</RootNamespace>
+    <AssemblyName>Lacuna.FocusNFSeIntegration.AppTest</AssemblyName>
+    <RootNamespace>Lacuna.FocusNFSeIntegration.AppTest</RootNamespace>
     <UserSecretsId>ae90e351-4401-4819-b96e-5cda579fd657</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.9.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.9.0" />
   </ItemGroup>
 
   <ItemGroup>

Lacuna.FocusNFSeIntegration.AppTest/Pages/_ViewImports.cshtml

@@ -1,3 +1,3 @@
-@using Lacuna.FocusNFSeIntegration
-@namespace Lacuna.FocusNFSeIntegration.AppTest.Pages
+@using Lacuna.FocusNFSeIntegration.AppTest
+@using Lacuna.FocusNFSeIntegration.AppTest.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

Lacuna.FocusNFSeIntegration.AppTest/Program.cs

@@ -1,12 +1,5 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Lacuna.FocusNFSeIntegration.AppTest {
 	public class Program {

Lacuna.FocusNFSeIntegration.AppTest/Startup.cs

@@ -1,8 +1,5 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.SpaServices.AngularCli;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -16,8 +13,7 @@ public Startup(IConfiguration configuration) {
 
 		// This method gets called by the runtime. Use this method to add services to the container.
 		public void ConfigureServices(IServiceCollection services) {
-			services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
-
+			services.AddControllersWithViews();
 			// Configuring the Focus NFSe Integration Options from the appsettings
 			services.Configure<FocusNFSeIntegrationOptions>(Configuration.GetSection("Focus"));
 			// Creating the Focus NFSe Integration Client as a Singleton and available for the Services and controllers to use it (Asp.Net Core configuration library option)
@@ -27,6 +23,9 @@ public void ConfigureServices(IServiceCollection services) {
 			services.AddSpaStaticFiles(configuration => {
 				configuration.RootPath = "ClientApp/dist";
 			});
+
+			services.AddEndpointsApiExplorer();
+			services.AddSwaggerGen();
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -41,23 +40,16 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) {
 
 			app.UseHttpsRedirection();
 			app.UseStaticFiles();
-			app.UseSpaStaticFiles();
 
-			app.UseMvc(routes => {
-				routes.MapRoute(
-					name: "default",
-					template: "{controller}/{action=Index}/{id?}");
-			});
+			app.UseSwagger();
+			app.UseSwaggerUI();
+			app.UseRouting();
 
-			app.UseSpa(spa => {
-				// To learn more about options for serving an Angular SPA from ASP.NET Core,
-				// see https://go.microsoft.com/fwlink/?linkid=864501
-
-				spa.Options.SourcePath = "ClientApp";
-
-				if (env.IsDevelopment()) {
-					spa.UseAngularCliServer(npmScript: "start");
-				}
+			app.UseEndpoints(endpoints => {
+				endpoints.MapControllerRoute(
+					name: "default",
+					pattern: "{controller}/{action=Index}/{id?}"
+				);
 			});
 		}
 	}

Lacuna.FocusNFSeIntegration/Constants.cs

@@ -0,0 +1,7 @@
+namespace Lacuna.FocusNFSeIntegration {
+	public static class Constants {
+		public static readonly string MediaType = "application/json";
+		public static readonly string FactoryClientName = "FocusNFSeIntegration:Client";
+		public static readonly string CharSet = "UTF-8";
+	}
+}