From 55e506d47175beaf48c4317d62026b1236f2ba9b Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Wed, 16 Feb 2022 10:32:52 +0300
Subject: [PATCH] updated basket contracts module

---
 .../BasketProductEventHandler.cs              |  2 +-
 .../BasketServiceContractsModule.cs           | 30 ++++++++++++++++++-
 .../BasketServiceDomainErrorCodes.cs          |  0
 .../EShopOnAbp.BasketService.Contracts.csproj |  6 ++++
 .../BasketServiceModule.cs                    | 30 -------------------
 5 files changed, 36 insertions(+), 32 deletions(-)
 rename services/basket/src/{EShopOnAbp.BasketService => EShopOnAbp.BasketService.Contracts}/BasketServiceDomainErrorCodes.cs (100%)

diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/BasketProductEventHandler.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/BasketProductEventHandler.cs
index 17b39bb9..e8a673d1 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/BasketProductEventHandler.cs
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/BasketProductEventHandler.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using EShopOnAbp.BasketService.Entities;
+using EShopOnAbp.BasketService.Services;
 using Microsoft.AspNetCore.SignalR;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus.Distributed;
diff --git a/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceContractsModule.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceContractsModule.cs
index 593beefd..ff135b0e 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceContractsModule.cs
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceContractsModule.cs
@@ -1,7 +1,35 @@
-using Volo.Abp.Modularity;
+using EShopOnAbp.BasketService.Localization;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Localization;
+using Volo.Abp.Localization.ExceptionHandling;
+using Volo.Abp.Modularity;
+using Volo.Abp.Validation.Localization;
 
 namespace EShopOnAbp.BasketService;
 
 public class BasketServiceContractsModule : AbpModule 
 {
+    public const string RemoteServiceName = "Catalog";
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        context.Services.AddStaticHttpClientProxies(
+            typeof(BasketServiceContractsModule).Assembly,
+            RemoteServiceName
+        );
+
+        Configure<AbpLocalizationOptions>(options =>
+        {
+            options.Resources
+                .Add<BasketServiceResource>("en")
+                .AddBaseTypes(typeof(AbpValidationResource))
+                .AddVirtualJson("/Localization/BasketService");
+
+            options.DefaultResourceType = typeof(BasketServiceResource);
+        });
+
+        Configure<AbpExceptionLocalizationOptions>(options =>
+        {
+            options.MapCodeNamespace("BasketService", typeof(BasketServiceResource));
+        });
+    }
 }
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService/BasketServiceDomainErrorCodes.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceDomainErrorCodes.cs
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService/BasketServiceDomainErrorCodes.cs
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceDomainErrorCodes.cs
diff --git a/services/basket/src/EShopOnAbp.BasketService.Contracts/EShopOnAbp.BasketService.Contracts.csproj b/services/basket/src/EShopOnAbp.BasketService.Contracts/EShopOnAbp.BasketService.Contracts.csproj
index 3452939c..673549e6 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Contracts/EShopOnAbp.BasketService.Contracts.csproj
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/EShopOnAbp.BasketService.Contracts.csproj
@@ -8,6 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Volo.Abp.Http.Client" Version="5.1.2" />
         <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="5.1.2" />
         <PackageReference Include="Volo.Abp.Authorization" Version="5.1.2" />
     </ItemGroup>
@@ -16,6 +17,11 @@
         <ProjectReference Include="..\..\..\catalog\src\EShopOnAbp.CatalogService.Application.Contracts\EShopOnAbp.CatalogService.Application.Contracts.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+        <EmbeddedResource Include="**\*generate-proxy.json" />
+        <Content Remove="**\*generate-proxy.json" />
+    </ItemGroup>
+
     <ItemGroup>
         <EmbeddedResource Include="Localization\BasketService\*.json" />
         <Content Remove="Localization\BasketService\*.json" />
diff --git a/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs b/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs
index c96d47e0..4d3bdf19 100644
--- a/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs
+++ b/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs
@@ -36,8 +36,6 @@ namespace EShopOnAbp.BasketService
     )]
     public class BasketServiceModule : AbpModule 
     {
-        public const string RemoteServiceName = "Basket";
-        
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             var hostingEnvironment = context.Services.GetHostingEnvironment();
@@ -47,8 +45,6 @@ namespace EShopOnAbp.BasketService
             ConfigureGrpc(context);
             ConfigureDistributedCache();
             ConfigureVirtualFileSystem();
-            ConfigureLocalization();
-            ConfigureHttpApiProxy(context);
             ConfigureAuthentication(context, configuration);
             ConfigureSwagger(context, configuration);
             ConfigureAutoApiControllers();
@@ -133,14 +129,6 @@ namespace EShopOnAbp.BasketService
                 options.ConventionalControllers.Create(typeof(BasketServiceModule).Assembly);
             });
         }
-        
-        private void ConfigureHttpApiProxy(ServiceConfigurationContext context)
-        {
-            context.Services.AddStaticHttpClientProxies(
-                typeof(BasketServiceModule).Assembly,
-                RemoteServiceName
-            );
-        }
 
         private void ConfigureGrpc(ServiceConfigurationContext context)
         {
@@ -188,23 +176,5 @@ namespace EShopOnAbp.BasketService
                 options.FileSets.AddEmbedded<BasketServiceModule>();
             });
         }
-
-        private void ConfigureLocalization()
-        {
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Add<BasketServiceResource>("en")
-                    .AddBaseTypes(typeof(AbpValidationResource))
-                    .AddVirtualJson("/Localization/BasketService");
-
-                options.DefaultResourceType = typeof(BasketServiceResource);
-            });
-
-            Configure<AbpExceptionLocalizationOptions>(options =>
-            {
-                options.MapCodeNamespace("BasketService", typeof(BasketServiceResource));
-            });
-        }
     }
 }