Merge pull request #226 from lzaslav/task-product-type

Add manufacturer specific logic to create harvest commodity product

Author: strhea

ISOv4Plugin/ISOModels/ISOTask.cs

@@ -140,6 +140,7 @@ public static ISOTask ReadXML(XmlNode taskNode)
             task.DefaultTreatmentZoneCode = taskNode.GetXmlNodeValueAsNullableInt("@H");
             task.PositionLostTreatmentZoneCode = taskNode.GetXmlNodeValueAsNullableInt("@I");
             task.OutOfFieldTreatmentZoneCode = taskNode.GetXmlNodeValueAsNullableInt("@J");
+            task.ProprietarySchemaExtensions = ReadProperietarySchemaExtensions(taskNode);
 
             //Treatment Zones
             XmlNodeList tznNodes = taskNode.SelectNodes("TZN");

ISOv4Plugin/Mappers/Factories/TimeLogMapperFactory.cs

@@ -65,7 +65,7 @@ public IEnumerable<OperationData> ImportTimeLogs(ISOTask loggedTask, int? prescr
                     : _timeLogMapper.ImportTimeLogs(loggedTask, timeLogGroup, prescriptionID));
             }
 
-            return _manufacturer?.PostProcessOperationData(_taskDataMapper, operationDatas) ?? operationDatas;
+            return _manufacturer?.PostProcessOperationData(_taskDataMapper, loggedTask, operationDatas) ?? operationDatas;
         }
 
         public IEnumerable<ISOTimeLog> ExportTimeLogs(IEnumerable<OperationData> operationDatas, string dataPath)

ISOv4Plugin/Mappers/Manufacturers/CNH.cs

@@ -215,10 +215,12 @@ public string GetProductManufacturer(ISOProduct isoProduct)
         }
 
 
-        public IEnumerable<OperationData> PostProcessOperationData(TaskDataMapper taskDataMapper, IEnumerable<OperationData> operationDatas)
+        public IEnumerable<OperationData> PostProcessOperationData(TaskDataMapper taskDataMapper, ISOTask isoTask, IEnumerable<OperationData> operationDatas)
         {
             var result = new List<OperationData>();
 
+            var cropNameFromTask = GetCropName(isoTask);
+
             var catalog = taskDataMapper.AdaptDataModel.Catalog;
             foreach (var operationData in operationDatas)
             {
@@ -244,11 +246,56 @@ public IEnumerable<OperationData> PostProcessOperationData(TaskDataMapper taskDa
                         continue;
                     }
                 }
+
+                if (!string.IsNullOrEmpty(cropNameFromTask) &&
+                    operationData.OperationType != OperationTypeEnum.DataCollection &&
+                    (operationData.ProductIds == null || operationData.ProductIds.Count == 0))
+                {
+                    operationData.ProductIds = new List<int>
+                    {
+                        AddOrGetHavestCommodityProduct(catalog, cropNameFromTask).Id.ReferenceId
+                    };
+                }
+
                 result.Add(operationData);
             }
             return result;
         }
 
+        private HarvestedCommodityProduct AddOrGetHavestCommodityProduct(ApplicationDataModel.ADM.Catalog catalog, string cropName)
+        {
+            Crop adaptCrop = catalog.Crops.FirstOrDefault(x => x.Name.EqualsIgnoreCase(cropName));
+            if (adaptCrop == null)
+            {
+                // Create a new one
+                adaptCrop = new Crop
+                {
+                    Name = cropName
+                };
+                catalog.Crops.Add(adaptCrop);
+            }
+
+            var commodityProduct = catalog.Products.OfType<HarvestedCommodityProduct>()
+                .FirstOrDefault(x => x.Description.EqualsIgnoreCase(cropName) && x.CropId == adaptCrop.Id.ReferenceId);
+            if (commodityProduct == null)
+            {
+                // New harvested commodity product
+                commodityProduct = new HarvestedCommodityProduct
+                {
+                    Category = CategoryEnum.Variety,
+                    Form = ProductFormEnum.Solid,
+                    ProductType = ProductTypeEnum.Variety,
+                    HasHarvestCommodity = true,
+                    Description = cropName
+                };
+
+                commodityProduct.CropId = adaptCrop.Id.ReferenceId;
+
+                catalog.Products.Add(commodityProduct);
+            }
+            return commodityProduct;
+        }
+
         public void PostProcessPolygons(List<Polygon> polygons)
         {
             var groupedPolygons = polygons.GroupBy(x => x.ExteriorRing != null).ToDictionary(x => x.Key, x => x.ToList());

ISOv4Plugin/Mappers/Manufacturers/ManufacturerFactory.cs

@@ -15,7 +15,7 @@ internal interface IManufacturer
         CategoryEnum? GetProductCategory(ISOProduct isoProduct);
         string GetProductManufacturer(ISOProduct isoProduct);
 
-        IEnumerable<OperationData> PostProcessOperationData(TaskDataMapper taskDataMapper, IEnumerable<OperationData> operationDatas);
+        IEnumerable<OperationData> PostProcessOperationData(TaskDataMapper taskDataMapper, ISOTask isoTask, IEnumerable<OperationData> operationDatas);
         void PostProcessPolygons(List<Polygon> polygons);
     }
 

ISOv4Plugin/Mappers/ProductMapper.cs

@@ -213,6 +213,7 @@ public Product ImportProduct(ISOProduct isoProduct)
         {
             //First check if we've already created a matching seed product from the crop type
             Product product = DataModel.Catalog.Products.FirstOrDefault(p => p.ProductType == ProductTypeEnum.Variety && p.Description == isoProduct.ProductDesignator)
+                ?? CreateCropProductFromCropType(isoProduct)
                 ?? CreateNewProductInstance(isoProduct);
 
             //ID
@@ -349,6 +350,25 @@ private string GetQuantityDDI(string quantityDDI, ProductFormEnum productForm)
         }
 
         private Product CreateNewProductInstance(ISOProduct isoProduct)
+        {
+            Product product;
+            //Type
+            switch (isoProduct.ProductType)
+            {
+                case ISOProductType.Mixture:
+                case ISOProductType.TemporaryMixture:
+                    product = new MixProduct();
+                    product.ProductType = ProductTypeEnum.Mix;
+                    break;
+                default:
+                    product = new GenericProduct();
+                    product.ProductType = _manufacturer?.GetProductType(isoProduct) ?? ProductTypeEnum.Generic;
+                    break;
+            }
+            return product;
+        }
+
+        private Product CreateCropProductFromCropType(ISOProduct isoProduct)
         {
             // If there is a manufacturer defined attribute representing a crop name, use it
             string cropName = _manufacturer?.GetCropName(isoProduct);
@@ -357,6 +377,7 @@ private Product CreateNewProductInstance(ISOProduct isoProduct)
                 // New crop variety product
                 var cropProduct = new CropVarietyProduct();
                 cropProduct.ProductType = ProductTypeEnum.Variety;
+                cropProduct.Description = cropName;
 
                 // Check if there is already Crop in ADAPT model
                 Crop adaptCrop = TaskDataMapper.AdaptDataModel.Catalog.Crops.FirstOrDefault(x => x.Name.EqualsIgnoreCase(cropName));
@@ -371,21 +392,7 @@ private Product CreateNewProductInstance(ISOProduct isoProduct)
                 return cropProduct;
             }
 
-            Product product;
-            //Type
-            switch (isoProduct.ProductType)
-            {
-                case ISOProductType.Mixture:
-                case ISOProductType.TemporaryMixture:
-                    product = new MixProduct();
-                    product.ProductType = ProductTypeEnum.Mix;
-                    break;
-                default:
-                    product = new GenericProduct();
-                    product.ProductType = _manufacturer?.GetProductType(isoProduct) ?? ProductTypeEnum.Generic;
-                    break;
-            }
-            return product;
+            return null;
         }
 
         /// <summary>