fix: fix the lack of trailing zero in modify_file_path and update t…

…ests

src/enrgdaq/utils/file.py

@@ -2,7 +2,9 @@
 from datetime import datetime
 
 
-def modify_file_path(file_path: str, add_date: bool, tag: str | None) -> str:
+def modify_file_path(
+    file_path: str, add_date: bool, tag: str | None, date: datetime | None = None
+) -> str:
     """
     Modifies a file path by adding a date and/or a tag.
 
@@ -20,9 +22,10 @@ def modify_file_path(file_path: str, add_date: bool, tag: str | None) -> str:
     """
 
     if add_date:
-        now = datetime.now()
+        if date is None:
+            date = datetime.now()
         sep = os.path.sep
-        file_dir = f"{now.year}{sep}{now.month}{sep}{now.day}"
+        file_dir = f"{date.year}{sep}{date.month:02d}{sep}{date.day:02d}"
         file_path = os.path.join(file_dir, file_path)
     if tag is not None:
         head, tail = os.path.splitext(file_path)

src/tests/test_csv.py

@@ -23,11 +23,16 @@ def test_modify_file_path(self):
         file_path = "test.csv"
         add_date = True
         tag = "tag"
-        sep = os.path.sep
-        expected_file_path = f"{datetime.now().year}{sep}{datetime.now().month}{sep}{datetime.now().day}{sep}test_tag.csv"
-        actual_file_path = modify_file_path(file_path, add_date, tag)
-
-        self.assertEqual(expected_file_path, actual_file_path)
+        now = datetime.now()
+        test_dates = [
+            (datetime(2023, 10, 20), "2023/10/20/test_tag.csv"),
+            (datetime(2023, 1, 2), "2023/01/02/test_tag.csv"),
+            (None, f"{now.year}/{now.month:02d}/{now.day:02d}/test_tag.csv"),
+        ]
+        for date, expected_file_path in test_dates:
+            expected_file_path = expected_file_path.replace("/", os.path.sep)
+            actual_file_path = modify_file_path(file_path, add_date, tag, date)
+            self.assertEqual(expected_file_path, actual_file_path)
 
     @patch("enrgdaq.daq.jobs.store.csv.modify_file_path", return_value="test.csv")
     @patch("builtins.open", new_callable=mock_open)