[DI-1132] Add Delete By Id Functionality

DataImport.Common.Tests/appsettings.json

@@ -1,3 +1,3 @@
-{
+{
     "PythonExecutableLocation": "..\\..\\..\\..\\.tools\\python\\python.exe"
 }

DataImport.Common/DataImport.Common.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
   </PropertyGroup>

DataImport.Common/Preprocessors/ExternalPreprocessorService.cs

@@ -90,7 +90,7 @@ void WriteToCollection(DataReceivedEventArgs eventArgs, Collection<string> colle
             {
                 using var process = Process.Start(startInfo);
 
-                var processName = process.ProcessName;
+                var processName = process.HasExited ? "Exited python process" : process.ProcessName;
                 _logger.LogInformation("External preprocess {ProcessName} started", processName);
 
                 process.OutputDataReceived += (_, e) => { WriteToCollection(e, outputLines); };

DataImport.Models.Tests/DataMapExtensionsTests.cs

@@ -61,7 +61,7 @@ public void SetUp()
             };
 
             var dataMapSerializer = new DataMapSerializer(_dataMap);
-            _dataMap.Map = dataMapSerializer.Serialize(mappings);
+            _dataMap.Map = dataMapSerializer.Serialize(mappings, false);
         }
 
         [Test]

DataImport.Models/DataMapExtensions.cs

@@ -34,7 +34,7 @@ public static string[] ReferencedColumns(this DataMapper[] mappings)
         private static DataMapper[] Mappings(DataMap dataMap)
         {
             var dataMapSerializer = new DataMapSerializer(dataMap);
-            return dataMapSerializer.Deserialize(dataMap.Map);
+            return dataMapSerializer.Deserialize(dataMap.Map, false);
         }
 
         private static IEnumerable<string> Yield(this IEnumerable<DataMapper> mappings, Func<DataMapper, string> propertyAccessor)

DataImport.Models/DataMapSerializer.cs

@@ -39,12 +39,14 @@ public DataMapSerializer(string resourcePath, ResourceMetadata[] resourceMetadat
             _resourceMetadatas = resourceMetadatas;
         }
 
-        public string Serialize(DataMapper[] mappings)
+        public string Serialize(DataMapper[] mappings, bool isDeleteByIdOperation)
         {
-            return SerializeObject(_resourceMetadatas, mappings).ToString(Formatting.Indented);
+            return isDeleteByIdOperation
+                ? SerializeObjectForDeleteById(mappings.Single()).ToString(Formatting.Indented)
+                : SerializeObject(_resourceMetadatas, mappings).ToString(Formatting.Indented);
         }
 
-        public DataMapper[] Deserialize(string jsonMap)
+        public DataMapper[] Deserialize(string jsonMap, bool isDeleteByIdOperation)
         {
             JObject jobject;
             try
@@ -60,12 +62,14 @@ public DataMapper[] Deserialize(string jsonMap)
                     , exception);
             }
 
-            return Deserialize(jobject);
+            return Deserialize(jobject, isDeleteByIdOperation);
         }
 
-        public DataMapper[] Deserialize(JObject jsonMap)
+        public DataMapper[] Deserialize(JObject jsonMap, bool isDeleteByIdOperation)
         {
-            return DeserializeObject(_resourceMetadatas, jsonMap).ToArray();
+            return isDeleteByIdOperation
+                ? DeserializeObjectForDeleteById(jsonMap).ToArray()
+                : DeserializeObject(_resourceMetadatas, jsonMap).ToArray();
         }
 
         private JObject SerializeObject(IReadOnlyList<ResourceMetadata> nodeMetadatas, IReadOnlyList<DataMapper> nodes)
@@ -125,6 +129,12 @@ private JObject SerializeObject(IReadOnlyList<ResourceMetadata> nodeMetadatas, I
             return result;
         }
 
+        private JObject SerializeObjectForDeleteById(DataMapper node)
+        {
+            var result = new JObject { new JProperty("Id", new JObject { new JProperty("Column", node.SourceColumn) }) };
+            return result;
+        }
+
         private JArray SerializeArray(ResourceMetadata arrayItemMetadata, IReadOnlyList<DataMapper> nodes)
         {
             var result = new JArray();
@@ -168,7 +178,7 @@ private List<DataMapper> DeserializeObject(IReadOnlyList<ResourceMetadata> nodeM
 
             foreach (var node in nodes)
             {
-                if (nodeMetadatas.All(x => x.Name != node.Name))
+                if (node.Name != "Id" && nodeMetadatas.All(x => x.Name != node.Name))
                     throw new InvalidOperationException(
                         $"Cannot deserialize mappings from JSON, because the key '{node.Name}' should not exist " +
                         $"according to the metadata for resource '{_resourcePath}'.");
@@ -213,6 +223,31 @@ private List<DataMapper> DeserializeObject(IReadOnlyList<ResourceMetadata> nodeM
             return result;
         }
 
+        private List<DataMapper> DeserializeObjectForDeleteById(JToken objectToken)
+        {
+            var jobject = objectToken as JObject;
+
+            if (jobject == null)
+                throw new InvalidOperationException(
+                    "Cannot deserialize mappings from JSON, because an object literal was expected. " +
+                    "Instead, found: " +
+                    $"{objectToken.ToString(Formatting.Indented)}");
+
+            var result = new List<DataMapper>();
+
+            var nodes = jobject.Children().Cast<JProperty>().ToArray();
+
+            var node = nodes.Single(n => n.Name == "Id");
+
+            var propertyValue = node.Children().Single();
+
+            var sourceColumn = ((JObject) propertyValue).Children().Cast<JProperty>().Single().Value;
+
+            result.Add(new DataMapper() { Name = "Id", SourceColumn = DeserializeRawValue(sourceColumn) });
+
+            return result;
+        }
+
         private List<DataMapper> DeserializeArray(ResourceMetadata arrayItemMetadata, JToken arrayToken)
         {
             var array = arrayToken as JArray;

DataImport.Models/Datamap.cs

@@ -48,5 +48,7 @@ public DataMap()
         public Script FileProcessorScript { get; set; }
 
         public ICollection<DataMapAgent> DataMapAgents { get; set; }
+
+        public bool IsDeleteOperation { get; set; }
     }
 }

DataImport.Models/MetadataValidationExtensions.cs

@@ -50,12 +50,12 @@ private static bool IsObjectCompatibleWithResource(this JObject jsonMap, Resourc
             try
             {
                 var serializer = new DataMapSerializer(resource);
-                var deserialized = serializer.Deserialize(jsonMap);
+                var deserialized = serializer.Deserialize(jsonMap, false);
 
                 if (level == MetadataCompatibilityLevel.Bootstrap && deserialized.ReferencedColumns().Any())
                     throw new Exception("Bootstrap JSON cannot include column references.");
 
-                serializer.Serialize(deserialized);
+                serializer.Serialize(deserialized, false);
                 exceptionMessage = null;
                 return true;
             }