Merge pull request #1171 from moonstream-to/fix-deleting-logic

Update delete subscriptions.

moonstreamapi/moonstreamapi/actions.py

@@ -611,39 +611,18 @@ def delete_seer_subscription(
 ) -> None:
     """
     Delete seer subscription from db
-    If there are no more subscriptions for this address,abi_selector delete all abis
     """
-
+    ### TEMPORARY disable deleting abi jobs from db
-    ## Delete subscription from db
+    ### TODO(ANDREY): fix this
-
     try:
         db_session.query(AbiSubscriptions).filter(  
             AbiSubscriptions.subscription_id == subscription_id
         ).delete(synchronize_session=False)
         db_session.commit()
     except Exception as e:
-        logger.error(f"Error delete subscription from db: {str(e)}")
+        logger.error(f"Error deleting subscription from db: {str(e)}")
         db_session.rollback()
-
+        return
-    not_connected_abi_jobs = (
-        db_session.query(AbiJobs)
-        .join(AbiSubscriptions, AbiJobs.id == AbiSubscriptions.abi_job_id, isouter=True)
-        .filter(AbiSubscriptions.subscription_id == None)
-        .cte("not_connected_abi_jobs")
-    )
-
-    ## Delete abi jobs from db
-
-    try:
-        db_session.query(AbiJobs).filter(
-            AbiJobs.id.in_(db_session.query(not_connected_abi_jobs.c.id))
-        ).delete(synchronize_session=False)
-
-        db_session.commit()
-    except Exception as e:
-        logger.error(f"Error delete abi jobs from db: {str(e)}")
-        db_session.rollback()
-
 
 def add_abi_to_db(
     db_session: Session,

moonstreamapi/moonstreamapi/version.py

@@ -2,4 +2,4 @@
 Moonstream library and API version.
 """
 
-MOONSTREAMAPI_VERSION = "0.4.11"
+MOONSTREAMAPI_VERSION = "0.4.12"