Merge branch 'develop'

Author: kelly-nelson

StandardPlugin/CommonExporters.cs

@@ -26,11 +26,11 @@ public CommonExporters(Standard.Root root)
             _catalog = root.Catalog;
             Errors = new List<IError>();
 
-            var mappingFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "TypeMappings/framework-to-standard-type-mappings.json");
+            var mappingFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "framework-to-standard-type-mappings.json");
             string mappingData = File.ReadAllText(mappingFile);
             TypeMappings = JsonConvert.DeserializeObject<List<TypeMapping>>(mappingData);
 
-            var standardTypesFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "ADAPTStandard/adapt-data-type-definitions.json");
+            var standardTypesFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "adapt-data-type-definitions.json");
             string typesJson = File.ReadAllText(standardTypesFile);
             StandardDataTypes = JsonConvert.DeserializeObject<DataTypeDefinitions.DataTypeDefinitions>(typesJson);
         }

…gin/ADAPTStandard/DataTypeDefinitions.cs StandardPlugin/DataTypeDefinitions.csStandardPlugin/ADAPTStandard/DataTypeDefinitions.cs renamed to StandardPlugin/DataTypeDefinitions.cs StandardPlugin/ADAPTStandard/DataTypeDefinitions.cs renamed to StandardPlugin/DataTypeDefinitions.cs

@@ -84,9 +84,9 @@ public partial class NumericDataTypeDefinitionAttributes
         public string UnitOfMeasureCode { get; set; }
     }
 
-    public enum DataDefinitionBaseTypeCode { Enumeration, Numeric, Text };
+    public enum DataDefinitionBaseTypeCode { Enumeration, Numeric, Text, Boolean };
 
-    public enum StatusCode { Valid };
+    public enum StatusCode { Valid, Invalid };
 
     public enum NumericDataTypeCode { Double, Integer };
 
@@ -145,6 +145,9 @@ public override void WriteJson(JsonWriter writer, object untypedValue, JsonSeria
                 case DataDefinitionBaseTypeCode.Text:
                     serializer.Serialize(writer, "TEXT");
                     return;
+                case DataDefinitionBaseTypeCode.Boolean:
+                    serializer.Serialize(writer, "BOOLEAN");
+                    return;
             }
             throw new Exception("Cannot marshal type DataDefinitionBaseTypeCode");
         }
@@ -180,6 +183,11 @@ public override void WriteJson(JsonWriter writer, object untypedValue, JsonSeria
                 serializer.Serialize(writer, "VALID");
                 return;
             }
+            if (value == StatusCode.Invalid)
+            {
+                serializer.Serialize(writer, "INVALID");
+                return;
+            }
             throw new Exception("Cannot marshal type StatusCode");
         }
 

StandardPlugin/ADAPTStandard/Standard.cs StandardPlugin/Standard.csStandardPlugin/ADAPTStandard/Standard.cs renamed to StandardPlugin/Standard.cs

@@ -26,8 +26,17 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup>
-    <None Update="ADAPTStandard/adapt-data-type-definitions.json" CopyToOutputDirectory="PreserveNewest" />
-    <None Update="TypeMappings/framework-to-standard-type-mappings.json" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="adapt-data-type-definitions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="framework-to-standard-type-mappings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+</ItemGroup>
+  <ItemGroup>
+    <None Include="adapt-data-type-definitions.json" Pack="true" PackagePath="build/" />
+    <None Include="framework-to-standard-type-mappings.json" Pack="true" PackagePath="build/" />
+    <None Include="build/AgGateway.ADAPT.StandardPlugin.targets" Pack="true" PackagePath="build/AgGateway.ADAPT.StandardPlugin.targets" />
   </ItemGroup>
 
 </Project>

StandardPlugin/StandardPlugin.csproj

@@ -20,6 +20,7 @@ internal class WorkRecordExporter
         private readonly Standard.Root _root;
         private int _variableCounter;
         private readonly string _exportPath;
+        private List<string> _operationIds = new List<string>();
         private WorkRecordExporter(Root root, string exportPath, Properties properties)
         {
             _variableCounter = 0;
@@ -267,13 +268,21 @@ private void ExportOperation(OperationDefinition operationDefinition, Applicatio
                                     p.Id.ReferenceId == r).Description)
                             .Aggregate((i, j) => i + "_" + j);
             }
-            string outputFileName = string.Concat(operationType, products, ".parquet");
+            string candidateName = string.Concat(operationType, products);
+            string uniqueName = candidateName;
+            int opNameCounter = 1;
+            while (_operationIds.Contains(uniqueName))
+            {
+                uniqueName = string.Concat(candidateName, "_", opNameCounter++);
+            }
+            _operationIds.Add(uniqueName);
+            string outputFileName = string.Concat(uniqueName, ".parquet");
             outputFileName = new string(outputFileName.Where(c => !Path.GetInvalidFileNameChars().Contains(c)).ToArray());
             if (outputFileName.Length > 255)
             {
                 outputFileName = outputFileName.Substring(0, 255);
             }
-            var id = new Id() { ReferenceId = Guid.NewGuid().ToString() };
+            var id = new Id() { ReferenceId = uniqueName };
             var variables = operationDefinition.VariablesByOutputName.Values.ToList();
             string joinedName = string.Join("_", operationDefinition.SourceOperations.Select(x => x.OperationData.Description));
             string name = string.IsNullOrEmpty(joinedName) ? workRecord.Name + "_" + operationType : joinedName;