Merge pull request #107 from rmobis/rmobis/clm-integration

add clm current task migration endpoint

Author: mgerni

task_api.py

@@ -6,7 +6,7 @@
 from functools import wraps
 from http import HTTPStatus
 
-from task_database import complete_task, generate_task, get_user, manual_complete_tasks, manual_revert_tasks
+from task_database import complete_task, generate_task, get_user, manual_complete_tasks, manual_revert_tasks, migrate_current_task
 from app_setup import app, db
 from tasklists import get_task_tier, list_for_tier
 from templesync import sync_user_tasks
@@ -72,6 +72,7 @@ def apiv2_get_user_profile(user: UserDatabaseObject):
         'username': user.username,
         'is_official': user.is_official,
         'is_lms_enabled': user.lms_enabled,
+        'has_migrated': user.has_migrated,
         'active_task_id': user.current_task_id(),
         'completed_tasks': [
             *user.easy.completed_tasks,
@@ -128,3 +129,16 @@ def apiv2_sync(user: UserDatabaseObject):
         'completed': list(changed_tasks[0]),
         'uncompleted': list(changed_tasks[1])
     }
+
+
+@app.route('/api/v2/user/migrate', methods=['POST'])
+@token_required_v2
+def apiv2_migrate(user: UserDatabaseObject):
+    body = request.json
+
+    new_current_task_id = body['task_id']
+
+    if not migrate_current_task(user.username, new_current_task_id):
+        return { 'error': 'User has already migrated' }, HTTPStatus.BAD_REQUEST
+
+    return Response(status=HTTPStatus.NO_CONTENT)

task_database.py

@@ -448,7 +448,7 @@ def get_first_task_instance(generated_task: TaskData, incomplete_tasks: list[Tas
                                 key=lambda task: getattr(task.verification, "count", 0))
             return first_task_instance
         return generated_task
-    
+
     tasks_easy = get_incomplete_tasks('easy')
     tasks_medium = get_incomplete_tasks('medium')
     tasks_hard = get_incomplete_tasks('hard')
@@ -460,31 +460,31 @@ def get_first_task_instance(generated_task: TaskData, incomplete_tasks: list[Tas
         first_task_instance = get_first_task_instance(generated_task, tasks_easy)
         __set_current_task(username, 'easyTasks', first_task_instance.id, True)
         return first_task_instance
-    
+
     elif len(tasks_medium) != 0:
         generated_task = random.choice(tasks_medium)
         first_task_instance = get_first_task_instance(generated_task, tasks_medium)
         __set_current_task(username, 'mediumTasks', first_task_instance.id, True)
         return first_task_instance
-    
+
     elif len(tasks_hard) != 0:
         generated_task = random.choice(tasks_hard)
         first_task_instance = get_first_task_instance(generated_task, tasks_hard)
         __set_current_task(username, 'hardTasks', first_task_instance.id, True)
         return first_task_instance
-    
+
     elif len(tasks_elite) != 0:
         generated_task = random.choice(tasks_elite)
         first_task_instance = get_first_task_instance(generated_task, tasks_elite)
         __set_current_task(username, 'eliteTasks', first_task_instance.id, True)
         return first_task_instance
-    
+
     elif len(tasks_master) != 0:
         generated_task = random.choice(tasks_master)
         first_task_instance = get_first_task_instance(generate_task, tasks_master)
         __set_current_task(username, 'masterTasks', first_task_instance.id, True)
         return first_task_instance
-    
+
     return None
 
 # If user has just completed a task of the given tier and the progress is 100, then they've just completed the last task
@@ -1733,6 +1733,19 @@ def copy_tier_tasks(source_username: str, target_username: str, tiers: list[str]
             {"$set": updates}
         )
 
+def migrate_current_task(username: str, task_id: str | None) -> bool:
+    user = get_user(username)
+
+    if user.has_migrated:
+        return False
+
+    __set_current_task(username, tasklists.get_task_tier(task_id), task_id, task_id is not None)
+
+    coll = mydb['taskLists']
+    coll.update_one({ 'username': username }, { '$set': { 'hasMigrated': True } })
+
+    return True
+
 if __name__ == "__main__":
     copy_tier_tasks("AreYaTasking", 'Gerni Task2', tiers=["easy", "medium", "hard", "elite", "master"])
     # fix_gerni()

tasklists.py

@@ -42,7 +42,7 @@ def read_tasks(filename: str) -> list[TaskData]:
         json_list = json.load(f)
         return list(map(to_task_class, json_list.get('tasks')))
 
-def get_task_tier(task_id: str) -> str:
+def get_task_tier(task_id: str | None) -> str | None:
     tiers = ['easy', 'medium', 'hard', 'elite', 'master', 'passive', 'extra', 'pets']
     for tier in tiers:
         tier_tasks = list_for_tier(tier)

templesync.py

@@ -221,7 +221,7 @@ def sync_user_tasks(username: str, collection_log: set[int], diaries: dict, skil
 
     current_task_id = user.current_task_id()
     if current_task_id in new_completed_tasks:
-        __set_current_task(username, None, None, False)
+        __set_current_task(username, tasklists.get_task_tier(current_task_id), None, False)
 
     return new_completed_tasks, new_uncompleted_tasks
 

user_dao.py

@@ -37,6 +37,7 @@ class UserDatabaseObject:
     username: str
     is_official: bool
     lms_enabled: bool
+    has_migrated: bool
     easy: UserTaskList
     medium: UserTaskList
     hard: UserTaskList
@@ -310,6 +311,7 @@ def convert_database_tier(tier: str) -> UserTaskList:
         username=user_data['username'],
         is_official=user_data['isOfficial'],
         lms_enabled=user_data['lmsEnabled'],
+        has_migrated=user_data.get('hasMigrated', False),
         easy=convert_database_tier('easy'),
         medium=convert_database_tier('medium'),
         hard=convert_database_tier('hard'),