From 3e5f9b3ac5718017da503ca96e01a3973b856ef4 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:44:50 -0500
Subject: [PATCH] fix: Fixed merging and added date to columns without a status

---
 source/Private/Merge-CISExcelAndCsvData.ps1 | 11 ++++++++---
 source/Private/Update-CISExcelWorksheet.ps1 |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/source/Private/Merge-CISExcelAndCsvData.ps1 b/source/Private/Merge-CISExcelAndCsvData.ps1
index b5381f1..1b9d038 100644
--- a/source/Private/Merge-CISExcelAndCsvData.ps1
+++ b/source/Private/Merge-CISExcelAndCsvData.ps1
@@ -26,6 +26,9 @@ function Merge-CISExcelAndCsvData {
             $AuditResults
         }
 
+        # Extract recommendation numbers from the CSV
+        $csvRecs = $csvData | Select-Object -ExpandProperty Rec
+
         # Ensure headers are included in the merged data
         $headers = @()
         $firstItem = $import[0]
@@ -36,11 +39,13 @@ function Merge-CISExcelAndCsvData {
 
         $mergedData = @()
         foreach ($item in $import) {
-            $csvRow = $csvData | Where-Object { $_.Rec -eq $item.'recommendation #' }
-            if ($csvRow) {
+            # Check if the recommendation number exists in the CSV
+            $recNum = $item.'recommendation #'
+            if ($csvRecs -contains $recNum) {
+                $csvRow = $csvData | Where-Object { $_.Rec -eq $recNum }
                 $mergedData += New-MergedObject -ExcelItem $item -CsvRow $csvRow
             } else {
-                $mergedData += New-MergedObject -ExcelItem $item -CsvRow ([PSCustomObject]@{Connection=$null; Status=$null; Date=$null; Details=$null; FailureReason=$null})
+                $mergedData += $item
             }
         }
 
diff --git a/source/Private/Update-CISExcelWorksheet.ps1 b/source/Private/Update-CISExcelWorksheet.ps1
index a7ad633..b4af9cc 100644
--- a/source/Private/Update-CISExcelWorksheet.ps1
+++ b/source/Private/Update-CISExcelWorksheet.ps1
@@ -35,7 +35,8 @@ function Update-CISExcelWorksheet {
         }
 
         # Update the worksheet with the provided data
-        Update-WorksheetCell -Worksheet $worksheet -Data $Data -StartingRowIndex $StartingRowIndex
+        $validRows = $Data | Where-Object { $_.'recommendation #' -ne $null }
+        Update-WorksheetCell -Worksheet $worksheet -Data $validRows -StartingRowIndex $StartingRowIndex
 
         # Save and close the Excel package
         Close-ExcelPackage $excelPackage