fix: multiple dd write now correctly writes all dds

HEAL · Sep 20, 2023 · 38d80d8 · 38d80d8
1 parent 462c53a
commit 38d80d8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/src/healdata_utils/conversion.py b/src/healdata_utils/conversion.py
@@ -293,8 +293,14 @@ def convert_to_vlmd(
             "errors": {"csvtemplate": reportcsv, "jsontemplate": reportjson},
             })
 
-            output_filepath_with_name = output_filepath
-
+            if output_filepath:
+                _write_vlmd(
+                    jsontemplate=dd_json,
+                    csvtemplate=dd_csv,
+                    csvreport=reportcsv,
+                    jsonreport=reportjson,
+                    output_filepath=output_filepath,
+                    output_overwrite=output_overwrite)
         else:
 
             packages_with_reports[name] = {
@@ -304,19 +310,21 @@ def convert_to_vlmd(
             }
 
             # 
-            stem = Path(output_filepath).stem
-            ext = Path(output_filepath).suffix
-            output_filepath_with_name = Path(output_filepath).parent/(stem+"-"+slugify(name)+ext)
-
-    if output_filepath_with_name:
-        _write_vlmd(
-            jsontemplate=dd_json,
-            csvtemplate=dd_csv,
-            csvreport=reportcsv,
-            jsonreport=reportjson,
-            output_filepath=output_filepath_with_name,
-            output_overwrite=output_overwrite
-        )
+
+            if output_filepath:
+
+                stem = Path(output_filepath).stem
+                ext = Path(output_filepath).suffix
+                output_filepath_with_name = Path(output_filepath).parent/(stem+"-"+slugify(name)+ext)
+
+                _write_vlmd(
+                    jsontemplate=dd_json,
+                    csvtemplate=dd_csv,
+                    csvreport=reportcsv,
+                    jsonreport=reportjson,
+                    output_filepath=output_filepath_with_name,
+                    output_overwrite=output_overwrite
+                )
 
 
     return packages_with_reports

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -60,7 +60,7 @@ def test_vlmd_extract_all_params(
         # currently json and csv are produced automatically
         # so should be both a csv and json file (at least 2 files)
         # more than 2 happens in cases of package-like dds formed such as with excel
-        if len(list(_outdir.glob("*.json"))) > 1 and len(list(_outdir.glob("*.csv"))) > 1: 
+        if isinstance(valid_output_json[inputtype],dict) and isinstance(valid_output_csv[inputtype],dict): 
             for name in valid_output_json[inputtype]:
                 _valid_output_json = json.loads(valid_output_json[inputtype][name].read_text())
                 _valid_output_csv = valid_output_csv[inputtype][name].read_text().split("\n")