From c75b0309d8f9bf1fc08fe83f6e69f058a91113fc Mon Sep 17 00:00:00 2001
From: kaiyou <dev@kaiyou.fr>
Date: Wed, 27 Jul 2022 20:02:26 +0200
Subject: [PATCH] Enable account deletion
---
hiboo/cli.py | 8 +-------
hiboo/models.py | 26 ++++++++++++++------------
2 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/hiboo/cli.py b/hiboo/cli.py
index e9e70ea..2a401b3 100644
--- a/hiboo/cli.py
+++ b/hiboo/cli.py
@@ -13,6 +13,7 @@ def tasks_once():
""" Run regular tasks
"""
common.apply_all_transitions()
+ models.User.delete_unused()
@tasks.command("loop")
@@ -22,10 +23,3 @@ def tasks_loop():
while True:
common.apply_all_transitions()
time.sleep(30)
-
-
-@tasks.command("purge")
-def purge():
- # Temporary command to list purgeable accounts before we include
- # this in the main task loop
- print(models.User.get_unused().all())
diff --git a/hiboo/models.py b/hiboo/models.py
index 14c8c83..04baaf7 100644
--- a/hiboo/models.py
+++ b/hiboo/models.py
@@ -133,14 +133,18 @@ class User(db.Model):
return timeout - (self.updated_at or self.created_at)
@classmethod
- def get_unused(cls):
+ def delete_unused(cls):
+ """ Delete unused accounts
+ """
timeout = datetime.datetime.now() - cls.get_timeout()
- return (cls.query
+ unused = (cls.query
.join(cls.profiles.and_(Profile.status != Profile.PURGED), isouter=True)
.filter(Profile.uuid == None)
- .filter(timeout > cls.updated_at)
- .filter(timeout > cls.created_at)
- )
+ .filter(timeout > sqlalchemy.sql.func.coalesce(cls.updated_at, cls.created_at)))
+ for user in unused.all():
+ print("Deleting user {}".format(user.username))
+ db.session.delete(user)
+ db.session.commit()
class Auth(db.Model):
@@ -277,7 +281,7 @@ class Profile(db.Model):
user_uuid = db.Column(db.String(36), db.ForeignKey(User.uuid))
service_uuid = db.Column(db.String(36), db.ForeignKey(Service.uuid))
user = db.relationship(User,
- backref=db.backref('profiles', cascade='all, delete-orphan', lazy='dynamic'))
+ backref=db.backref('profiles', lazy='dynamic'))
service = db.relationship(Service,
backref=db.backref('profiles', cascade='all, delete-orphan', lazy='dynamic'))
@@ -295,12 +299,10 @@ class Profile(db.Model):
@property
def actions(self):
- print(">>> Actions are...",)
result = [
action for action in Profile.TRANSITIONS.values()
if action.authorized(self)
]
- print(repr(result))
return result
@classmethod
@@ -372,13 +374,13 @@ class History(db.Model):
service_uuid = db.Column(db.String(36), db.ForeignKey(Service.uuid))
actor_uuid = db.Column(db.String(36), db.ForeignKey(User.uuid))
user = db.relationship(User, foreign_keys=[user_uuid],
- backref=db.backref('history', cascade='all, delete-orphan', lazy='dynamic'))
+ backref=db.backref('history', lazy='dynamic'))
profile = db.relationship(Profile,
- backref=db.backref('history', cascade='all, delete-orphan', lazy='dynamic'))
+ backref=db.backref('history', lazy='dynamic'))
service = db.relationship(Service,
- backref=db.backref('history', cascade='all, delete-orphan', lazy='dynamic'))
+ backref=db.backref('history', lazy='dynamic'))
actor = db.relationship(User, foreign_keys=[actor_uuid],
- backref=db.backref('actions', cascade='all, delete-orphan', lazy='dynamic'))
+ backref=db.backref('actions', lazy='dynamic'))
public = db.Column(db.Boolean(), default=True)
category = db.Column(db.String(25))
--
GitLab