Merge pull request #725 from bcgov/dev-oipc-v2

Dev oipc v2
bcgov · Jan 18, 2024 · 78187dd · 78187dd
2 parents 5461554 + e46b8b6
commit 78187dd
Show file tree

Hide file tree

Showing 34 changed files with 1,619 additions and 853 deletions.
diff --git a/MCS.FOI.S3FileConversion/MCS.FOI.CalendarToPDF/MCS.FOI.CalendarToPDF.csproj b/MCS.FOI.S3FileConversion/MCS.FOI.CalendarToPDF/MCS.FOI.CalendarToPDF.csproj
@@ -11,7 +11,7 @@
 		<PackageReference Include="SkiaSharp" Version="2.88.6" />
 		<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
 		<PackageReference Include="Syncfusion.HtmlToPdfConverter.QtWebKit.Net.Core" Version="19.1.0.63" />
-		<PackageReference Include="Syncfusion.Pdf.Net.Core" Version="23.1.40" />
+		<PackageReference Include="Syncfusion.Pdf.Net.Core" Version="23.2.7" />
 	</ItemGroup>
 
 </Project>
diff --git a/MCS.FOI.S3FileConversion/MCS.FOI.DocToPDF/DocFileProcessor.cs b/MCS.FOI.S3FileConversion/MCS.FOI.DocToPDF/DocFileProcessor.cs
@@ -1,6 +1,6 @@
 
 using Serilog;
-using Syncfusion.DocIO.DLS;
+using Syncfusion.DocIO.DLS;
 using Syncfusion.DocIORenderer;
 using Syncfusion.Pdf;
 
@@ -41,33 +41,35 @@ public DocFileProcessor(Stream SourceStream)
                 {
                     try
                     {
-                        using (WordDocument wordDocument = new WordDocument(SourceStream, Syncfusion.DocIO.FormatType.Automatic))
-                        {
-                            wordDocument.RevisionOptions.CommentDisplayMode = CommentDisplayMode.ShowInBalloons;
-                            wordDocument.RevisionOptions.CommentColor = RevisionColor.Blue;
-
-                            //Creates an instance of DocIORenderer.
-                            using (DocIORenderer renderer = new DocIORenderer())
-                            {
-                                using PdfDocument pdfDocument = renderer.ConvertToPDF(wordDocument);
-                                //Save the PDF file
-                                //Close the instance of document objects
-                                pdfDocument.Save(output);
-                                pdfDocument.Close(true);
-                                converted = true;
-
-                            }
-                        }
+                        using (WordDocument wordDocument = new WordDocument(SourceStream, Syncfusion.DocIO.FormatType.Automatic))
+                        {
+
+                            wordDocument.RevisionOptions.CommentDisplayMode = CommentDisplayMode.ShowInBalloons;
+                            wordDocument.RevisionOptions.CommentColor = RevisionColor.Blue;
+                            wordDocument.RevisionOptions.ShowMarkup = RevisionType.Deletions | RevisionType.Insertions;
+
+                            using (DocIORenderer renderer = new DocIORenderer())
+                            {
+                                using PdfDocument pdfDocument = renderer.ConvertToPDF(wordDocument);
+                                //Save the PDF file
+                                //Close the instance of document objects
+                                pdfDocument.Save(output);
+                                pdfDocument.Close(true);
+                                converted = true;
+
+                            }
+
+                        }
                     }
                     catch (Exception e)
                     {
                         string errorMessage = $"Exception occured while coverting a document file, exception :  {e.Message}";
                         message = $"Exception happened while accessing File, re-attempting count : {attempt} , Error Message : {e.Message} , Stack trace : {e.StackTrace}";
                         Log.Error(message);
                         Console.WriteLine(message);
-                        if (attempt == FailureAttemptCount)
-                        {
-                            throw new Exception(errorMessage);
+                        if (attempt == FailureAttemptCount)
+                        {
+                            throw new Exception(errorMessage);
                         }
                         Thread.Sleep(WaitTimeinMilliSeconds);
                     }
@@ -82,28 +84,28 @@ public DocFileProcessor(Stream SourceStream)
                 throw;
             }
             return (converted, output);
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                if (this.SourceStream != null)
-                {
-                    this.SourceStream.Close();
-                    this.SourceStream.Dispose();
-                }
-
-                if (output != null) output.Dispose();
-                // free managed resources
-            }
-
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (this.SourceStream != null)
+                {
+                    this.SourceStream.Close();
+                    this.SourceStream.Dispose();
+                }
+
+                if (output != null) output.Dispose();
+                // free managed resources
+            }
+
         }
     }
 }
diff --git a/MCS.FOI.S3FileConversion/MCS.FOI.DocToPDF/MCS.FOI.DocToPDF.csproj b/MCS.FOI.S3FileConversion/MCS.FOI.DocToPDF/MCS.FOI.DocToPDF.csproj
@@ -7,16 +7,16 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Syncfusion.DocIO.Net.Core" Version="23.1.40" />
+		<PackageReference Include="Syncfusion.DocIO.Net.Core" Version="23.2.7" />
 		<PackageReference Include="SkiaSharp" Version="2.88.6" />
 		<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
 
 		<PackageReference Include="Serilog" Version="2.10.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
 		<!--<PackageReference Include="System.Drawing.Common" Version="5.0.2" />-->
-		<PackageReference Include="Syncfusion.DocIORenderer.Net.Core" Version="23.1.40" />
-		<PackageReference Include="Syncfusion.Pdf.Net.Core" Version="23.1.40" />
+		<PackageReference Include="Syncfusion.DocIORenderer.Net.Core" Version="23.2.7" />
+		<PackageReference Include="Syncfusion.Pdf.Net.Core" Version="23.2.7" />
 	</ItemGroup>
 
 </Project>
diff --git a/MCS.FOI.S3FileConversion/MCS.FOI.ExcelToPDF/MCS.FOI.ExcelToPDF.csproj b/MCS.FOI.S3FileConversion/MCS.FOI.ExcelToPDF/MCS.FOI.ExcelToPDF.csproj
@@ -6,9 +6,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Syncfusion.XlsIO.Net.Core" Version="23.1.40" />
-		<PackageReference Include="Syncfusion.XlsIORenderer.Net.Core" Version="23.1.40" />
-		<PackageReference Include="Syncfusion.Pdf.Net.Core" Version="23.1.40" />
+		<PackageReference Include="Syncfusion.XlsIO.Net.Core" Version="23.2.7" />
+		<PackageReference Include="Syncfusion.XlsIORenderer.Net.Core" Version="23.2.7" />
+		<PackageReference Include="Syncfusion.Pdf.Net.Core" Version="23.2.7" />
 		<PackageReference Include="SkiaSharp" Version="2.88.6" />
 		<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
 

diff --git a/MCS.FOI.S3FileConversion/MCS.FOI.MSGToPDF/MCS.FOI.MSGToPDF.csproj b/MCS.FOI.S3FileConversion/MCS.FOI.MSGToPDF/MCS.FOI.MSGToPDF.csproj
@@ -10,13 +10,12 @@
 		<PackageReference Include="Serilog" Version="2.10.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
-		<PackageReference Include="SkiaSharp" Version="2.88.6" />
-		<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
-		<PackageReference Include="MsgReader" Version="4.2.1" />
-		<PackageReference Include="Syncfusion.DocIO.Net.Core" Version="23.1.40" />
-		<PackageReference Include="Syncfusion.DocIORenderer.Net.Core" Version="23.1.40" />
-		<PackageReference Include="Syncfusion.HtmlToPdfConverter.QtWebKit.Net.Core" Version="20.3.0.56" />		
-		<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+		<PackageReference Include="SkiaSharp" Version="2.88.3" />
+		<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.3" />
+		<PackageReference Include="MsgReader" Version="4.5.0" />
+		<PackageReference Include="Syncfusion.HtmlToPdfConverter.QtWebKit.Net.Core" Version="20.3.0.56" />
+		<PackageReference Include="Syncfusion.Pdf.Net.Core" Version="23.2.7" />
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
 	</ItemGroup>
 
 </Project>