Skip to content

Commit e4190eb

Browse files
committed
fixed issues with nested relationships in task api not getting multiple entries and not displaying full informaiton
1 parent 28251a5 commit e4190eb

2 files changed

Lines changed: 4 additions & 19 deletions

File tree

server/task_planner/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ class Time(models.Model):
2626
end_time = models.TimeField()
2727
repeating = models.BooleanField(default=False)
2828
task = models.ForeignKey(
29-
Task, on_delete=models.CASCADE, related_name="task")
29+
Task, related_name="times", on_delete=models.CASCADE)

server/task_planner/serializers.py

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,15 @@ class Meta:
88
fields = "__all__"
99

1010

11-
class TopicDetailSerializer(serializers.ModelSerializer):
12-
# Temporary serializer while trying to figure out issue with color_hex
13-
class Meta:
14-
model = Topic
15-
fields = (
16-
"id",
17-
"name",
18-
)
19-
20-
2111
class TimeSerializer(serializers.ModelSerializer):
2212
class Meta:
2313
model = Time
2414
fields = "__all__"
2515

2616

2717
class TaskSerializer(serializers.ModelSerializer):
28-
# 1. This should be TopicSerializer instead but breaks because of
29-
# color_hex for some reason
30-
# 2. This method is also not working for showing multiple topics
31-
topics = TopicDetailSerializer(read_only=True)
32-
33-
# Should also link the times to the Task here, not sure how to do that yet
34-
# times = TimeSerializer(read_only=True)
18+
topics = TopicSerializer(many=True, read_only=True)
19+
times = TimeSerializer(many=True, read_only=True)
3520

3621
class Meta:
3722
model = Task
@@ -42,5 +27,5 @@ class Meta:
4227
"completed",
4328
"user",
4429
"topics",
45-
# "times",
30+
"times",
4631
)

0 commit comments

Comments
 (0)