Merge pull request #92 from OSRS-Taskman/fix_import_logs

fix import logs

Author: mgerni

taskapp.py

@@ -15,7 +15,7 @@
                            complete_task_unofficial_tier, get_user, get_leaderboard,
                            get_roll_candidates_for_tier)
 import send_grid_email
-from templesync import check_logs, temple_player_data
+from templesync import check_logs, temple_player_data, import_logs
 from task_types import CollectionLogVerificationData
 
 app = Flask(__name__)
@@ -569,10 +569,10 @@ def collection_log_import():
     rs_username = form_data['username']
     overwrite_temple_timestamps_raw = form_data.get('overwriteTempleTimestamps', 'true')
     overwrite_temple_timestamps = str(overwrite_temple_timestamps_raw).lower() == 'true'
-    easy_import_result = check_logs(rs_username, tasklists.list_for_tier('easy'), 'import-recorded')
-    medium_import_result = check_logs(rs_username, tasklists.list_for_tier('medium'), 'import-recorded')
-    hard_import_result = check_logs(rs_username, tasklists.list_for_tier('hard'), 'import-recorded')
-    elite_import_result = check_logs(rs_username, tasklists.list_for_tier('elite'), 'import-recorded')
+    easy_import_result = import_logs(rs_username, tasklists.list_for_tier('easy'), 'import-recorded')
+    medium_import_result = import_logs(rs_username, tasklists.list_for_tier('medium'), 'import-recorded')
+    hard_import_result = import_logs(rs_username, tasklists.list_for_tier('hard'), 'import-recorded')
+    elite_import_result = import_logs(rs_username, tasklists.list_for_tier('elite'), 'import-recorded')
     easy_import = easy_import_result.get('completedTasks', [])
     medium_import = medium_import_result.get('completedTasks', [])
     hard_import = hard_import_result.get('completedTasks', [])

templesync.py

@@ -42,7 +42,7 @@ def temple_player_data(username: str):
 #     return completed_tasks
 
 
-def check_logs(username: str, site_tasks: list["TaskData"], action: str):
+def import_logs(username: str, site_tasks: list["TaskData"], action: str):
     def find_by_id(items, target_id):
         return [item for item in items if int(item['id']) == target_id]
     def parse_completed_date(value):
@@ -135,5 +135,42 @@ def format_completed_tasks(completed_tasks: dict):
         return format_completed_tasks(completed_tasks)
 
 
+def check_logs(username: str, site_tasks: list["TaskData"], action: str):
+    def find_by_id(items, target_id):
+        return [item for item in items if int(item['id']) == target_id]
+    def format_completed_tasks(completed_tasks: set):
+        formatted_tasks = []
+        for task_id in completed_tasks:
+            formatted_tasks.append({
+                'id' : task_id
+            })
+        return formatted_tasks
+
+    cleaned_player_data = temple_player_data(username)
+    missing_tasks = list()
+    completed_tasks = set()
+    for task in site_tasks:
+        verification_data = task.verification
+        if not isinstance(verification_data, CollectionLogVerificationData):
+            continue
+
+        log_count = 0
+        for item_id in verification_data.item_ids:
+            # print(f"Checking item: {item['name']} with ID: {item['id']}")
+            if find_by_id(cleaned_player_data, item_id):
+                log_count += 1
+
+        if log_count >= verification_data.count:
+            completed_tasks.add(task.id)
+        else:
+            missing_tasks.append(task.name)
+
+    if action == 'check':
+        return missing_tasks
+    else:
+        sorted_completed_tasks = sorted(completed_tasks)
+        # print(sorted_completed_tasks)
+        return format_completed_tasks(sorted_completed_tasks)
+
 if __name__ == "__main__":
-    check_logs('Gerni Task', tasklists.list_for_tier('easy'), 'check')
+    print(check_logs('Gerni Task', tasklists.list_for_tier('elite'), 'check'))