From 9594adaf42b2db62fd75561884734d088e63ed40 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Tue, 15 Feb 2022 01:36:51 +0300
Subject: [PATCH] catalog service order dependency fix

---
 ...atalogServiceApplicationContractsModule.cs | 25 +++++-----
 .../CatalogServiceApplicationModule.cs        | 26 +++++-----
 .../CatalogServiceDomainSharedModule.cs       | 47 +++++++++----------
 ...pOnAbp.CatalogService.Domain.Shared.csproj |  2 +-
 .../CatalogServiceDomainModule.cs             | 40 +++++++---------
 5 files changed, 64 insertions(+), 76 deletions(-)

diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/CatalogServiceApplicationContractsModule.cs b/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/CatalogServiceApplicationContractsModule.cs
index d73ef49b..26d4fbf1 100644
--- a/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/CatalogServiceApplicationContractsModule.cs
+++ b/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/CatalogServiceApplicationContractsModule.cs
@@ -3,19 +3,18 @@ using Volo.Abp.Authorization;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectExtending;
 
-namespace EShopOnAbp.CatalogService
+namespace EShopOnAbp.CatalogService;
+
+[DependsOn(
+    typeof(CatalogServiceDomainSharedModule),
+    typeof(AbpObjectExtendingModule),
+    typeof(AbpDddApplicationContractsModule),
+    typeof(AbpAuthorizationModule)
+)]
+public class CatalogServiceApplicationContractsModule : AbpModule
 {
-    [DependsOn(
-        typeof(CatalogServiceDomainSharedModule),
-        typeof(AbpObjectExtendingModule),
-        typeof(AbpDddApplicationContractsModule),
-        typeof(AbpAuthorizationModule)
-    )]
-    public class CatalogServiceApplicationContractsModule : AbpModule
+    public override void PreConfigureServices(ServiceConfigurationContext context)
     {
-        public override void PreConfigureServices(ServiceConfigurationContext context)
-        {
-            CatalogServiceDtoExtensions.Configure();
-        }
+        CatalogServiceDtoExtensions.Configure();
     }
-}
+}
\ No newline at end of file
diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Application/CatalogServiceApplicationModule.cs b/services/catalog/src/EShopOnAbp.CatalogService.Application/CatalogServiceApplicationModule.cs
index b32e87d3..a68fdb7a 100644
--- a/services/catalog/src/EShopOnAbp.CatalogService.Application/CatalogServiceApplicationModule.cs
+++ b/services/catalog/src/EShopOnAbp.CatalogService.Application/CatalogServiceApplicationModule.cs
@@ -2,21 +2,17 @@
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 
-namespace EShopOnAbp.CatalogService
+namespace EShopOnAbp.CatalogService;
+
+[DependsOn(
+    typeof(CatalogServiceDomainModule),
+    typeof(CatalogServiceApplicationContractsModule),
+    typeof(AbpDddApplicationModule)
+)]
+public class CatalogServiceApplicationModule : AbpModule
 {
-    [DependsOn(
-        typeof(CatalogServiceDomainModule),
-        typeof(CatalogServiceApplicationContractsModule),
-        typeof(AbpDddApplicationModule)
-    )]
-    public class CatalogServiceApplicationModule : AbpModule
+    public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddMaps<CatalogServiceApplicationModule>();
-            });
-        }
+        Configure<AbpAutoMapperOptions>(options => { options.AddMaps<CatalogServiceApplicationModule>(); });
     }
-}
+}
\ No newline at end of file
diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/CatalogServiceDomainSharedModule.cs b/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/CatalogServiceDomainSharedModule.cs
index 6b3c0ee8..392b3b2e 100644
--- a/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/CatalogServiceDomainSharedModule.cs
+++ b/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/CatalogServiceDomainSharedModule.cs
@@ -6,34 +6,33 @@ using Volo.Abp.Validation;
 using Volo.Abp.Validation.Localization;
 using Volo.Abp.VirtualFileSystem;
 
-namespace EShopOnAbp.CatalogService
+namespace EShopOnAbp.CatalogService;
+
+[DependsOn(
+    typeof(AbpValidationModule)
+)]
+public class CatalogServiceDomainSharedModule : AbpModule
 {
-    [DependsOn(
-        typeof(AbpValidationModule)
-        )]
-    public class CatalogServiceDomainSharedModule : AbpModule
+    public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
+        Configure<AbpVirtualFileSystemOptions>(options =>
         {
-            Configure<AbpVirtualFileSystemOptions>(options =>
-            {
-                options.FileSets.AddEmbedded<CatalogServiceDomainSharedModule>();
-            });
+            options.FileSets.AddEmbedded<CatalogServiceDomainSharedModule>();
+        });
 
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Add<CatalogServiceResource>("en")
-                    .AddBaseTypes(typeof(AbpValidationResource))
-                    .AddVirtualJson("/Localization/CatalogService");
+        Configure<AbpLocalizationOptions>(options =>
+        {
+            options.Resources
+                .Add<CatalogServiceResource>("en")
+                .AddBaseTypes(typeof(AbpValidationResource))
+                .AddVirtualJson("/Localization/CatalogService");
 
-                options.DefaultResourceType = typeof(CatalogServiceResource);
-            });
+            options.DefaultResourceType = typeof(CatalogServiceResource);
+        });
 
-            Configure<AbpExceptionLocalizationOptions>(options =>
-            {
-                options.MapCodeNamespace("CatalogService", typeof(CatalogServiceResource));
-            });
-        }
+        Configure<AbpExceptionLocalizationOptions>(options =>
+        {
+            options.MapCodeNamespace("CatalogService", typeof(CatalogServiceResource));
+        });
     }
-}
+}
\ No newline at end of file
diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj b/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj
index 1c136c24..7a271c66 100644
--- a/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj
+++ b/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/EShopOnAbp.CatalogService.Domain.Shared.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\basket\src\EShopOnAbp.BasketService.Domain.Shared\EShopOnAbp.BasketService.Domain.Shared.csproj" />
+    <ProjectReference Include="..\..\..\ordering\src\EShopOnAbp.OrderingService.Domain.Shared\EShopOnAbp.OrderingService.Domain.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Domain/CatalogServiceDomainModule.cs b/services/catalog/src/EShopOnAbp.CatalogService.Domain/CatalogServiceDomainModule.cs
index aeefa861..95106895 100644
--- a/services/catalog/src/EShopOnAbp.CatalogService.Domain/CatalogServiceDomainModule.cs
+++ b/services/catalog/src/EShopOnAbp.CatalogService.Domain/CatalogServiceDomainModule.cs
@@ -1,32 +1,26 @@
-using EShopOnAbp.BasketService;
-using EShopOnAbp.CatalogService.Products;
+using EShopOnAbp.CatalogService.Products;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Domain;
 using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.Modularity;
 
-namespace EShopOnAbp.CatalogService
+namespace EShopOnAbp.CatalogService;
+
+[DependsOn(
+    typeof(CatalogServiceDomainSharedModule),
+    typeof(AbpDddDomainModule),
+    typeof(AbpAutoMapperModule)
+)]
+public class CatalogServiceDomainModule : AbpModule
 {
-    [DependsOn(
-        typeof(CatalogServiceDomainSharedModule),
-        typeof(AbpDddDomainModule),
-        typeof(AbpAutoMapperModule),
-        typeof(BasketServiceDomainSharedModule)
-    )]
-    public class CatalogServiceDomainModule : AbpModule
+    public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
+        Configure<AbpAutoMapperOptions>(options => { options.AddMaps<CatalogServiceDomainModule>(validate: true); });
+
+        Configure<AbpDistributedEntityEventOptions>(options =>
         {
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddMaps<CatalogServiceDomainModule>(validate: true);
-            });
-            
-            Configure<AbpDistributedEntityEventOptions>(options =>
-            {
-                options.AutoEventSelectors.Add<Product>();
-                options.EtoMappings.Add<Product, ProductEto>();
-            });
-        }
+            options.AutoEventSelectors.Add<Product>();
+            options.EtoMappings.Add<Product, ProductEto>();
+        });
     }
-}
+}
\ No newline at end of file