Merge pull request #189 from EasyAbp/remove-unused-property

Remove unused `BookingOrderProperties.OrderLineBookingVolume`

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Orders/BookingOrderProperties.cs

@@ -10,8 +10,6 @@ public class BookingOrderProperties
 
     public const string OrderLineBookingPeriodId = "BookingPeriodId";
 
-    public const string OrderLineBookingVolume = "BookingVolume";
-
     public const string OrderLineBookingDate = "BookingDate";
 
     public const string OrderLineBookingStartingTime = "BookingStartingTime";

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Orders/CreateOrderLineDtoExtensions.cs

@@ -58,8 +58,7 @@ public static class CreateOrderLineDtoExtensions
 
     public static int GetBookingVolume(this CreateOrderLineDto orderLine)
     {
-        return Check.NotNull(FindBookingVolume(orderLine),
-            BookingOrderProperties.OrderLineBookingVolume)!.Value;
+        return FindBookingVolume(orderLine)!.Value;
     }
 
     public static DateTime? FindBookingDate(this CreateOrderLineDto orderLine)
@@ -94,4 +93,4 @@ public static class CreateOrderLineDtoExtensions
         return Check.NotNull(FindBookingDuration(orderLine),
             BookingOrderProperties.OrderLineBookingDuration)!.Value;
     }
-}
+}

plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Application.Contracts/EasyAbp/EShop/Orders/OrderLineExtensions.cs

@@ -50,7 +50,7 @@ public static class OrderLineExtensions
         return Check.NotNull(FindBookingPeriodId(orderLine),
             BookingOrderProperties.OrderLineBookingPeriodId)!.Value;
     }
-    
+
     public static int? FindBookingVolume(this IOrderLine orderLine)
     {
         return orderLine.Quantity;
@@ -58,8 +58,7 @@ public static class OrderLineExtensions
 
     public static int GetBookingVolume(this IOrderLine orderLine)
     {
-        return Check.NotNull(FindBookingVolume(orderLine),
-            BookingOrderProperties.OrderLineBookingVolume)!.Value;
+        return FindBookingVolume(orderLine)!.Value;
     }
 
     public static DateTime? FindBookingDate(this IOrderLine orderLine)

plugins/Booking/test/EasyAbp.EShop.Plugins.Booking.Application.Tests/Authorization/BookingOrderCreationAuthorizationHandlersTests.cs

@@ -80,7 +80,7 @@ public class BookingOrderCreationAuthorizationHandlersTests : BookingApplication
         {
             ProductId = BookingTestConsts.BookingProduct1Id,
             ProductSkuId = BookingTestConsts.BookingProduct1Sku1Id,
-            Quantity = 1
+            Quantity = BookingTestConsts.Volume
         };
 
         orderLine1.SetProperty(BookingOrderProperties.OrderLineBookingPeriodSchemeId,
@@ -91,13 +91,12 @@ public class BookingOrderCreationAuthorizationHandlersTests : BookingApplication
         orderLine1.SetProperty(BookingOrderProperties.OrderLineBookingStartingTime,
             BookingTestConsts.Period1StartingTime);
         orderLine1.SetProperty(BookingOrderProperties.OrderLineBookingDuration, BookingTestConsts.Period1Duration);
-        orderLine1.SetProperty(BookingOrderProperties.OrderLineBookingVolume, BookingTestConsts.Volume);
 
         var orderLine2 = new CreateOrderLineDto
         {
             ProductId = BookingTestConsts.BookingProduct1Id,
             ProductSkuId = BookingTestConsts.BookingProduct1Sku1Id,
-            Quantity = 1
+            Quantity = BookingTestConsts.Volume
         };
 
         orderLine2.SetProperty(BookingOrderProperties.OrderLineBookingPeriodSchemeId,
@@ -109,7 +108,6 @@ public class BookingOrderCreationAuthorizationHandlersTests : BookingApplication
         orderLine2.SetProperty(BookingOrderProperties.OrderLineBookingStartingTime,
             BookingTestConsts.Period1StartingTime);
         orderLine2.SetProperty(BookingOrderProperties.OrderLineBookingDuration, BookingTestConsts.Period1Duration);
-        orderLine2.SetProperty(BookingOrderProperties.OrderLineBookingVolume, BookingTestConsts.Volume);
 
         var currentPrincipalAccessor = ServiceProvider.GetRequiredService<ICurrentPrincipalAccessor>();
 

plugins/Booking/test/EasyAbp.EShop.Plugins.Booking.Application.Tests/Authorization/BookingPaymentCreationAuthorizationHandlersTests.cs

@@ -6,7 +6,6 @@ using EasyAbp.EShop.Orders.Orders.Dtos;
 using EasyAbp.EShop.Payments.Booking.Authorization;
 using EasyAbp.EShop.Payments.Payments;
 using EasyAbp.EShop.Payments.Payments.Dtos;
-using EasyAbp.EShop.Plugins.Booking.ProductAssets;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
@@ -24,7 +23,7 @@ public class BookingPaymentCreationAuthorizationHandlersTests : BookingApplicati
         var handler = ServiceProvider.GetRequiredService<BookingPaymentCreationAuthorizationHandler>();
 
         var context = await CreateAuthorizationHandlerContextAsync();
-        
+
         await handler.HandleAsync(context);
 
         context.HasFailed.ShouldBeFalse();
@@ -37,7 +36,7 @@ public class BookingPaymentCreationAuthorizationHandlersTests : BookingApplicati
             Id = BookingTestConsts.OrderLine1Id,
             ProductId = BookingTestConsts.BookingProduct1Id,
             ProductSkuId = BookingTestConsts.BookingProduct1Sku1Id,
-            Quantity = 1,
+            Quantity = BookingTestConsts.Volume,
             ExtraProperties = new ExtraPropertyDictionary()
         };
 
@@ -49,14 +48,13 @@ public class BookingPaymentCreationAuthorizationHandlersTests : BookingApplicati
         orderLine1.SetProperty(BookingOrderProperties.OrderLineBookingStartingTime,
             BookingTestConsts.Period1StartingTime);
         orderLine1.SetProperty(BookingOrderProperties.OrderLineBookingDuration, BookingTestConsts.Period1Duration);
-        orderLine1.SetProperty(BookingOrderProperties.OrderLineBookingVolume, BookingTestConsts.Volume);
 
         var orderLine2 = new OrderLineDto
         {
             Id = BookingTestConsts.OrderLine2Id,
             ProductId = BookingTestConsts.BookingProduct1Id,
             ProductSkuId = BookingTestConsts.BookingProduct1Sku1Id,
-            Quantity = 1,
+            Quantity = BookingTestConsts.Volume,
             ExtraProperties = new ExtraPropertyDictionary()
         };
 
@@ -69,7 +67,6 @@ public class BookingPaymentCreationAuthorizationHandlersTests : BookingApplicati
         orderLine2.SetProperty(BookingOrderProperties.OrderLineBookingStartingTime,
             BookingTestConsts.Period1StartingTime);
         orderLine2.SetProperty(BookingOrderProperties.OrderLineBookingDuration, BookingTestConsts.Period1Duration);
-        orderLine2.SetProperty(BookingOrderProperties.OrderLineBookingVolume, BookingTestConsts.Volume);
 
         var currentPrincipalAccessor = ServiceProvider.GetRequiredService<ICurrentPrincipalAccessor>();
 

plugins/Booking/test/EasyAbp.EShop.Plugins.Booking.Application.Tests/Orders/BookingOrderCreationTests.cs

@@ -21,7 +21,7 @@ public class BookingOrderCreationTests : BookingApplicationTestBase
         {
             ProductId = BookingTestConsts.BookingProduct1Id,
             ProductSkuId = BookingTestConsts.BookingProduct1Sku1Id,
-            Quantity = 1
+            Quantity = BookingTestConsts.Volume
         };
 
         orderLine1.SetProperty(BookingOrderProperties.OrderLineBookingPeriodSchemeId,
@@ -32,13 +32,12 @@ public class BookingOrderCreationTests : BookingApplicationTestBase
         orderLine1.SetProperty(BookingOrderProperties.OrderLineBookingStartingTime,
             BookingTestConsts.Period1StartingTime);
         orderLine1.SetProperty(BookingOrderProperties.OrderLineBookingDuration, BookingTestConsts.Period1Duration);
-        orderLine1.SetProperty(BookingOrderProperties.OrderLineBookingVolume, BookingTestConsts.Volume);
 
         var orderLine2 = new CreateOrderLineDto
         {
             ProductId = BookingTestConsts.BookingProduct1Id,
             ProductSkuId = BookingTestConsts.BookingProduct1Sku1Id,
-            Quantity = 1
+            Quantity = BookingTestConsts.Volume
         };
 
         orderLine2.SetProperty(BookingOrderProperties.OrderLineBookingPeriodSchemeId,
@@ -50,7 +49,6 @@ public class BookingOrderCreationTests : BookingApplicationTestBase
         orderLine2.SetProperty(BookingOrderProperties.OrderLineBookingStartingTime,
             BookingTestConsts.Period1StartingTime);
         orderLine2.SetProperty(BookingOrderProperties.OrderLineBookingDuration, BookingTestConsts.Period1Duration);
-        orderLine2.SetProperty(BookingOrderProperties.OrderLineBookingVolume, BookingTestConsts.Volume);
 
         var order = await orderAppService.CreateAsync(new CreateOrderDto
         {