issue date must be 8 digits for patching (#2100)

* issue date must be 8 digits

* fixed test

* suggested changes

Author: aysim319

nhsn/delphi_nhsn/patch.py

@@ -78,11 +78,12 @@ def patch(params):
 
     patch_list = filter_source_files(source_files)
     for file in patch_list:
-        issue_date = datetime.strptime(file.name.split(".")[0], "%Y%m%d")
-        current_issue_ew = Week.fromdate(issue_date)
-        logger.info("Running issue", issue_date=issue_date.strftime("%Y-%m-%d"))
-        params["patch"]["issue_date"] = issue_date.strftime("%Y%m%d")
-        current_issue_dir = f"{params['patch']['patch_dir']}/issue_{current_issue_ew}/nhsn"
+        issue_date_str = file.name.split(".")[0]
+        logger.info("Running issue", issue_date=datetime.strptime(issue_date_str, "%Y%m%d").strftime("%Y-%m-%d"))
+        params["patch"]["issue_date"] = issue_date_str
+        # regardless of week date type or not the directory name must be issue_date_YYYYMMDD
+        # conversion in done in acquisition
+        current_issue_dir = f"{params['patch']['patch_dir']}/issue_{issue_date_str}/nhsn"
         makedirs(current_issue_dir, exist_ok=True)
         params["common"]["export_dir"] = current_issue_dir
         params["common"]["custom_run"] = True

nhsn/tests/test_patch.py

@@ -112,8 +112,7 @@ def test_patch(self, params_w_patch):
                 issue_dt_str = issue_path.name.replace("issue_", "")
                 for file in Path(issue_path / "nhsn").iterdir():
                     df = pd.read_csv(file)
-                    val = Week.fromdate(datetime.strptime(str(int(df["val"][0])), "%Y%m%d"))
-                    assert issue_dt_str == str(val)
+                    assert issue_dt_str == str(int(df["val"][0]))
 
         # clean up
         shutil.rmtree(f"{TEST_DIR}/patch_dir")