Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RDISCROWD-5852 Calc task expiration by create date #836

Merged
merged 12 commits into from
Apr 18, 2023
Merged

RDISCROWD-5852 Calc task expiration by create date #836

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9d67962
calc task expiration by create date
n00rsy Apr 4, 2023
277671c
update test
n00rsy Apr 4, 2023
89c8e61
fix tests
n00rsy Apr 4, 2023
644ec28
add create time tests
n00rsy Apr 5, 2023
48d172a
refactor to remove get_now_plus_delta_ts
n00rsy Apr 10, 2023
dc85785
update comment
n00rsy Apr 10, 2023
5575a39
revert themes pointer
n00rsy Apr 10, 2023
1920a19
refactor get_task_expiration
dchhabda Apr 13, 2023
46d4bc0
fix tests
dchhabda Apr 14, 2023
e9af590
current time with task import. don't set expiration with setting gold
dchhabda Apr 14, 2023
8faf13a
ensure task.expiration is always set(cannot be null)
dchhabda Apr 15, 2023
072f37c
code review
dchhabda Apr 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pybossa/importers/importer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
from flask import url_for
from pybossa.task_creator_helper import set_gold_answers, upload_files_priv, get_task_expiration
from pybossa.data_access import data_access_levels
from pybossa.model import make_timestamp


def validate_s3_bucket(task, *args):
Expand Down Expand Up @@ -207,7 +208,9 @@ def create_tasks(self, task_repo, project, importer=None, **form_data):
try:
for task_data in tasks:
self.upload_private_data(task_data, project.id)
task_data['expiration'] = get_task_expiration(task_data.get('expiration'))
# As tasks are getting created, pass current date as create_date
create_date = make_timestamp()
task_data['expiration'] = get_task_expiration(task_data.get('expiration'), create_date)

task = Task(project_id=project.id, n_answers=n_answers)
[setattr(task, k, v) for k, v in task_data.items()]
Expand Down
1 change: 0 additions & 1 deletion pybossa/task_creator_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ def set_gold_answers(task, gold_answers):
if encrypted():
url = upload_files_priv(task, task.project_id, gold_answers, TASK_PRIVATE_GOLD_ANSWER_FILE_NAME)['externalUrl']
gold_answers = dict([(TASK_GOLD_ANSWER_URL_KEY, url)])
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think setting gold task should not be setting task expiration as both operations are independent and hence task expiration not to be modified with setting gold task.

@kbecker42 , @XiChenn , @n00rsy thoughts?

task.expiration = get_task_expiration(task.expiration)

task.gold_answers = gold_answers
task.calibration = 1
Expand Down