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

Jump to bottom

[ITG-111] Przystosować backend do nowej mechaniki dodawania i edycji zadań #54

Merged
merged 6 commits into from
Jun 19, 2022
Merged

[ITG-111] Przystosować backend do nowej mechaniki dodawania i edycji zadań #54

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
695b015
edited task creation backend to include tags, relations and subtasks
bkulawska Jun 5, 2022
10556b7
edited task edition backend to include adding and deleting tags, rela…
bkulawska Jun 8, 2022
e598e61
Merge branch 'develop' into ITG-111
bkulawska Jun 8, 2022
416db50
changed tags input format
bkulawska Jun 8, 2022
0219ac3
code refactor suggested in review
bkulawska Jun 19, 2022
c5ac558
Merge branch 'develop' into ITG-111
bkulawska Jun 19, 2022
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
47 changes: 44 additions & 3 deletions bode/bode/models/task/actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
from bode.models.enums import RelationType, TaskStatus
from bode.models.tag.actions import create_tag, get_tag_by_name
from bode.models.task.model import Task
from bode.models.task_relation.actions import delete_task_relation, get_related_tasks
from bode.models.task_relation.actions import (
create_task_relation,
delete_task_relation,
get_related_tasks,
)


def delete_task(task_id):
Expand Down Expand Up @@ -62,11 +66,48 @@ def get_task(task_id):


def create_task(**task_data):
task = Task(**task_data)

# tworzenie taska
create_task_data = {
key: task_data[key] for key in task_data.keys() & {"title", "description", "due_date", "status"}
}
task = Task(**create_task_data)
db.session.add(task)
db.session.commit()

# dodanie tagów
tags_data = {key: task_data[key] for key in task_data.keys() & {"tags"}}["tags"]
for tag_name in tags_data:
tag = get_tag_by_name(tag_name)
if tag is None:
tag = create_tag(tag_name)
task.tags.append(tag)
db.session.commit()

# dodanie relacji
relations_data = {key: task_data[key] for key in task_data.keys() & {"relations"}}["relations"]
for relation_data in relations_data:
if relation_data["type"] == "blocks":
relation_input = {"first_task_id": relation_data["task_id"], "second_task_id": task.id, "type": "DEPENDENT"}
if relation_data["type"] == "is_blocked_by":
relation_input = {"first_task_id": task.id, "second_task_id": relation_data["task_id"], "type": "DEPENDENT"}
if relation_data["type"] == "interchangable":
relation_input = {
"first_task_id": task.id,
"second_task_id": relation_data["task_id"],
"type": "INTERCHANGABLE",
}
create_task_relation(**relation_input)

# dodanie subtasków
subtasks_data = {key: task_data[key] for key in task_data.keys() & {"subtasks"}}["subtasks"]
for subtask_title in subtasks_data:
subtask_input = {"title": subtask_title}
subtask = Task(**subtask_input)
db.session.add(subtask)
db.session.commit()
subtask_relation_input = {"first_task_id": task.id, "second_task_id": subtask.id, "type": "SUBTASK"}
create_task_relation(**subtask_relation_input)

return task


Expand Down
11 changes: 9 additions & 2 deletions bode/bode/resources/tasks/schemas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
from bode.models.enums import DirectedRelationType, TaskStatus
from bode.models.task_relation.actions import is_task_blocked
from bode.resources.base_schema import BaseSchema
from bode.resources.tags.schemas import TagInputSchema, TagSchema
from bode.resources.tags.schemas import TagSchema


class RelationInputSchema(BaseSchema):
task_id = fields.UUID(required=True)
type = fields.String(validate=validate.OneOf(DirectedRelationType.list()), required=True)
bkulawska marked this conversation as resolved.
Show resolved Hide resolved


class TaskInputSchema(BaseSchema):
Expand All @@ -14,7 +19,9 @@ class Meta:
description = fields.String(validate=validate.Length(0, 1024), default="")
due_date = fields.DateTime(allow_none=True)
status = fields.String(validate=validate.OneOf(TaskStatus.list()), default=TaskStatus.TODO.value)
tags = fields.List(fields.Nested(TagInputSchema), default=[])
tags = fields.List(fields.String, default=[])
relations = fields.List(fields.Nested(RelationInputSchema), default=[])
subtasks = fields.List(fields.String, default=[])


class TaskSchema(BaseSchema):
Expand Down