Skip to content

Commit 27b1583

Browse files
committed
Use actual ownerId and activeTaskCount in models
1 parent 25c5ab0 commit 27b1583

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

manager/tasks/migrations/0001_initial.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 3.2.8 on 2021-10-27 15:02
1+
# Generated by Django 3.2.8 on 2021-10-28 12:34
22

33
from django.db import migrations, models
44
import django.db.models.deletion
@@ -19,7 +19,6 @@ class Migration(migrations.Migration):
1919
('name', models.CharField(max_length=1000)),
2020
('email', models.EmailField(max_length=254, unique=True)),
2121
('favoriteProgrammingLanguage', models.CharField(max_length=1000)),
22-
('activeTaskCount', models.IntegerField()),
2322
],
2423
),
2524
migrations.CreateModel(

manager/tasks/models.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ class Task(models.Model):
1010
('active', 'active'),
1111
('done', 'done'),
1212
])
13-
ownerId = models.ForeignKey('Person', on_delete=models.CASCADE)
13+
ownerId = models.ForeignKey('Person', to_field='id', on_delete=models.CASCADE)
1414

1515
class Person(models.Model):
1616
name = models.CharField(max_length=1000)
1717
email = models.EmailField(unique=True)
1818
favoriteProgrammingLanguage = models.CharField(max_length=1000)
19-
activeTaskCount = models.IntegerField()
19+
20+
@property
21+
def activeTaskCount(self):
22+
return Task.objects.filter(ownerId=self.id).count()

manager/tasks/serializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ class Meta:
1010
class PersonSerializer(serializers.ModelSerializer):
1111
class Meta:
1212
model = Person
13-
fields = '__all__'
13+
fields = ['name', 'email', 'favoriteProgrammingLanguage', 'activeTaskCount']

0 commit comments

Comments
 (0)