Hotfix/additional invalid issues

.gitignore

@@ -36,4 +36,5 @@ vscDebugger
 tests/testthat/_snaps/**/*.png
 www/client-level-export-data-dictionary.csv
 .Renviron
-sandbox/update-FY24-ICF-good-to-FY26.R
+sandbox/update-FY24-ICF-good-to-FY26.R
+public-resources/FY26 HMIS-CSV-Machine-Readable-Specifications.xlsx

00_initially_valid_import.R

@@ -87,11 +87,15 @@ if(tolower(tools::file_ext(upload_filepath)) != "zip") {
   zipFiles <- zipContents$Name %>% str_replace(".csv", "")
 
   # expected files
-  expected_files <- unique(cols_and_data_types$File)
+  expected_files <- unique(cols_and_data_types$CSV)
 
   # get missing files by comparing what we expect with what we got
   missing_files <- expected_files[!(expected_files %in% zipFiles)]
 
+  # empty files
+  empty_files <- zip::zip_list(upload_filepath) %>% 
+    fsubset(gsub(".csv", "", filename) %in% expected_files & uncompressed_size <= 1)
+
   ### Now check whether the file is hashed, has the expected structure, and contains
   # the expected csv files
   if(grepl("/", zipContents$Name[1])) {
@@ -151,6 +155,14 @@ if(tolower(tools::file_ext(upload_filepath)) != "zip") {
       If you are not sure how to run a SHA-256 hashed HMIS CSV Export in your HMIS, please contact your HMIS vendor."
     )
     logMetadata(session, "Unsuccessful upload - not hashed")
+  } else if(nrow(empty_files) > 0) {
+    show_invalid_popup(
+      issueID = 150,
+      title = "Unsuccessful Upload - Empty file(s)",
+      popupText = glue::glue("In your HMIS CSV Export, the following files are empty: 
+                             {paste(empty_files$filename, collapse=', ')}. All files should at least contain headers.")
+    )
+    logMetadata(session, "Unsuccessful upload - not hashed")
   } else {
     session$userData$initially_valid_import(1)
   }

01_get_Export.R

@@ -8,7 +8,7 @@ logToConsoleFull(session, "Running get export")
 list_of_problems <- list()
 
 # for each file in the csv, loop through the file names in the csv
-for (file in unique(cols_and_data_types$File)) {
+for (file in unique(cols_and_data_types$CSV)) {
   #import the csv and save it as a data frame
   logToConsole(session, paste0("importing ", file))
   assign(file, importFile(upload_filepath=NULL, csvFile=file))