From 9ac264a12b845525cd6daf4c43be6f4d56a17ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Eleut=C3=A9rio?= Date: Mon, 17 Jun 2019 15:16:08 +0000 Subject: [PATCH 1/2] fix: convert string percentages to decimal --- src/OmniaMigrationTool/Services/ExportService.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/OmniaMigrationTool/Services/ExportService.cs b/src/OmniaMigrationTool/Services/ExportService.cs index e8061f4..6f0c020 100644 --- a/src/OmniaMigrationTool/Services/ExportService.cs +++ b/src/OmniaMigrationTool/Services/ExportService.cs @@ -522,6 +522,8 @@ object Map(object value) case EntityMapDefinition.AttributeMap.AttributeType.Decimal: if (value is decimal) return value; + if (value is string && value.ToString().Contains("%")) + return Convert.ToDecimal(value.ToString().Replace("%", "")); return Convert.ToDecimal(value); case EntityMapDefinition.AttributeMap.AttributeType.Date: From 0cfbfc0db6b16dbbcf7a2d211248290f8cce1059 Mon Sep 17 00:00:00 2001 From: Daniel Eleuterio Date: Fri, 5 Jul 2019 15:08:45 +0000 Subject: [PATCH 2/2] chore: add integration tweaks --- src/OmniaMigrationTool/Services/ExportBlobsService.cs | 4 ++-- src/OmniaMigrationTool/Services/ExportService.cs | 4 ++++ src/OmniaMigrationTool/Services/ImportBlobsService.cs | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/OmniaMigrationTool/Services/ExportBlobsService.cs b/src/OmniaMigrationTool/Services/ExportBlobsService.cs index 3b0874b..fb69282 100644 --- a/src/OmniaMigrationTool/Services/ExportBlobsService.cs +++ b/src/OmniaMigrationTool/Services/ExportBlobsService.cs @@ -61,7 +61,8 @@ private async Task Process(string outputPath) { var file = (CloudBlockBlob) listBlobItem; var fileName = GetFileName("Binary", file.Name); - var destinationFile = Path.Combine(outputPath, $"files/{fileName}"); + fileName = fileName.Replace(":", "%3A"); + var destinationFile = Path.Combine(outputPath, $"files\\{fileName}"); Console.WriteLine("Downloading file {0}", fileName); using (var encryptedMemoryStream = new MemoryStream()) @@ -70,7 +71,6 @@ private async Task Process(string outputPath) var encryptedArray = encryptedMemoryStream.ToArray(); var decryptedStream = new MemoryStream(DecryptByteArray(encryptedArray, _encryptionKey)); - await File.WriteAllBytesAsync(destinationFile, decryptedStream.ToArray()); } } diff --git a/src/OmniaMigrationTool/Services/ExportService.cs b/src/OmniaMigrationTool/Services/ExportService.cs index 6f0c020..3387e5e 100644 --- a/src/OmniaMigrationTool/Services/ExportService.cs +++ b/src/OmniaMigrationTool/Services/ExportService.cs @@ -537,6 +537,10 @@ object Map(object value) default: if (attribute.Target.Equals("_code")) return value.ToString().Substring(0, Math.Min(31, value.ToString().Length)); // TODO: Deal the the difference of size in codes + // Remove spaces from the IncidentCategory code + if (attribute.Target.Equals("IncidentCategory")) + return value.ToString().Replace(" ", ""); + return value.ToString(); } } diff --git a/src/OmniaMigrationTool/Services/ImportBlobsService.cs b/src/OmniaMigrationTool/Services/ImportBlobsService.cs index 59808ea..b4181be 100644 --- a/src/OmniaMigrationTool/Services/ImportBlobsService.cs +++ b/src/OmniaMigrationTool/Services/ImportBlobsService.cs @@ -63,11 +63,11 @@ private async Task Process(string mappingsFolderPath, string filesFolderPath) for (var f = 0; f f.EndsWith($"\\{sourceFileName}", StringComparison.InvariantCultureIgnoreCase)); + var exportedFilePath = exportedFiles.FirstOrDefault(newF => newF.EndsWith($"\\{sourceFileName}", StringComparison.InvariantCultureIgnoreCase)); if (string.IsNullOrEmpty(exportedFilePath)) { Console.WriteLine($"File not found in exported files folder - ignored.");