Merge pull request #39 from soat-fiap/rename_bus_propject

Rename bus propject
soat-fiap · Nov 16, 2024 · 45ff403 · 45ff403
2 parents 2515144 + 7472176
commit 45ff403
Show file tree

Hide file tree

Showing 31 changed files with 34 additions and 206 deletions.
diff --git a/Bmb Payment.sln b/Bmb Payment.sln
@@ -14,7 +14,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Payment.Application", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Orders.Gateway", "src\Bmb.Orders.Gateway\Bmb.Orders.Gateway.csproj", "{7BEEBD25-6E2D-4BA0-9287-39EC9820CABF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Payment.MySql", "src\Bmb.Payment.MySql\Bmb.Payment.MySql.csproj", "{9D4D796E-C202-4846-BC65-79D4FA63A136}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Payment.DynamoDb", "src\Bmb.Payment.DynamoDb\Bmb.Payment.DynamoDb.csproj", "{9D4D796E-C202-4846-BC65-79D4FA63A136}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Payment.Controllers", "src\Bmb.Payment.Controllers\Bmb.Payment.Controllers.csproj", "{E0854783-7998-4B83-BCF3-E4A5EBB24CD0}"
 EndProject
@@ -36,13 +36,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Payment.Api.Test", "tes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Orders.Gateway.Test", "tests\Bmb.Orders.Gateway.Test\Bmb.Orders.Gateway.Test.csproj", "{3220452F-8B8D-476C-962F-CAE2A2D76F44}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Payment.MySql.Test", "tests\Bmb.Payment.MySql.Test\Bmb.Payment.MySql.Test.csproj", "{C5464D10-B602-4B01-A14C-560536BB9563}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Payment.DynamoDb.Test", "tests\Bmb.Payment.DynamoDb.Test\Bmb.Payment.DynamoDb.Test.csproj", "{C5464D10-B602-4B01-A14C-560536BB9563}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Payment.Core", "src\Bmb.Payment.Core\Bmb.Payment.Core.csproj", "{C616857B-CB67-4904-9787-4FC78963CE50}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Payment.Bus", "src\Bmb.Payment.Bus\Bmb.Payment.Bus.csproj", "{FA002C5A-0B24-4986-BA44-A9E09A8BA553}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Payment.Masstransit", "src\Bmb.Payment.Masstransit\Bmb.Payment.Masstransit.csproj", "{FA002C5A-0B24-4986-BA44-A9E09A8BA553}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Payment.Bus.Test", "tests\Bmb.Payment.Bus.Test\Bmb.Payment.Bus.Test.csproj", "{80086F76-F1F6-466B-9241-4E5E99DCB12E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bmb.Payment.Masstransit.Test", "tests\Bmb.Payment.Masstransit.Test\Bmb.Payment.Masstransit.Test.csproj", "{80086F76-F1F6-466B-9241-4E5E99DCB12E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/Bmb.Payment.Api/Auth/AccessTokenAuthEventsHandler.cs b/src/Bmb.Payment.Api/Auth/AccessTokenAuthEventsHandler.cs
diff --git a/src/Bmb.Payment.Api/Auth/BmbRoles.cs b/src/Bmb.Payment.Api/Auth/BmbRoles.cs
diff --git a/src/Bmb.Payment.Api/Auth/JwtExtensions.cs b/src/Bmb.Payment.Api/Auth/JwtExtensions.cs
diff --git a/src/Bmb.Payment.Api/Auth/JwtOptions.cs b/src/Bmb.Payment.Api/Auth/JwtOptions.cs
diff --git a/src/Bmb.Payment.Api/Bmb.Payment.Api.csproj b/src/Bmb.Payment.Api/Bmb.Payment.Api.csproj
@@ -18,9 +18,9 @@
     <ItemGroup>
         <PackageReference Include="AspNetCore.HealthChecks.MySql" Version="8.0.1" />
         <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
+        <PackageReference Include="Bmb.Auth" Version="0.0.1" />
         <PackageReference Include="MassTransit" Version="8.2.5" />
         <PackageReference Include="MassTransit.AmazonSQS" Version="8.2.5" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.3"/>
         <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.0.2" />
         <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
@@ -39,7 +39,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Bmb.Payment.Bus\Bmb.Payment.Bus.csproj" />
+      <ProjectReference Include="..\Bmb.Payment.Masstransit\Bmb.Payment.Masstransit.csproj" />
       <ProjectReference Include="..\Bmb.Payment.Controllers\Bmb.Payment.Controllers.csproj" />
       <ProjectReference Include="..\Bmb.Payment.DI\Bmb.Payment.DI.csproj" />
     </ItemGroup>

diff --git a/src/Bmb.Payment.Api/Controllers/PaymentsController.cs b/src/Bmb.Payment.Api/Controllers/PaymentsController.cs
@@ -1,4 +1,4 @@
-using Bmb.Payment.Api.Auth;
+using Bmb.Auth;
 using Bmb.Payment.Api.Model;
 using Bmb.Payment.Controllers.Contracts;
 using Bmb.Payment.Controllers.Dto;

diff --git a/src/Bmb.Payment.Api/Program.cs b/src/Bmb.Payment.Api/Program.cs
@@ -1,8 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Text.Json.Serialization;
-using Bmb.Payment.Api.Auth;
-using Bmb.Payment.Bus;
+using Bmb.Auth;
+using Bmb.Payment.Masstransit;
 using Bmb.Payment.DI;
 using HealthChecks.UI.Client;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;

diff --git a/src/Bmb.Payment.DI/Bmb.Payment.DI.csproj b/src/Bmb.Payment.DI/Bmb.Payment.DI.csproj
@@ -17,7 +17,7 @@
       <ProjectReference Include="..\Bmb.Orders.Gateway\Bmb.Orders.Gateway.csproj" />
       <ProjectReference Include="..\Bmb.Payment.Application\Bmb.Payment.Application.csproj" />
       <ProjectReference Include="..\Bmb.Payment.Controllers\Bmb.Payment.Controllers.csproj" />
-      <ProjectReference Include="..\Bmb.Payment.MySql\Bmb.Payment.MySql.csproj" />
+      <ProjectReference Include="..\Bmb.Payment.DynamoDb\Bmb.Payment.DynamoDb.csproj" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Bmb.Payment.DI/ServiceCollectionsExtensions.cs b/src/Bmb.Payment.DI/ServiceCollectionsExtensions.cs
@@ -7,7 +7,7 @@
 using Bmb.Payment.DI.HealthChecks;
 using Bmb.Payment.FakePayment.Gateway;
 using Bmb.Payment.MercadoPago.Gateway;
-using Bmb.Payment.MySql;
+using Bmb.Payment.DynamoDb;
 using Microsoft.Extensions.Caching.Hybrid;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/...mb.Payment.MySql/Bmb.Payment.MySql.csproj → ...ment.DynamoDb/Bmb.Payment.DynamoDb.csproj b/...mb.Payment.MySql/Bmb.Payment.MySql.csproj → ...ment.DynamoDb/Bmb.Payment.DynamoDb.csproj
@@ -16,7 +16,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <InternalsVisibleTo Include="Bmb.Payment.MySql.Test" />
+      <InternalsVisibleTo Include="Bmb.Payment.DynamoDb.Test" />
       <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
     </ItemGroup>
 

diff --git a/src/Bmb.Payment.MySql/Dto/PaymentDto.cs → src/Bmb.Payment.DynamoDb/Dto/PaymentDto.cs b/src/Bmb.Payment.MySql/Dto/PaymentDto.cs → src/Bmb.Payment.DynamoDb/Dto/PaymentDto.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Bmb.Payment.MySql.Dto;
+namespace Bmb.Payment.DynamoDb.Dto;
 
 [ExcludeFromCodeCoverage]
 public class PaymentDto

diff --git a/src/Bmb.Payment.MySql/Presenter.cs → src/Bmb.Payment.DynamoDb/Presenter.cs b/src/Bmb.Payment.MySql/Presenter.cs → src/Bmb.Payment.DynamoDb/Presenter.cs
@@ -1,7 +1,7 @@
 using Amazon.DynamoDBv2.Model;
 using Bmb.Domain.Core.ValueObjects;
 
-namespace Bmb.Payment.MySql;
+namespace Bmb.Payment.DynamoDb;
 
 public static class Presenter
 {

diff --git a/...l/Repository/InMemoryPaymentRepository.cs → ...b/Repository/InMemoryPaymentRepository.cs b/...l/Repository/InMemoryPaymentRepository.cs → ...b/Repository/InMemoryPaymentRepository.cs
@@ -3,7 +3,7 @@
 using Bmb.Domain.Core.Interfaces;
 using Bmb.Domain.Core.ValueObjects;
 
-namespace Bmb.Payment.MySql.Repository;
+namespace Bmb.Payment.DynamoDb.Repository;
 
 [ExcludeFromCodeCoverage]
 public class InMemoryPaymentRepository : IPaymentRepository

diff --git a/...ent.MySql/Repository/PaymentRepository.cs → ....DynamoDb/Repository/PaymentRepository.cs b/...ent.MySql/Repository/PaymentRepository.cs → ....DynamoDb/Repository/PaymentRepository.cs
@@ -4,7 +4,7 @@
 using Bmb.Domain.Core.ValueObjects;
 using Bmb.Payment.Core.Contracts;
 
-namespace Bmb.Payment.MySql.Repository;
+namespace Bmb.Payment.DynamoDb.Repository;
 
 public class PaymentRepository(IAmazonDynamoDB database) : IPaymentRepository
 {

diff --git a/src/Bmb.Payment.MySql/ServiceExtensions.cs → ...Bmb.Payment.DynamoDb/ServiceExtensions.cs b/src/Bmb.Payment.MySql/ServiceExtensions.cs → ...Bmb.Payment.DynamoDb/ServiceExtensions.cs
@@ -1,10 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
 using Bmb.Payment.Core.Contracts;
-using Bmb.Payment.MySql.Repository;
+using Bmb.Payment.DynamoDb.Repository;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Bmb.Payment.MySql;
+namespace Bmb.Payment.DynamoDb;
 
 [ExcludeFromCodeCoverage]
 public static class ServiceExtensions

diff --git a/src/Bmb.Payment.Bus/Bmb.Payment.Bus.csproj → ...asstransit/Bmb.Payment.Masstransit.csproj b/src/Bmb.Payment.Bus/Bmb.Payment.Bus.csproj → ...asstransit/Bmb.Payment.Masstransit.csproj
diff --git a/src/Bmb.Payment.Bus/Dispatcher.cs → src/Bmb.Payment.Masstransit/Dispatcher.cs b/src/Bmb.Payment.Bus/Dispatcher.cs → src/Bmb.Payment.Masstransit/Dispatcher.cs
@@ -4,7 +4,7 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
 
-namespace Bmb.Payment.Bus;
+namespace Bmb.Payment.Masstransit;
 
 public class Dispatcher : IDispatcher
 {

diff --git a/...ayment.Bus/OrderCreatedPaymentConsumer.cs → ...asstransit/OrderCreatedPaymentConsumer.cs b/...ayment.Bus/OrderCreatedPaymentConsumer.cs → ...asstransit/OrderCreatedPaymentConsumer.cs
@@ -3,7 +3,7 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
 
-namespace Bmb.Payment.Bus;
+namespace Bmb.Payment.Masstransit;
 
 public class OrderCreatedPaymentConsumer(ILogger<OrderCreatedPaymentConsumer> logger, IOrdersGateway ordersGateway)
     : IConsumer<OrderCreated>

diff --git a/src/Bmb.Payment.Bus/Presenter.cs → src/Bmb.Payment.Masstransit/Presenter.cs b/src/Bmb.Payment.Bus/Presenter.cs → src/Bmb.Payment.Masstransit/Presenter.cs
@@ -1,7 +1,7 @@
 using Bmb.Domain.Core.Events.Integration;
 using Bmb.Payment.Core;
 
-namespace Bmb.Payment.Bus;
+namespace Bmb.Payment.Masstransit;
 
 internal static class Presenter
 {

diff --git a/...yment.Bus/ServiceCollectionsExtensions.cs → ...sstransit/ServiceCollectionsExtensions.cs b/...yment.Bus/ServiceCollectionsExtensions.cs → ...sstransit/ServiceCollectionsExtensions.cs
@@ -5,7 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 
-namespace Bmb.Payment.Bus;
+namespace Bmb.Payment.Masstransit;
 
 [ExcludeFromCodeCoverage]
 public static class ServiceCollectionsExtensions

diff --git a/terraform/main.tf b/terraform/main.tf
@@ -36,6 +36,10 @@ resource "aws_dynamodb_table" "payment_orders_replica" {
   ttl {
     attribute_name = "ExpireAt"
   }
+
+  lifecycle {
+    ignore_changes = [ttl]
+  }
 }
 
 resource "aws_dynamodb_table" "payments_table" {

diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -45,7 +45,7 @@ variable "jwt_aud" {
 
 variable "api_docker_image" {
   type    = string
-  default = "ghcr.io/soat-fiap/bmb.payment/api:1.2.3"
+  default = "ghcr.io/soat-fiap/bmb.payment/api:latest"
 }
 
 variable "internal_elb_name" {

diff --git a/tests/Bmb.Payment.Api.Test/Auth/AccessTokenAuthEventsHandlerTest.cs b/tests/Bmb.Payment.Api.Test/Auth/AccessTokenAuthEventsHandlerTest.cs
diff --git a/....MySql.Test/Bmb.Payment.MySql.Test.csproj → ...oDb.Test/Bmb.Payment.DynamoDb.Test.csproj b/....MySql.Test/Bmb.Payment.MySql.Test.csproj → ...oDb.Test/Bmb.Payment.DynamoDb.Test.csproj
@@ -25,7 +25,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\Bmb.Payment.MySql\Bmb.Payment.MySql.csproj" />
+      <ProjectReference Include="..\..\src\Bmb.Payment.DynamoDb\Bmb.Payment.DynamoDb.csproj" />
     </ItemGroup>
 
 </Project>