CMR-10693: Fixing Bug when granules do not have a DataGranule element an exception was thrown and when the location doesn't include the search context (#2277)

* CMR-10693: Fixing bug when DataGranule element does not exist in the metadata and if the location is missing the search context.

* CMR-10693: Moving print statement to debug log.

* CMR-10693: updating function names and variables from PR requests.

Author: eereiter

subscription/src/search.py

@@ -144,20 +144,26 @@ def get_concept(self, concept_id, revision_id):
         else:
             # Request failed
             logger.warning(f"Subscription Worker getting search concept using URL {url} failed with status code: {response.status_code}")
-
+    
     def get_producer_granule_id(self, metadata):
         """Get the granule producer id from the metadata."""
-        identifiers = metadata.get('DataGranule').get('Identifiers')
-        pgi = None
-        if identifiers:
-            for identifier in identifiers:
-                if identifier.get('IdentifierType') == 'ProducerGranuleId':
-                    pgi = identifier.get('Identifier')
-                    break
-            if pgi:
-                return pgi
-            else:
-                return None
+        data_granule = metadata.get('DataGranule', {})
+        identifiers = data_granule.get('Identifiers', [])
+
+        for identifier in identifiers:
+            if identifier.get('IdentifierType') == 'ProducerGranuleId':
+                return identifier.get('Identifier')
+        return None
+        
+    def add_search_context_to_location_url(self, location_url):
+        """This function adds the search context to the location URL."""
+        
+        if location_url:
+          if "search" in location_url:
+              return location_url
+          else:
+              parts = location_url.split('concepts')
+              return parts[0] + "search/concepts" + parts[1]
         else:
             return None
 
@@ -177,10 +183,12 @@ def process_message(self, message):
          \"location\": \"http://localhost:3003/concepts/G1200484356-ERICH_PROV/39\"}
         """
         # Get the granule concept-id from the message.
-        print(f"Search process_message message type {type(message)}")
+        logger.debug(f"Search process_message message type {type(message)}")
         message_dict = json.loads(message)
         concept_id = message_dict["concept-id"]
         revision_id = message_dict.get("revision-id", None)
+        location = message_dict.get("location")
+        location_url = self.add_search_context_to_location_url(location)
         # Get the concept from search
         result = self.get_concept(concept_id, revision_id)
 
@@ -193,4 +201,6 @@ def process_message(self, message):
             del message_dict['revision-id']
         if pgi:
             message_dict.update({"producer-granule-id": pgi})
+        if location_url:
+            message_dict.update({"location": location_url})
         return message_dict

subscription/test/search_test.py

@@ -103,6 +103,38 @@ def test_process_message(self, mock_get_public_search_url, mock_get_concept):
         self.assertEqual(result, expected_output)
         mock_get_concept.assert_called_once_with("G1200484356-ERICH_PROV", '1')
 
+    @patch('search.Search.get_concept')
+    @patch('search.Search.get_public_search_url')
+    def test_process_message_no_data_granule(self, mock_get_public_search_url, mock_get_concept):
+        # This tests some error cases where no DataGranule element exists in the metadata and
+        # if the location string is missing the search context.
+
+        # Setup
+        search = Search()
+        
+        # Mock the get_public_search_url method
+        mock_get_public_search_url.return_value = "https://cmr.earthdata.nasa.gov/search/"
+
+        # Mock the get_concept method
+        mock_get_concept.return_value = """
+        {
+            "GranuleUR": "SWOT_L2_HR_PIXC_578_020_221L_20230710T223456_20230710T223506_PIA1_01"
+        }
+        """
+
+        # Input message
+        input_message = '{"concept-id": "G1200484356-ERICH_PROV", "revision-id": "1", "granule-ur": "SWOT_L2_HR_PIXC_578_020_221L_20230710T223456_20230710T223506_PIA1_01", "location": "https://cmr.earthdata.nasa.gov/concepts/G1200484356-ERICH_PROV/1"}'
+
+        # Expected output
+        expected_output = {"concept-id": "G1200484356-ERICH_PROV", "granule-ur": "SWOT_L2_HR_PIXC_578_020_221L_20230710T223456_20230710T223506_PIA1_01", "location": "https://cmr.earthdata.nasa.gov/search/concepts/G1200484356-ERICH_PROV/1"}
+
+        # Call the method
+        result = search.process_message(input_message)
+
+        # Assert
+        self.assertEqual(result, expected_output)
+        mock_get_concept.assert_called_once_with("G1200484356-ERICH_PROV", '1')
+
 if __name__ == '__main__':
     unittest.main()