fix: delete event is also inserting a reord to ES

Author: wphyojpl

cumulus_lambda_functions/granules_to_es/granules_indexer.py

@@ -73,6 +73,9 @@ def start(self):
         result = JsonValidator(self.CUMULUS_SCHEMA).validate(incoming_msg)
         if result is not None:
             raise ValueError(f'input json has CUMULUS validation errors: {result}')
+        if 'event' not in incoming_msg or incoming_msg['event'].upper() == 'DELETE':
+            LOGGER.debug(f'missing event or it is DELETE event. Not inserting to ES')
+            return
         self.__cumulus_record = incoming_msg['record']
         if len(self.__cumulus_record['files']) < 1:
             # TODO ingest updating stage?

cumulus_lambda_functions/uds_api/granules_api.py

@@ -214,36 +214,36 @@ async def get_granules_dapa(request: Request, collection_id: str, limit: Union[i
     raise HTTPException(status_code=granules_result['statusCode'], detail=granules_result['body'])
 
 
-@router.get("/{collection_id}/items/{granule_id}")
-@router.get("/{collection_id}/items/{granule_id}/")
-async def get_single_granule_dapa(request: Request, collection_id: str, granule_id: str):
-    authorizer: UDSAuthorizorAbstract = UDSAuthorizerFactory() \
-        .get_instance(UDSAuthorizerFactory.cognito,
-                      es_url=os.getenv('ES_URL'),
-                      es_port=int(os.getenv('ES_PORT', '443'))
-                      )
-    auth_info = FastApiUtils.get_authorization_info(request)
-    collection_identifier = UdsCollections.decode_identifier(collection_id)
-    if not authorizer.is_authorized_for_collection(DBConstants.read, collection_id,
-                                                   auth_info['ldap_groups'],
-                                                   collection_identifier.tenant,
-                                                   collection_identifier.venue):
-        LOGGER.debug(f'user: {auth_info["username"]} is not authorized for {collection_id}')
-        raise HTTPException(status_code=403, detail=json.dumps({
-            'message': 'not authorized to execute this action'
-        }))
-    try:
-        api_base_prefix = FastApiUtils.get_api_base_prefix()
-        pg_link_generator = PaginationLinksGenerator(request)
-        granules_dapa_query = GranulesDapaQueryEs(collection_id, 1, None, None, filter, None, f'{pg_link_generator.base_url}/{api_base_prefix}')
-        granules_result = granules_dapa_query.get_single_granule(granule_id)
-    except Exception as e:
-        LOGGER.exception('failed during get_granules_dapa')
-        raise HTTPException(status_code=500, detail=str(e))
-    return granules_result
+# @router.get("/{collection_id}/items/{granule_id}")
+# @router.get("/{collection_id}/items/{granule_id}/")
+# async def get_single_granule_dapa(request: Request, collection_id: str, granule_id: str):
+#     authorizer: UDSAuthorizorAbstract = UDSAuthorizerFactory() \
+#         .get_instance(UDSAuthorizerFactory.cognito,
+#                       es_url=os.getenv('ES_URL'),
+#                       es_port=int(os.getenv('ES_PORT', '443'))
+#                       )
+#     auth_info = FastApiUtils.get_authorization_info(request)
+#     collection_identifier = UdsCollections.decode_identifier(collection_id)
+#     if not authorizer.is_authorized_for_collection(DBConstants.read, collection_id,
+#                                                    auth_info['ldap_groups'],
+#                                                    collection_identifier.tenant,
+#                                                    collection_identifier.venue):
+#         LOGGER.debug(f'user: {auth_info["username"]} is not authorized for {collection_id}')
+#         raise HTTPException(status_code=403, detail=json.dumps({
+#             'message': 'not authorized to execute this action'
+#         }))
+#     try:
+#         api_base_prefix = FastApiUtils.get_api_base_prefix()
+#         pg_link_generator = PaginationLinksGenerator(request)
+#         granules_dapa_query = GranulesDapaQueryEs(collection_id, 1, None, None, filter, None, f'{pg_link_generator.base_url}/{api_base_prefix}')
+#         granules_result = granules_dapa_query.get_single_granule(granule_id)
+#     except Exception as e:
+#         LOGGER.exception('failed during get_granules_dapa')
+#         raise HTTPException(status_code=500, detail=str(e))
+#     return granules_result
 
-@router.delete("/{collection_id}/items/{granule_id}/actual")
-@router.delete("/{collection_id}/items/{granule_id}/actual/")
+@router.delete("/{collection_id}/items/{granule_id}")
+@router.delete("/{collection_id}/items/{granule_id}/")
 async def delete_single_granule_dapa_actual(request: Request, collection_id: str, granule_id: str):
     authorizer: UDSAuthorizorAbstract = UDSAuthorizerFactory() \
         .get_instance(UDSAuthorizerFactory.cognito,
@@ -267,7 +267,6 @@ async def delete_single_granule_dapa_actual(request: Request, collection_id: str
         cumulus.with_collection_id(collection_id)
         cumulus_delete_result = cumulus.delete_entry(cumulus_lambda_prefix, granule_id)  # TODO not sure it is correct granule ID
         LOGGER.debug(f'cumulus_delete_result: {cumulus_delete_result}')
-        sleep(3)  # Testing if this helps
         es_delete_result = GranulesDbIndex().delete_entry(collection_identifier.tenant,
                                                           collection_identifier.venue,
                                                           granule_id

tests/integration_tests/test_granules_deletion.py

@@ -75,7 +75,7 @@ def test_delete_all(self):
 
         asset_urls = [v['href'] for k, v in response_json['features'][0]['assets'].items()]
         print(asset_urls)
-        post_url = f'{self.uds_url}collections/{collection_id}/items/{deleting_granule_id}/actual'  # MCP Dev
+        post_url = f'{self.uds_url}collections/{collection_id}/items/{deleting_granule_id}/'  # MCP Dev
         print(post_url)
         query_result = requests.delete(url=post_url,
                                        headers=headers,