Fixed bug with EF duplicate PK when order update if any of shipments …

…have a new shipment item
VirtoCommerce · Sep 21, 2018 · 943bb97 · 943bb97
1 parent ecccede
commit 943bb97
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/VirtoCommerce.OrderModule.Data/Model/ShipmentItemEntity.cs b/VirtoCommerce.OrderModule.Data/Model/ShipmentItemEntity.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Omu.ValueInjecter;
@@ -43,7 +43,11 @@ public virtual ShipmentItemEntity FromModel(ShipmentItem shipmentItem, PrimaryKe
 
             pkMap.AddPair(shipmentItem, this);
             this.InjectFrom(shipmentItem);
-            ModelLineItem = shipmentItem.LineItem;
+            //Store ModelLineItem for future linking with the order line item only for new objects otherwise we will get error when saving
+            if (shipmentItem.LineItem != null && shipmentItem.LineItem.IsTransient())
+            {
+                ModelLineItem = shipmentItem.LineItem;
+            }
             return this;
         }
 

diff --git a/VirtoCommerce.OrderModule.Web/Controllers/Api/OrderModuleController.cs b/VirtoCommerce.OrderModule.Web/Controllers/Api/OrderModuleController.cs
@@ -71,6 +71,7 @@ public OrderModuleController(ICustomerOrderService customerOrderService, ICustom
             _notificationManager = notificationManager;
             _notificationTemplateResolver = notificationTemplateResolver;
             _changeLogService = changeLogService;
+            _totalsCalculator = totalsCalculator;
         }
 
         /// <summary>