fix: Add default version during stageout collection id transformation (#61)

* feat: add AUDIT log level for upload

* chore: update outdated tests

* fix: allow empty str as RESULT_PATH_PREFIX & replace w/ default val

* feat: add default version when needed

Author: wphyojpl

mdps_ds_lib/lib/cumulus_stac/granules_catalog.py

@@ -16,12 +16,14 @@ def get_unity_formatted_collection_id(current_collection_id: str, project_venue_
         collection_identifier_parts = current_collection_id.split(':')
         if len(collection_identifier_parts) >= 6:
             LOGGER.debug(f'current_collection_id is assumed to be in UNITY format: {current_collection_id}')
+            current_collection_id = f'{current_collection_id}___001' if '___' not in current_collection_id else current_collection_id
             return current_collection_id
 
         LOGGER.info(f'current_collection_id is not UNITY formatted ID: {current_collection_id}')
         if project_venue_set[0] is None or project_venue_set[1] is None:
             raise ValueError(f'missing project or venue in ENV which is needed due to current_collection_id not UNITY format: {project_venue_set}')
         new_collection = f'URN:NASA:UNITY:{project_venue_set[0]}:{project_venue_set[1]}:{current_collection_id}'
+        new_collection = f'{new_collection}___001' if '___' not in new_collection else new_collection
         LOGGER.info(f'UNITY formatted ID: {new_collection}')
         return new_collection
 

tests/mdps_ds_lib/lib/cumulus_stac/test_granules_catalog.py

@@ -929,10 +929,16 @@ def test_get_unity_formatted_collection_id(self):
             GranulesCatalog.get_unity_formatted_collection_id('NA', ('LOCAL', None))
         self.assertTrue(str(context.exception).startswith('missing project or venue'))
 
-        result = GranulesCatalog.get_unity_formatted_collection_id('NA', ('LOCAL', 'DEV'))
-        self.assertEqual(result, 'URN:NASA:UNITY:LOCAL:DEV:NA', f'wrong collection id output')
+        result = GranulesCatalog.get_unity_formatted_collection_id('NA__FOO', ('LOCAL', 'DEV'))
+        self.assertEqual(result, 'URN:NASA:UNITY:LOCAL:DEV:NA__FOO___001', f'wrong collection id output')
 
         result = GranulesCatalog.get_unity_formatted_collection_id('URN:JPL:IDS:LOCAL1:DEV2:A:B:C:D:E:F:G', ('LOCAL', 'DEV'))
-        self.assertEqual(result, 'URN:JPL:IDS:LOCAL1:DEV2:A:B:C:D:E:F:G', f'wrong collection id output')
+        self.assertEqual(result, 'URN:JPL:IDS:LOCAL1:DEV2:A:B:C:D:E:F:G___001', f'wrong collection id output')
+
+        result = GranulesCatalog.get_unity_formatted_collection_id('NA___HELLO', ('LOCAL', 'DEV'))
+        self.assertEqual(result, 'URN:NASA:UNITY:LOCAL:DEV:NA___HELLO', f'wrong collection id output')
+
+        result = GranulesCatalog.get_unity_formatted_collection_id('URN:JPL:IDS:LOCAL1:DEV2:A:B:C:D:E:F:G___FOO', ('LOCAL', 'DEV'))
+        self.assertEqual(result, 'URN:JPL:IDS:LOCAL1:DEV2:A:B:C:D:E:F:G___FOO', f'wrong collection id output')
 
         return