(Feat) fishsoop - remove sensor id from destpath

aodn · May 23, 2024 · 0e5e357 · 0e5e357
1 parent 6468300
commit 0e5e357
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/aodndata/soop/soop_fishsoop.py b/aodndata/soop/soop_fishsoop.py
@@ -35,7 +35,7 @@ def dest_path_soop_fishsoop(filepath, file_pattern=FISHSOOP_FILE_PATTERN):
         else:
             return ValueError(f"{qc_level} not matching expected qc_level")
 
-        return os.path.join('IMOS', 'SOOP', 'SOOP-FishSoop', data_mode, str(serial_number),
+        return os.path.join('IMOS', 'SOOP', 'SOOP-FishSoop', data_mode,
                             str(nc_time_cov_start.year),
                             str('%02d' % nc_time_cov_start.month),
                             os.path.basename(filepath))

diff --git a/test_aodndata/soop/test_fishsoop.py b/test_aodndata/soop/test_fishsoop.py
@@ -12,13 +12,13 @@ class TestSoopFishSoop(unittest.TestCase):
     def test_dest_path_soop_fishsoop(self):
         good_nc_nrt = os.path.join(TEST_ROOT, 'IMOS_SOOP-FishSOOP_T_20240310T094642Z_FV00_786.nc')
         self.assertEqual(dest_path_soop_fishsoop(good_nc_nrt),
-                         'IMOS/SOOP/SOOP-FishSoop/REALTIME/786/2024/03/{basename}'.format(
+                         'IMOS/SOOP/SOOP-FishSoop/REALTIME/2024/03/{basename}'.format(
                              basename=os.path.basename(good_nc_nrt)),
         )
 
         good_nc_dm = os.path.join(TEST_ROOT, 'IMOS_SOOP-FishSOOP_T_20240310T094642Z_FV01_786.nc')
         self.assertEqual(dest_path_soop_fishsoop(good_nc_dm),
-                         'IMOS/SOOP/SOOP-FishSoop/DELAYED/786/2024/03/{basename}'.format(
+                         'IMOS/SOOP/SOOP-FishSoop/DELAYED/2024/03/{basename}'.format(
                              basename=os.path.basename(good_nc_dm)),
         )