fix: Delete resources when deleting users (#24)

* Broken

* Delete resources when deleting users

Author: lipis

main/api/v1/resource.py

@@ -97,17 +97,8 @@ def post(self):
 ###############################################################################
 # Helpers
 ###############################################################################
-@ndb.transactional(xg=True)
 def delete_resource_dbs(resource_db_keys):
-  for resource_key in resource_db_keys:
-    delete_resource_key(resource_key)
-
-
-def delete_resource_key(resource_key):
-  resource_db = resource_key.get()
-  if resource_db:
-    blobstore.BlobInfo.get(resource_db.blob_key).delete()
-    resource_db.key.delete()
+  ndb.delete_multi(resource_db_keys)
 
 
 def resource_db_from_upload():

main/api/v1/user.py

@@ -65,30 +65,5 @@ def delete(self, user_key):
 ###############################################################################
 # Helpers
 ###############################################################################
-@ndb.transactional(xg=True)
 def delete_user_dbs(user_db_keys):
-  for user_key in user_db_keys:
-    delete_user_task(user_key)
-
-
-def delete_user_task(user_key, next_cursor=None):
-  resource_dbs, next_cursor = util.get_dbs(
-      model.Resource.query(),
-      user_key=user_key,
-      cursor=next_cursor,
-    )
-  if resource_dbs:
-    for resource_db in resource_dbs:
-      try:
-        blobstore.BlobInfo.get(resource_db.blob_key).delete()
-      except AttributeError:
-        logging.error('Blob %s not found during delete (resource_key: %s)' % (
-            resource_db.blob_key, resource_db.key().urlsafe(),
-          ))
-
-    ndb.delete_multi([resource_db.key for resource_db in resource_dbs])
-
-  if next_cursor:
-    deferred.defer(delete_user_task, user_key, next_cursor)
-  else:
-    user_key.delete()
+  ndb.delete_multi(user_db_keys)

main/model/resource.py

@@ -2,6 +2,9 @@
 
 from __future__ import absolute_import
 
+import logging
+
+from google.appengine.ext import blobstore
 from google.appengine.ext import ndb
 import flask
 
@@ -43,6 +46,16 @@ def view_url(self):
   def serve_url(self):
     return '%s/serve/%s' % (flask.request.url_root[:-1], self.blob_key)
 
+  @classmethod
+  def _pre_delete_hook(cls, key):
+    resource_db = key.get()
+    try:
+      blobstore.BlobInfo.get(resource_db.blob_key).delete()
+    except AttributeError:
+      logging.error('Blob %s not found during delete (resource_key: %s)' % (
+        resource_db.blob_key, resource_db.key().urlsafe(),
+      ))
+
   FIELDS = {
     'bucket_name': fields.String,
     'content_type': fields.String,

main/model/user.py

@@ -88,6 +88,12 @@ def is_email_available(cls, email, self_key=None):
   def get_resource_dbs(self, **kwargs):
     return model.Resource.get_dbs(user_key=self.key, **kwargs)
 
+  @classmethod
+  def _pre_delete_hook(cls, key):
+    user_db = key.get()
+    resource_keys = user_db.get_resource_dbs(keys_only=True, limit=-1)[0]
+    ndb.delete_multi(resource_keys)
+
   FIELDS = {
     'active': fields.Boolean,
     'admin': fields.Boolean,