From 164de3c35746df99eecfe88f87a643a9057e045e Mon Sep 17 00:00:00 2001 From: Peter Le Date: Thu, 27 Jul 2023 19:11:28 -0400 Subject: [PATCH 1/3] RDISCROWD-6222 Show GIGwork users why no tasks are available --- pybossa/view/projects.py | 31 +++++++++++++++++++++++-------- test/test_web.py | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/pybossa/view/projects.py b/pybossa/view/projects.py index ba469993c..964ed7def 100644 --- a/pybossa/view/projects.py +++ b/pybossa/view/projects.py @@ -96,7 +96,7 @@ from pybossa.error import ErrorStatus from pybossa.redis_lock import get_locked_tasks_project from pybossa.sched import (Schedulers, select_task_for_gold_mode, lock_task_for_user, fetch_lock_for_user, - get_task_id_and_duration_for_project_user) + get_task_id_and_duration_for_project_user, sched_variants) from pybossa.syncer import NotEnabled, SyncUnauthorized from pybossa.syncer.project_syncer import ProjectSyncer from pybossa.exporter.csv_reports_export import ProjectReportCsvExporter @@ -949,12 +949,17 @@ def handle_valid_form(form): prodsubprods=prodsubprods) return handle_content_type(response) - @blueprint.route('//') @login_required def details(short_name): project, owner, ps = project_by_shortname(short_name) + + # all projects require password check + redirect_to_password = _check_if_redirect_to_password(project) + if redirect_to_password: + return redirect_to_password + num_available_tasks = n_available_tasks(project.id) num_completed_tasks_by_user = n_completed_tasks_by_user(project.id, current_user.id) oldest_task = oldest_available_task(project.id, current_user.id) @@ -965,11 +970,19 @@ def details(short_name): num_gold_tasks = n_gold_tasks(project.id) num_locked_tasks = len({task["task_id"] for task in get_locked_tasks(project)}) num_priority_one_tasks = n_priority_x_tasks(project.id) - - # all projects require password check - redirect_to_password = _check_if_redirect_to_password(project) - if redirect_to_password: - return redirect_to_password + n_tasks = ps.n_tasks - num_gold_tasks + notifications = {} + + if n_tasks and ps.overall_progress < 100 and num_available_tasks_for_user == 0: + task_scheduler_id = project.info.get('sched') + task_scheduler = dict(sched_variants()).get(task_scheduler_id) + if task_scheduler_id in [Schedulers.task_queue, Schedulers.user_pref] and task_scheduler: + notifications['project_incomplete_info'] = { + 'user_preferences': { + 'task_scheduler': task_scheduler, + 'account_profile_link': url_for('account.profile', name=current_user.name) + } + } ensure_authorized_to('read', project) template = '/projects/project.html' @@ -983,7 +996,7 @@ def details(short_name): template_args = {"project": project_sanitized, "title": title, "owner": owner_sanitized, - "n_tasks": ps.n_tasks - num_gold_tasks, + "n_tasks": n_tasks, "n_task_runs": ps.n_task_runs, "overall_progress": ps.overall_progress, "last_activity": ps.last_activity, @@ -1005,6 +1018,8 @@ def details(short_name): template_args['ckan_name'] = current_app.config.get('CKAN_NAME') template_args['ckan_url'] = current_app.config.get('CKAN_URL') template_args['ckan_pkg_name'] = short_name + if len(notifications): + template_args['notifications'] = notifications response = dict(template=template, **template_args) return handle_content_type(response) diff --git a/test/test_web.py b/test/test_web.py index 0d0bb3c77..5a43ac157 100644 --- a/test/test_web.py +++ b/test/test_web.py @@ -25,6 +25,7 @@ import urllib.request, urllib.parse, urllib.error import zipfile from io import StringIO, BytesIO +from pybossa.sched import Schedulers from test import db, Fixtures, with_context, with_context_settings, \ FakeResponse, mock_contributions_guard, with_request_context from test.helper import web @@ -1958,6 +1959,38 @@ def test_get_project_json(self): assert 'n_completed_tasks' in data.keys(), list(data.keys()) assert 'n_blogposts' in data.keys(), list(data.keys()) + @with_context + def test_project_incomplete_notification(self): + """Test WEB JSON get project with project incomplete notification""" + admin = UserFactory.create() + admin.user_pref = {'language': ['en']} + project = ProjectFactory.create(owner=admin, info={'sched': 'default'}) + task_user_pref = dict(languages=['sp']) + TaskFactory.create(project=project, user_pref=task_user_pref) + self.signin_user(admin) + url = '/project/%s/' % project.short_name + + res = self.app_get_json(url) + data = json.loads(res.data) + assert 'notifications' not in data.keys(), list(data.keys()) + + project.info['sched'] = Schedulers.task_queue + res = self.app_get_json(url) + data = json.loads(res.data) + assert 'notifications' in data.keys(), list(data.keys()) + + project.info['sched'] = Schedulers.user_pref + res = self.app_get_json(url) + data = json.loads(res.data) + assert 'notifications' in data.keys(), list(data.keys()) + notifications = data['notifications'] + assert 'project_incomplete_info' in notifications.keys(), list(notifications.keys()) + project_incomplete_info = notifications['project_incomplete_info'] + assert 'user_preferences' in project_incomplete_info.keys(), list(project_incomplete_info.keys()) + user_preferences = project_incomplete_info['user_preferences'] + assert 'account_profile_link' in user_preferences.keys(), list(user_preferences.keys()) + assert 'task_scheduler' in user_preferences.keys(), list(user_preferences.keys()) + @with_context def test_update_project_json_as_user(self): """Test WEB JSON update project as user.""" From ad325ad5e6f4d09adb1c704e5eef066ebaaff0a4 Mon Sep 17 00:00:00 2001 From: Peter Le Date: Mon, 31 Jul 2023 13:39:59 +0000 Subject: [PATCH 2/3] PR feedback --- test/test_web.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/test_web.py b/test/test_web.py index 5a43ac157..f556c56a1 100644 --- a/test/test_web.py +++ b/test/test_web.py @@ -1972,17 +1972,22 @@ def test_project_incomplete_notification(self): res = self.app_get_json(url) data = json.loads(res.data) + # Default task scheduler: verify notification message does not display. assert 'notifications' not in data.keys(), list(data.keys()) project.info['sched'] = Schedulers.task_queue res = self.app_get_json(url) data = json.loads(res.data) + # Task Queue scheduler: verify notification message displays. assert 'notifications' in data.keys(), list(data.keys()) project.info['sched'] = Schedulers.user_pref res = self.app_get_json(url) data = json.loads(res.data) + # User Preferences task scheduler: verify notification message displays. assert 'notifications' in data.keys(), list(data.keys()) + + # Verify notification payload keys. notifications = data['notifications'] assert 'project_incomplete_info' in notifications.keys(), list(notifications.keys()) project_incomplete_info = notifications['project_incomplete_info'] From e5ca25cc450ed1f7bc3641d8d7ddbcfd1cd073a2 Mon Sep 17 00:00:00 2001 From: Peter Le Date: Mon, 31 Jul 2023 17:19:35 +0000 Subject: [PATCH 3/3] PR feedback --- pybossa/view/projects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pybossa/view/projects.py b/pybossa/view/projects.py index 964ed7def..f9ebc0b92 100644 --- a/pybossa/view/projects.py +++ b/pybossa/view/projects.py @@ -1018,7 +1018,7 @@ def details(short_name): template_args['ckan_name'] = current_app.config.get('CKAN_NAME') template_args['ckan_url'] = current_app.config.get('CKAN_URL') template_args['ckan_pkg_name'] = short_name - if len(notifications): + if notifications: template_args['notifications'] = notifications response = dict(template=template, **template_args)