Rename projects (#91)

dotnet · Nov 15, 2023 · 2e7babf · 2e7babf
1 parent 1e803b0
commit 2e7babf
Show file tree

Hide file tree

Showing 28 changed files with 35 additions and 35 deletions.
diff --git a/build/acr-build/queue-all.ps1 b/build/acr-build/queue-all.ps1
@@ -13,11 +13,11 @@ $services = @(
     @{ Name="eshopcatalog"; Image="eshop/catalog.api"; File="src/Services/Catalog/Catalog.API/Dockerfile" },
     @{ Name="eshopidentity"; Image="eshop/identity.api"; File="src/Services/Identity/Identity.API/Dockerfile" },
     @{ Name="eshopordering"; Image="eshop/ordering.api"; File="src/Services/Ordering/Ordering.API/Dockerfile" },
-	@{ Name="eshoporderingbg"; Image="eshop/ordering.backgroundtasks"; File="src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile" },
+	@{ Name="eshoporderingbg"; Image="eshop/orderprocessor"; File="src/Services/Ordering/OrderProcessor/Dockerfile" },
     @{ Name="eshopwebspa"; Image="eshop/webspa"; File="src/Web/WebSPA/Dockerfile" },
     @{ Name="eshopwebmvc"; Image="eshop/webmvc"; File="src/Web/WebMVC/Dockerfile" },
     @{ Name="eshopwebstatus"; Image="eshop/webstatus"; File="src/Web/WebStatus/Dockerfile" },
-    @{ Name="eshoppayment"; Image="eshop/payment.api"; File="src/Services/Payment/Payment.API/Dockerfile" },
+    @{ Name="eshoppayment"; Image="eshop/paymentprocessor"; File="src/Services/Payment/PaymentProcessor/Dockerfile" },
     @{ Name="eshopocelotapigw"; Image="eshop/ocelotapigw"; File="src/ApiGateways/ApiGw-Base/Dockerfile" },
     @{ Name="eshopmobileshoppingagg"; Image="eshop/mobileshoppingagg"; File="src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile" },
     @{ Name="eshopwebshoppingagg"; Image="eshop/webshoppingagg"; File="src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile" },

diff --git a/build/multiarch-manifests/create-manifests.ps1 b/build/multiarch-manifests/create-manifests.ps1
@@ -12,7 +12,7 @@ Write-Host "Tags used are linux-master, win-master, linux-dev, win-dev, linux-la
 Write-Host "Multiarch images tags will be master, dev, latest" -ForegroundColor Yellow
 
 
-$services = "identity.api", "basket.api", "catalog.api", "ordering.api", "ordering.backgroundtasks", "payment.api", "webhooks.api", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub", "webstatus", "webspa", "webmvc", "webhooks.client"
+$services = "identity.api", "basket.api", "catalog.api", "ordering.api", "orderprocessor", "paymentprocessor", "webhooks.api", "ocelotapigw", "mobileshoppingagg", "webshoppingagg", "ordering.signalrhub", "webstatus", "webspa", "webmvc", "webhooks.client"
 
 foreach ($svc in $services) {
     Write-Host "Creating manifest for $svc and tags :latest, :master, and :dev"

diff --git a/eShop.Web.slnf b/eShop.Web.slnf
@@ -10,10 +10,10 @@
       "src\\IntegrationEventLogEF\\IntegrationEventLogEF.csproj",
       "src\\Mobile.Bff.Shopping\\Mobile.Bff.Shopping.csproj",
       "src\\Ordering.API\\Ordering.API.csproj",
-      "src\\Ordering.BackgroundTasks\\Ordering.BackgroundTasks.csproj",
+      "src\\OrderProcessor\\OrderProcessor.csproj",
       "src\\Ordering.Domain\\Ordering.Domain.csproj",
       "src\\Ordering.Infrastructure\\Ordering.Infrastructure.csproj",
-      "src\\Payment.API\\Payment.API.csproj",
+      "src\\PaymentProcessor\\PaymentProcessor.csproj",
       "src\\WebAppComponents\\WebAppComponents.csproj",
       "src\\WebApp\\WebApp.csproj",
       "src\\WebhookClient\\WebhookClient.csproj",

diff --git a/eShop.sln b/eShop.sln
@@ -35,13 +35,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.Bff.Shopping", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.API", "src\Ordering.API\Ordering.API.csproj", "{C8BA83CE-480E-4CC7-9508-747A76671F63}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.BackgroundTasks", "src\Ordering.BackgroundTasks\Ordering.BackgroundTasks.csproj", "{0E5BE4C6-BF24-4BDA-908F-EFB99D22159D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrderProcessor", "src\OrderProcessor\OrderProcessor.csproj", "{0E5BE4C6-BF24-4BDA-908F-EFB99D22159D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.Domain", "src\Ordering.Domain\Ordering.Domain.csproj", "{DCA3AE8C-904C-48A6-BC0C-2CF995DDFD99}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.Infrastructure", "src\Ordering.Infrastructure\Ordering.Infrastructure.csproj", "{75474943-A318-4DF0-AB01-04F752827152}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Payment.API", "src\Payment.API\Payment.API.csproj", "{A2369111-2D88-4612-BFD2-9BEA0CB6D37E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PaymentProcessor", "src\PaymentProcessor\PaymentProcessor.csproj", "{A2369111-2D88-4612-BFD2-9BEA0CB6D37E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApp", "src\WebApp\WebApp.csproj", "{BE636956-26D5-404D-B269-17800032625D}"
 EndProject

diff --git a/....BackgroundTasks/BackgroundTaskOptions.cs → src/OrderProcessor/BackgroundTaskOptions.cs b/....BackgroundTasks/BackgroundTaskOptions.cs → src/OrderProcessor/BackgroundTaskOptions.cs
@@ -1,4 +1,4 @@
-namespace eShop.Ordering.BackgroundTasks;
+namespace eShop.OrderProcessor;
 
 public class BackgroundTaskOptions
 {

diff --git a/...s/GracePeriodConfirmedIntegrationEvent.cs → ...s/GracePeriodConfirmedIntegrationEvent.cs b/...s/GracePeriodConfirmedIntegrationEvent.cs → ...s/GracePeriodConfirmedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-namespace eShop.Ordering.BackgroundTasks.Events
+namespace eShop.OrderProcessor.Events
 {
     using eShop.EventBus.Events;
 

diff --git a/....BackgroundTasks/Extensions/Extensions.cs → src/OrderProcessor/Extensions/Extensions.cs b/....BackgroundTasks/Extensions/Extensions.cs → src/OrderProcessor/Extensions/Extensions.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using eShop.Ordering.BackgroundTasks.Events;
+using eShop.OrderProcessor.Events;
 
-namespace eShop.Ordering.BackgroundTasks.Extensions;
+namespace eShop.OrderProcessor.Extensions;
 
 public static class Extensions
 {

diff --git a/src/Ordering.BackgroundTasks/GlobalUsings.cs → src/OrderProcessor/GlobalUsings.cs b/src/Ordering.BackgroundTasks/GlobalUsings.cs → src/OrderProcessor/GlobalUsings.cs
@@ -2,6 +2,6 @@
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Hosting;
 global using Microsoft.Extensions.Logging;
-global using eShop.Ordering.BackgroundTasks.Extensions;
-global using eShop.Ordering.BackgroundTasks.Services;
+global using eShop.OrderProcessor.Extensions;
+global using eShop.OrderProcessor.Services;
 global using eShop.ServiceDefaults;
diff --git a/...oundTasks/Ordering.BackgroundTasks.csproj → src/OrderProcessor/OrderProcessor.csproj b/...oundTasks/Ordering.BackgroundTasks.csproj → src/OrderProcessor/OrderProcessor.csproj
diff --git a/src/Ordering.BackgroundTasks/Program.cs → src/OrderProcessor/Program.cs b/src/Ordering.BackgroundTasks/Program.cs → src/OrderProcessor/Program.cs
diff --git a/...roundTasks/Properties/launchSettings.json → ...rProcessor/Properties/launchSettings.json b/...roundTasks/Properties/launchSettings.json → ...rProcessor/Properties/launchSettings.json
@@ -1,6 +1,6 @@
 {
   "profiles": {
-    "Ordering.BackgroundTasks": {
+    "OrderProcessor": {
       "commandName": "Project",
       "environmentVariables": {
         "DOTNET_ENVIRONMENT": "Development"

diff --git a/...sks/Services/GracePeriodManagerService.cs → ...sor/Services/GracePeriodManagerService.cs b/...sks/Services/GracePeriodManagerService.cs → ...sor/Services/GracePeriodManagerService.cs
@@ -1,9 +1,9 @@
 using eShop.EventBus.Abstractions;
 using Microsoft.Extensions.Options;
 using Npgsql;
-using eShop.Ordering.BackgroundTasks.Events;
+using eShop.OrderProcessor.Events;
 
-namespace eShop.Ordering.BackgroundTasks.Services
+namespace eShop.OrderProcessor.Services
 {
     public class GracePeriodManagerService(
         IOptions<BackgroundTaskOptions> options,

diff --git a/...kgroundTasks/appsettings.Development.json → ...derProcessor/appsettings.Development.json b/...kgroundTasks/appsettings.Development.json → ...derProcessor/appsettings.Development.json
diff --git a/...Ordering.BackgroundTasks/appsettings.json → src/OrderProcessor/appsettings.json b/...Ordering.BackgroundTasks/appsettings.json → src/OrderProcessor/appsettings.json
@@ -9,7 +9,7 @@
     "EventBus": "amqp://localhost"
   },
   "EventBus": {
-    "SubscriptionClientName": "BackgroundTasks"
+    "SubscriptionClientName": "OrderProcessor"
   },
   "BackgroundTaskOptions": {
     "GracePeriodTime": "1",

diff --git a/src/Payment.API/GlobalUsings.cs b/src/Payment.API/GlobalUsings.cs
diff --git a/src/PaymentProcessor/GlobalUsings.cs b/src/PaymentProcessor/GlobalUsings.cs
@@ -0,0 +1,7 @@
+global using eShop.EventBus.Abstractions;
+global using eShop.EventBus.Events;
+global using eShop.PaymentProcessor;
+global using eShop.PaymentProcessor.IntegrationEvents.EventHandling;
+global using eShop.PaymentProcessor.IntegrationEvents.Events;
+global using Microsoft.Extensions.Options;
+global using eShop.ServiceDefaults;
diff --git a/...oStockConfirmedIntegrationEventHandler.cs → ...oStockConfirmedIntegrationEventHandler.cs b/...oStockConfirmedIntegrationEventHandler.cs → ...oStockConfirmedIntegrationEventHandler.cs
@@ -1,4 +1,4 @@
-namespace eShop.Payment.API.IntegrationEvents.EventHandling;
+namespace eShop.PaymentProcessor.IntegrationEvents.EventHandling;
 
 public class OrderStatusChangedToStockConfirmedIntegrationEventHandler(
     IEventBus eventBus,

diff --git a/...nts/OrderPaymentFailedIntegrationEvent.cs → ...nts/OrderPaymentFailedIntegrationEvent.cs b/...nts/OrderPaymentFailedIntegrationEvent.cs → ...nts/OrderPaymentFailedIntegrationEvent.cs
@@ -1,3 +1,3 @@
-namespace eShop.Payment.API.IntegrationEvents.Events;
+namespace eShop.PaymentProcessor.IntegrationEvents.Events;
 
 public record OrderPaymentFailedIntegrationEvent(int OrderId) : IntegrationEvent;
diff --git a/.../OrderPaymentSucceededIntegrationEvent.cs → .../OrderPaymentSucceededIntegrationEvent.cs b/.../OrderPaymentSucceededIntegrationEvent.cs → .../OrderPaymentSucceededIntegrationEvent.cs
@@ -1,3 +1,3 @@
-namespace eShop.Payment.API.IntegrationEvents.Events;
+namespace eShop.PaymentProcessor.IntegrationEvents.Events;
 
 public record OrderPaymentSucceededIntegrationEvent(int OrderId) : IntegrationEvent;
diff --git a/...hangedToStockConfirmedIntegrationEvent.cs → ...hangedToStockConfirmedIntegrationEvent.cs b/...hangedToStockConfirmedIntegrationEvent.cs → ...hangedToStockConfirmedIntegrationEvent.cs
@@ -1,3 +1,3 @@
-namespace eShop.Payment.API.IntegrationEvents.Events;
+namespace eShop.PaymentProcessor.IntegrationEvents.Events;
 
 public record OrderStatusChangedToStockConfirmedIntegrationEvent(int OrderId) : IntegrationEvent;
diff --git a/src/Payment.API/PaymentOptions.cs → src/PaymentProcessor/PaymentOptions.cs b/src/Payment.API/PaymentOptions.cs → src/PaymentProcessor/PaymentOptions.cs
@@ -1,4 +1,4 @@
-namespace eShop.Payment.API;
+namespace eShop.PaymentProcessor;
 
 public class PaymentOptions
 {

diff --git a/src/Payment.API/Payment.API.csproj → src/PaymentProcessor/PaymentProcessor.csproj b/src/Payment.API/Payment.API.csproj → src/PaymentProcessor/PaymentProcessor.csproj
diff --git a/src/Payment.API/Program.cs → src/PaymentProcessor/Program.cs b/src/Payment.API/Program.cs → src/PaymentProcessor/Program.cs
diff --git a/...ayment.API/Properties/launchSettings.json → ...tProcessor/Properties/launchSettings.json b/...ayment.API/Properties/launchSettings.json → ...tProcessor/Properties/launchSettings.json
@@ -1,6 +1,6 @@
 {
   "profiles": {
-    "Payment.API": {
+    "PaymentProcessor": {
       "commandName": "Project",
       "launchBrowser": false,
       "applicationUrl": "http://localhost:5226",

diff --git a/src/Payment.API/appsettings.Development.json → ...entProcessor/appsettings.Development.json b/src/Payment.API/appsettings.Development.json → ...entProcessor/appsettings.Development.json
diff --git a/src/Payment.API/appsettings.json → src/PaymentProcessor/appsettings.json b/src/Payment.API/appsettings.json → src/PaymentProcessor/appsettings.json
@@ -9,7 +9,7 @@
     "EventBus": "amqp://localhost"
   },
   "EventBus": {
-    "SubscriptionClientName": "Payment"
+    "SubscriptionClientName": "PaymentProcessor"
   },
   "PaymentOptions": {
     "PaymentSucceeded": true

diff --git a/src/eShop.AppHost/Program.cs b/src/eShop.AppHost/Program.cs
@@ -32,11 +32,11 @@
     .WithReference(orderDb)
     .WithEnvironmentForServiceBinding("Identity__Url", identityApi);
 
-builder.AddProject<Projects.Ordering_BackgroundTasks>("order-processor")
+builder.AddProject<Projects.OrderProcessor>("order-processor")
     .WithReference(rabbitMq)
     .WithReference(orderDb);
 
-builder.AddProject<Projects.Payment_API>("payment-processor")
+builder.AddProject<Projects.PaymentProcessor>("payment-processor")
     .WithReference(rabbitMq);
 
 var webHooksApi = builder.AddProject<Projects.Webhooks_API>("webhooks-api")

diff --git a/src/eShop.AppHost/eShop.AppHost.csproj b/src/eShop.AppHost/eShop.AppHost.csproj
@@ -19,8 +19,8 @@
     <ProjectReference Include="..\Catalog.API\Catalog.API.csproj" />
     <ProjectReference Include="..\Identity.API\Identity.API.csproj" />
     <ProjectReference Include="..\Ordering.API\Ordering.API.csproj" />
-    <ProjectReference Include="..\Ordering.BackgroundTasks\Ordering.BackgroundTasks.csproj" />
-    <ProjectReference Include="..\Payment.API\Payment.API.csproj" />
+    <ProjectReference Include="..\OrderProcessor\OrderProcessor.csproj" />
+    <ProjectReference Include="..\PaymentProcessor\PaymentProcessor.csproj" />
     <ProjectReference Include="..\Webhooks.API\Webhooks.API.csproj" />
     <ProjectReference Include="..\WebApp\WebApp.csproj" />
     <ProjectReference Include="..\WebhookClient\WebhookClient.csproj" />