fix: delete only executions if existed

Author: wphyojpl

cumulus_lambda_functions/cumulus_wrapper/query_collections.py

@@ -254,12 +254,12 @@ def list_executions(self, new_collection: dict, private_api_prefix: str):
                 return {'client_error': query_result}
             query_result = json.loads(query_result['body'])
             LOGGER.debug(f'json query_result: {query_result}')
-            if 'id' not in query_result:
+            if 'results' not in query_result:
                 return {'server_error': f'invalid response: {query_result}'}
         except Exception as e:
             LOGGER.exception('error while invoking')
             return {'server_error': f'error while invoking:{str(e)}'}
-        return {'status': query_result}
+        return {'results': query_result['results']}
 
     def create_sqs_rules(self, new_collection: dict, private_api_prefix: str, sqs_url: str, provider_name: str = '', workflow_name: str = 'CatalogGranule', visibility_timeout: int = 1800):
         """

cumulus_lambda_functions/uds_api/dapa/collections_dapa_creation.py

@@ -146,15 +146,23 @@ def delete(self):
             creation_result = 'NA'
 
             if self.__include_cumulus:
-                result = self.__cumulus_collection_query.delete_executions(cumulus_collection_doc, self.__cumulus_lambda_prefix)
-                print(f'execution list result: {result}')
-                self.__delete_collection_execution(cumulus_collection_doc, deletion_result)
+                result = self.__cumulus_collection_query.list_executions(cumulus_collection_doc, self.__cumulus_lambda_prefix)
+                LOGGER.debug(f'execution list result: {result}')
+                if len(result['results']) > 0:
+                    self.__delete_collection_execution(cumulus_collection_doc, deletion_result)
+                    return {
+                        'statusCode': 409,
+                        'body': {
+                            'message': f'There are cumulus executions for this collection. Deleting them. Pls try again in a few minutes.',
+                        }
+                    }
+                # self.__delete_collection_execution(cumulus_collection_doc, deletion_result)
                 self.__delete_collection_rule(cumulus_collection_doc, deletion_result)
                 delete_result = self.__cumulus_collection_query.delete_collection(self.__cumulus_lambda_prefix, cumulus_collection_doc['name'], cumulus_collection_doc['version'])
                 delete_err, delete_result = self.analyze_cumulus_result(delete_result)
                 if delete_err is not None:
                     LOGGER.error(f'deleting collection ends in error. Trying again. {delete_err}')
-                    self.__delete_collection_execution(cumulus_collection_doc, deletion_result)
+                    # self.__delete_collection_execution(cumulus_collection_doc, deletion_result)
                     self.__delete_collection_rule(cumulus_collection_doc, deletion_result)
                     delete_result = self.__cumulus_collection_query.delete_collection(self.__cumulus_lambda_prefix, cumulus_collection_doc['name'], cumulus_collection_doc['version'])
                     delete_err, delete_result = self.analyze_cumulus_result(delete_result)