From 10a2f8c068764ad69f7104ef1dda8c9b2e64ac80 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 4 Oct 2018 23:33:09 +0200 Subject: [PATCH] users: add cronjob to delete users (#24430) --- tests/test_users.py | 77 ++++++++++++++++++++++++++++++++++++++++++++- wcs/publisher.py | 6 ++++ wcs/sql.py | 35 +++++++++++++++++++++ wcs/users.py | 15 +++++++++ 4 files changed, 132 insertions(+), 1 deletion(-) diff --git a/tests/test_users.py b/tests/test_users.py index fc44d6be5..5cb988555 100644 --- a/tests/test_users.py +++ b/tests/test_users.py @@ -1,7 +1,9 @@ +import datetime import shutil +import time import pytest -from quixote import cleanup +from quixote import cleanup, get_publisher from wcs import fields from wcs.variables import LazyUser @@ -92,3 +94,76 @@ def test_user_formdef_getattr(): with pytest.raises(AttributeError): # noqa pylint: disable=pointless-statement user.xxx + + +def test_clean_deleted_users(): + from wcs.carddef import CardDef + from wcs.formdef import FormDef + from wcs.workflows import Evolution + + User = pub.user_class + + User.wipe() + FormDef.wipe() + CardDef.wipe() + + formdef = FormDef() + formdef.name = 'foobar' + formdef.url_name = 'foobar' + formdef.fields = [] + formdef.store() + data_class = formdef.data_class() + + carddef = CardDef() + carddef.name = 'barfoo' + carddef.url_name = 'barfoo' + carddef.fields = [] + carddef.store() + card_data_class = carddef.data_class() + + user1 = User() + user1.name = 'Pierre' + user1.deleted_timestamp = datetime.datetime.now() + user1.store() + + user2 = User() + user2.name = 'Jean' + user2.deleted_timestamp = datetime.datetime.now() + user2.store() + + user3 = User() + user3.name = 'Michel' + user3.deleted_timestamp = datetime.datetime.now() + user3.store() + + user4 = User() + user4.name = 'Martin' + user4.deleted_timestamp = datetime.datetime.now() + user4.store() + + formdata1 = data_class() + formdata1.user_id = user1.id + evo = Evolution() + evo.time = time.localtime() + evo.who = user4.id + formdata1.evolution = [evo] + formdata1.store() + + carddata1 = card_data_class() + carddata1.user_id = user3.id + carddata1.store() + + assert User.count() == 4 + + get_publisher().clean_deleted_users() + + assert User.count() == 3 + + assert {user.name for user in User.select()} == {'Pierre', 'Michel', 'Martin'} + + data_class.wipe() + card_data_class.wipe() + + get_publisher().clean_deleted_users() + + assert User.count() == 0 diff --git a/wcs/publisher.py b/wcs/publisher.py index 28742dfa1..f35a91ef1 100644 --- a/wcs/publisher.py +++ b/wcs/publisher.py @@ -123,6 +123,8 @@ class WcsPublisher(QommonPublisher): cls.register_cronjob( CronJob(cls.update_deprecations_report, name='update_deprecations_report', hours=[2], minutes=[0]) ) + # once a day delete users without any formdata + cls.register_cronjob(CronJob(cls.clean_deleted_users, name='clean_deleted_users', minutes=[0])) # other jobs data_sources.register_cronjob() formdef.register_cronjobs() @@ -508,6 +510,10 @@ class WcsPublisher(QommonPublisher): return value_.get_value() return value_ + def clean_deleted_users(self): + for user_id in self.user_class.get_to_delete_ids(): + self.user_class.remove_object(user_id) + set_publisher_class(WcsPublisher) WcsPublisher.register_extra_dir(os.path.join(os.path.dirname(__file__), 'extra')) diff --git a/wcs/sql.py b/wcs/sql.py index 75397daaa..3b3b564a6 100644 --- a/wcs/sql.py +++ b/wcs/sql.py @@ -3264,6 +3264,41 @@ class SqlUser(SqlMixin, wcs.users.User): return objects + @classmethod + def get_to_delete_ids(cls): + from wcs.carddef import CardDef + from wcs.formdef import FormDef + + conn, cur = get_connection_and_cursor() + sql_statement = 'SELECT users.id FROM users WHERE users.deleted_timestamp IS NOT NULL' + cur.execute(sql_statement) + deleted_ids = {user_id for user_id, in cur.fetchall()} + conn.commit() + + for carddef in CardDef.select() + FormDef.select(): + # keep only user.id not present in form/card_data.user_id or form/card_evolutions.who columns + data_class = carddef.data_class() + sql_statement = '''SELECT users.id + FROM users LEFT JOIN %(table)s ON users.id = CAST(%(table)s.user_id AS INTEGER) + WHERE users.deleted_timestamp IS NOT NULL + AND %(table)s.id IS NULL''' % { + 'table': data_class._table_name + } + cur.execute(sql_statement) + deleted_ids = deleted_ids & {user_id for user_id, in cur.fetchall()} + sql_statement = '''SELECT users.id + FROM users LEFT JOIN %(table)s ON users.id = CAST(%(table)s.who AS INTEGER) + WHERE users.deleted_timestamp IS NOT NULL + AND %(table)s.id IS NULL''' % { + 'table': '%s_evolutions' % data_class._table_name, + } + cur.execute(sql_statement) + deleted_ids = deleted_ids & {user_id for user_id, in cur.fetchall()} + conn.commit() + + cur.close() + return deleted_ids + class Role(SqlMixin, wcs.roles.Role): _table_name = 'roles' diff --git a/wcs/users.py b/wcs/users.py index 176b3aabb..92bd71211 100644 --- a/wcs/users.py +++ b/wcs/users.py @@ -320,6 +320,21 @@ class User(StorableObject): def get_full_name(self): return self.display_name + @classmethod + def get_to_delete_ids(cls): + from .formdef import FormDef + + deleted_ids = {user.id for user in cls.select([st.NotNull('deleted_timestamp')])} + + active_ids = set() + for formdef in FormDef.select(): + data_class = formdef.data_class() + active_ids.update( + formdata.user_id for formdata in data_class.select(iterator=True) if formdata.user_id + ) + + return deleted_ids - active_ids + Substitutions.register( 'session_user_display_name', -- 2.36.1