Merge pull request #63 from statisticsnorway/fix_saving_bug

Fix saving bug
statisticsnorway · Oct 11, 2024 · 6e0bb64 · 6e0bb64
2 parents eaa9475 + bd1aa24
commit 6e0bb64
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-konjunk"
-version = "0.1.12"
+version = "0.1.13"
 description = "SSB Konjunk"
 authors = ["Edvard Garmannslund <[email protected]>"]
 license = "MIT"

diff --git a/src/ssb_konjunk/saving.py b/src/ssb_konjunk/saving.py
@@ -87,7 +87,7 @@ def _structure_ssb_filepath(
 
     # Handle versionizing or not.
     if version_number is None:
-        file_path = f"{file_path}/{file_name}_{time_stamp}"
+        file_path = f"{file_path}/{file_name}_{time_stamp}_"
     elif isinstance(version_number, int):
         file_path = f"{file_path}/{file_name}_{time_stamp}_v{version_number}.{filetype}"
     else:
@@ -324,6 +324,8 @@ def write_ssb_file(
     version_number = _find_version_number(files, stable_version)
 
     if version_number:
+        if file_path.endswith("_"):
+            file_path = file_path[:-1]
         file_path = f"{file_path}_v{version_number}.{filetype}"
 
         _save_df(df, file_path, filetype, fs, seperator, encoding)

diff --git a/tests/test_saving.py b/tests/test_saving.py
@@ -49,7 +49,7 @@ def test_structure_ssb_filepath() -> None:
 
     assert (
         filename_2
-        == "ssb-reiseliv-korttid-data-produkt-prod/overnatting/inndata/min_fil_p2023_p2024"
+        == "ssb-reiseliv-korttid-data-produkt-prod/overnatting/inndata/min_fil_p2023_p2024_"
     ), filename_2
 
     filename_3 = _structure_ssb_filepath(
@@ -65,7 +65,7 @@ def test_structure_ssb_filepath() -> None:
 
     assert (
         filename_3
-        == "ssb-reiseliv-korttid-data-produkt-prod/overnatting/inndata/mellommappe/min_fil_p2023_p2024"
+        == "ssb-reiseliv-korttid-data-produkt-prod/overnatting/inndata/mellommappe/min_fil_p2023_p2024_"
     ), filename_3
 
     filename_4 = _structure_ssb_filepath(
@@ -81,7 +81,7 @@ def test_structure_ssb_filepath() -> None:
 
     assert (
         filename_4
-        == "ssb-reiseliv-korttid-data-produkt-prod/oppdrag/min_fil_p2023_p2024"
+        == "ssb-reiseliv-korttid-data-produkt-prod/oppdrag/min_fil_p2023_p2024_"
     ), filename_4
 
     filename_5 = _structure_ssb_filepath(
@@ -97,7 +97,7 @@ def test_structure_ssb_filepath() -> None:
 
     assert (
         filename_5
-        == "ssb-reiseliv-korttid-data-produkt-prod/oppdrag/38-99/min_fil_p2023_p2024"
+        == "ssb-reiseliv-korttid-data-produkt-prod/oppdrag/38-99/min_fil_p2023_p2024_"
     ), filename_5