Merge pull request #85 from OSRS-Taskman/rank_check_hardening

add error handling for rank check

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
+from templesync import check_logs, temple_player_data
 
 app = Flask(__name__)
 
@@ -481,6 +481,9 @@ def collection_log_check():
     form_data = request.form
     rs_username = form_data['username']
     lms_enabled = get_lms_status(session['username'])
+    if not temple_player_data(rs_username):
+        return render_template('collection_log_check.html', rs_username = rs_username,
+                               error = "Player has not synced their collecton log on TempleOSRS yet")
     easy_check = check_logs(rs_username, tasklists.list_for_tier('easy', lms_enabled), 'check')
     medium_check = check_logs(rs_username, tasklists.list_for_tier('medium', lms_enabled), 'check')
     hard_check = check_logs(rs_username, tasklists.list_for_tier('hard', lms_enabled), 'check')

templates/collection_log_check.html

@@ -1,6 +1,12 @@
 <div>
     <h3>Rank Up Results For: {{rs_username}}</h3>
 </div>
+{% if error %}
+<div class="rank-results-row">
+    <span>Response from TempleOSRS API: <p class="incomplete">{{error}}.</p></span>
+    
+<div>
+{% else %}
 <div class="rank-results-row">
     <p>Easy Tier:</p>
     {% if easy_check %}
@@ -60,4 +66,5 @@ <h3>Rank Up Results For: {{rs_username}}</h3>
     {% else %}
     <p class="complete">COMPLETE</p>
     {% endif %}
-</div>
+</div>
+{% endif %}

templesync.py

@@ -9,6 +9,8 @@ def temple_player_data(username: str):
     player_data = requests.get(f'https://templeosrs.com/api/collection-log/player_collection_log.php?player={username}&categories=all&itemsonly&includenames=1&onlyitems=1').json()
     used_id = set()
     cleaned_player_data = list()
+    if not player_data.get('data'):
+        return cleaned_player_data
     for item in player_data['data']['items']:
         if item['id'] not in used_id:
             used_id.add(item['id'])
@@ -134,4 +136,4 @@ def format_completed_tasks(completed_tasks: dict):
 
 
 if __name__ == "__main__":
-    check_logs('Gerni Task', tasklists.list_for_tier('easy'), 'import')
+    check_logs('Gerni Task', tasklists.list_for_tier('easy'), 'check')