Reintroduce New Member rank

Fixes #183
This commit is contained in:
rubenwardy
2022-08-23 02:24:12 +01:00
parent 1d36f7d12b
commit b4208f2dda
8 changed files with 54 additions and 20 deletions

View File

@@ -76,7 +76,7 @@ CELERYBEAT_SCHEDULE = {
},
'check_for_updates': {
'task': 'app.tasks.importtasks.check_for_updates',
'schedule': crontab(minute=10, hour=1), # 0110
'schedule': crontab(minute=10, hour=2), # 0210
},
'send_pending_notifications': {
'task': 'app.tasks.emails.send_pending_notifications',
@@ -90,6 +90,10 @@ CELERYBEAT_SCHEDULE = {
'task': 'app.tasks.usertasks.delete_inactive_users',
'schedule': crontab(minute=15), # every hour at quarter past
},
'upgrade_new_members': {
'task': 'app.tasks.usertasks.upgrade_new_members',
'schedule': crontab(minute=10, hour=3), # 0310
},
}
celery.conf.beat_schedule = CELERYBEAT_SCHEDULE

View File

@@ -16,16 +16,31 @@
import datetime
from app.models import User, db, UserRank
from sqlalchemy import or_, and_
from app.models import User, db, UserRank, ThreadReply, Package
from app.tasks import celery
@celery.task()
def delete_inactive_users():
threshold = datetime.datetime.now() - datetime.timedelta(hours=5)
threshold = datetime.datetime.now() - datetime.timedelta(hours=5)
users = User.query.filter(User.is_active==False, User.packages==None, User.forum_topics==None, User.created_at<=threshold, User.rank==UserRank.NOT_JOINED).all()
for user in users:
db.session.delete(user)
users = User.query.filter(User.is_active == False, User.packages == None, User.forum_topics == None,
User.created_at <= threshold, User.rank == UserRank.NOT_JOINED).all()
for user in users:
db.session.delete(user)
db.session.commit()
db.session.commit()
@celery.task()
def upgrade_new_members():
threshold = datetime.datetime.now() - datetime.timedelta(days=7)
User.query.filter(and_(User.rank == UserRank.NEW_MEMBER, or_(
User.replies.any(ThreadReply.created_at < threshold),
User.packages.any(Package.approved_at < threshold)))).update({"rank": UserRank.MEMBER})
db.session.commit()