Added BasketService Contracts

services/basket/EShopOnAbp.BasketService.sln

@@ -9,6 +9,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-7
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.BasketService", "src\EShopOnAbp.BasketService\EShopOnAbp.BasketService.csproj", "{83F0BE02-6B71-4695-B86F-18DEEE34B485}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.BasketService.Contracts", "src\EShopOnAbp.BasketService.Contracts\EShopOnAbp.BasketService.Contracts.csproj", "{D2C4E464-221E-42F3-B1BB-79ABC5C3AC64}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,12 +21,17 @@ Global
 		{83F0BE02-6B71-4695-B86F-18DEEE34B485}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{83F0BE02-6B71-4695-B86F-18DEEE34B485}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83F0BE02-6B71-4695-B86F-18DEEE34B485}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2C4E464-221E-42F3-B1BB-79ABC5C3AC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2C4E464-221E-42F3-B1BB-79ABC5C3AC64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2C4E464-221E-42F3-B1BB-79ABC5C3AC64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2C4E464-221E-42F3-B1BB-79ABC5C3AC64}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{83F0BE02-6B71-4695-B86F-18DEEE34B485} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+		{D2C4E464-221E-42F3-B1BB-79ABC5C3AC64} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6AAFA1C6-603E-13FA-45E5-7910AA9F661D}

services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceContractsModule.cs

@@ -0,0 +1,7 @@
+using Volo.Abp.Modularity;
+
+namespace EShopOnAbp.BasketService;
+
+public class BasketServiceContractsModule : AbpModule 
+{
+}

services/basket/src/EShopOnAbp.BasketService.Contracts/EShopOnAbp.BasketService.Contracts.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <RootNamespace>EShopOnAbp.BasketService</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="5.1.2" />
+        <PackageReference Include="Volo.Abp.Authorization" Version="5.1.2" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\catalog\src\EShopOnAbp.CatalogService.Application.Contracts\EShopOnAbp.CatalogService.Application.Contracts.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <EmbeddedResource Include="Localization\BasketService\*.json" />
+        <Content Remove="Localization\BasketService\*.json" />
+    </ItemGroup>
+    
+</Project>

services/basket/src/EShopOnAbp.BasketService/Services/Dtos/AddProductDto.cs → services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/AddProductDto.cs

@@ -1,6 +1,7 @@
+using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace EShopOnAbp.BasketService.Services.Dtos;
+namespace EShopOnAbp.BasketService.Services;
 
 public class AddProductDto : IHasAnonymousId
 {

services/basket/src/EShopOnAbp.BasketService/Services/Dtos/BasketDto.cs → services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/BasketDto.cs

@@ -1,4 +1,6 @@
-namespace EShopOnAbp.BasketService.Services.Dtos;
+using System.Collections.Generic;
+
+namespace EShopOnAbp.BasketService.Services;
 
 public class BasketDto
 {

services/basket/src/EShopOnAbp.BasketService/Services/Dtos/BasketItemDto.cs → services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/BasketItemDto.cs

@@ -1,4 +1,6 @@
-namespace EShopOnAbp.BasketService.Services.Dtos;
+using System;
+
+namespace EShopOnAbp.BasketService.Services;
 
 public class BasketItemDto
 {

services/basket/src/EShopOnAbp.BasketService/Services/Dtos/IHasAnonymousId.cs → services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/IHasAnonymousId.cs

@@ -1,4 +1,6 @@
-namespace EShopOnAbp.BasketService.Services.Dtos
+using System;
+
+namespace EShopOnAbp.BasketService.Services
 {
     public interface IHasAnonymousId
     {

services/basket/src/EShopOnAbp.BasketService/Services/Dtos/RemoveProductDto.cs → services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/RemoveProductDto.cs

@@ -1,4 +1,6 @@
-namespace EShopOnAbp.BasketService.Services.Dtos;
+using System;
+
+namespace EShopOnAbp.BasketService.Services;
 
 public class RemoveProductDto : IHasAnonymousId
 {

services/basket/src/EShopOnAbp.BasketService/Services/IBasketAppService.cs → services/basket/src/EShopOnAbp.BasketService.Contracts/Services/IBasketAppService.cs

@@ -1,4 +1,5 @@
-using EShopOnAbp.BasketService.Services.Dtos;
+using System;
+using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 
 namespace EShopOnAbp.BasketService.Services;

services/basket/src/EShopOnAbp.BasketService/Services/IBasketProductService.cs → services/basket/src/EShopOnAbp.BasketService.Contracts/Services/IBasketProductService.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using EShopOnAbp.CatalogService.Products;
 using JetBrains.Annotations;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Services;
 
 public interface IBasketProductService
 {

services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs

@@ -1,6 +1,5 @@
 using EShopOnAbp.BasketService.Entities;
 using EShopOnAbp.BasketService.Localization;
-using EShopOnAbp.CatalogService;
 using EShopOnAbp.CatalogService.Grpc;
 using EShopOnAbp.Shared.Hosting.AspNetCore;
 using EShopOnAbp.Shared.Hosting.Microservices;
@@ -32,7 +31,7 @@ namespace EShopOnAbp.BasketService
         typeof(AbpDddApplicationModule),
         typeof(AbpDddDomainModule),
         typeof(AbpValidationModule),
-        typeof(CatalogServiceHttpApiClientModule),
+        typeof(BasketServiceContractsModule),
         typeof(EShopOnAbpSharedHostingMicroservicesModule)
     )]
     public class BasketServiceModule : AbpModule 

services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj

@@ -13,7 +13,8 @@
         <PackageReference Include="Grpc.Net.ClientFactory" Version="2.42.0" />
         <PackageReference Include="Grpc.Tools" Version="2.42.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0" />
-        
+
+        <PackageReference Include="Volo.Abp.Http.Client" Version="5.1.2" />        
         <PackageReference Include="Volo.Abp.Authorization" Version="5.1.2" />
         <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="5.1.2" />
         <PackageReference Include="Volo.Abp.AutoMapper" Version="5.1.2" />
@@ -23,18 +24,18 @@
         <PackageReference Include="Volo.Abp.Validation" Version="5.1.2" />        
     </ItemGroup>
     
-    <ItemGroup>        
-        <ProjectReference Include="..\..\..\catalog\src\EShopOnAbp.CatalogService.HttpApi.Client\EShopOnAbp.CatalogService.HttpApi.Client.csproj" />
-        <ProjectReference Include="..\..\..\..\shared\EShopOnAbp.Shared.Hosting.Microservices\EShopOnAbp.Shared.Hosting.Microservices.csproj" />
+    <ItemGroup>
+        <ProjectReference Include="..\EShopOnAbp.BasketService.Contracts\EShopOnAbp.BasketService.Contracts.csproj" />
+        <ProjectReference Include="..\..\..\..\shared\EShopOnAbp.Shared.Hosting.Microservices\EShopOnAbp.Shared.Hosting.Microservices.csproj" />        
     </ItemGroup>
     
     <ItemGroup>
-        <Protobuf Include="..\..\..\catalog\src\EShopOnAbp.CatalogService.Application.Contracts\Protos\product.proto" GrpcServices="Client" />
+        <EmbeddedResource Include="**\*generate-proxy.json" />
+        <Content Remove="**\*generate-proxy.json" />
     </ItemGroup>
     
     <ItemGroup>
-        <EmbeddedResource Include="Localization\BasketService\*.json" />
-        <Content Remove="Localization\BasketService\*.json" />
+        <Protobuf Include="..\..\..\catalog\src\EShopOnAbp.CatalogService.Application.Contracts\Protos\product.proto" GrpcServices="Client" />
     </ItemGroup>
     
     <ItemGroup>

services/basket/src/EShopOnAbp.BasketService/Services/BasketAppService.cs

@@ -1,6 +1,5 @@
 using EShopOnAbp.BasketService.Entities;
 using EShopOnAbp.BasketService.Localization;
-using EShopOnAbp.BasketService.Services.Dtos;
 using EShopOnAbp.CatalogService.Products;
 using Volo.Abp;
 using Volo.Abp.Application.Services;