Merge pull request #216 from knelson-farmbeltnorth/develop

strhea · web-flow · commit 695a27702bce · 2024-04-23T18:12:54.000-05:00
Scoping issue with the CropVarietyMapper resulting in duplicate IDs
diff --git a/ISOv4Plugin/Mappers/CropTypeMapper.cs b/ISOv4Plugin/Mappers/CropTypeMapper.cs
@@ -72,8 +72,7 @@ public ISOCropType ExportCropType(Crop adaptCropType, ISOProductGroup cropTypePr
                     IEnumerable<CropVarietyProduct> cropVarieties = varietyProducts.Cast<CropVarietyProduct>().Where(v => v.CropId == adaptCropType.Id.ReferenceId);
                     if (cropVarieties.Any())
                     {
-                        CropVarietyMapper varietyMapper = new CropVarietyMapper(TaskDataMapper);
-                        isoCrop.CropVarieties = varietyMapper.ExportCropVarieties(cropVarieties).ToList();
+                        isoCrop.CropVarieties = TaskDataMapper.CropVarietyMapper.ExportCropVarieties(cropVarieties).ToList();
                     }
                 }
             }
@@ -112,8 +111,7 @@ public Crop ImportCropType(ISOCropType isoCropType)
             //Varieties
             if (isoCropType.CropVarieties.Any())
             {
-                CropVarietyMapper varietyMapper = new CropVarietyMapper(TaskDataMapper);
-                varietyMapper.ImportCropVarieties(adaptCrop, isoCropType.CropVarieties);
+                TaskDataMapper.CropVarietyMapper.ImportCropVarieties(adaptCrop, isoCropType.CropVarieties);
             }
 
             return adaptCrop;
diff --git a/ISOv4Plugin/Mappers/TaskDataMapper.cs b/ISOv4Plugin/Mappers/TaskDataMapper.cs
@@ -111,6 +111,19 @@ public ProductGroupMapper ProductGroupMapper
             }
         }
 
+        CropVarietyMapper _cropVarietyMapper;
+        public CropVarietyMapper CropVarietyMapper
+        {
+            get
+            {
+                if (_cropVarietyMapper == null)
+                {
+                    _cropVarietyMapper = new CropVarietyMapper(this);
+                }
+                return _cropVarietyMapper;
+            }
+        }
+
         GuidanceGroupMapper _guidanceGroupMapper;
         public GuidanceGroupMapper GuidanceGroupMapper
         {

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,7 @@ public ISOCropType ExportCropType(Crop adaptCropType, ISOProductGroup cropTypePr`
`72`	`72`	`IEnumerable<CropVarietyProduct> cropVarieties = varietyProducts.Cast<CropVarietyProduct>().Where(v => v.CropId == adaptCropType.Id.ReferenceId);`
`73`	`73`	`if (cropVarieties.Any())`
`74`	`74`	`{`
`75`		`- CropVarietyMapper varietyMapper = new CropVarietyMapper(TaskDataMapper);`
`76`		`- isoCrop.CropVarieties = varietyMapper.ExportCropVarieties(cropVarieties).ToList();`
	`75`	`+ isoCrop.CropVarieties = TaskDataMapper.CropVarietyMapper.ExportCropVarieties(cropVarieties).ToList();`
`77`	`76`	`}`
`78`	`77`	`}`
`79`	`78`	`}`
`@@ -112,8 +111,7 @@ public Crop ImportCropType(ISOCropType isoCropType)`
`112`	`111`	`//Varieties`
`113`	`112`	`if (isoCropType.CropVarieties.Any())`
`114`	`113`	`{`
`115`		`- CropVarietyMapper varietyMapper = new CropVarietyMapper(TaskDataMapper);`
`116`		`- varietyMapper.ImportCropVarieties(adaptCrop, isoCropType.CropVarieties);`
	`114`	`+ TaskDataMapper.CropVarietyMapper.ImportCropVarieties(adaptCrop, isoCropType.CropVarieties);`
`117`	`115`	`}`
`118`	`116`
`119`	`117`	`return adaptCrop;`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,19 @@ public ProductGroupMapper ProductGroupMapper`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
	`114`	`+ CropVarietyMapper _cropVarietyMapper;`
	`115`	`+ public CropVarietyMapper CropVarietyMapper`
	`116`	`+ {`
	`117`	`+ get`
	`118`	`+ {`
	`119`	`+ if (_cropVarietyMapper == null)`
	`120`	`+ {`
	`121`	`+ _cropVarietyMapper = new CropVarietyMapper(this);`
	`122`	`+ }`
	`123`	`+ return _cropVarietyMapper;`
	`124`	`+ }`
	`125`	`+ }`
	`126`	`+`
`114`	`127`	`GuidanceGroupMapper _guidanceGroupMapper;`
`115`	`128`	`public GuidanceGroupMapper GuidanceGroupMapper`
`116`	`129`	`{`