update project models and serializers

Evgeniy-Golodnykh · Aug 8, 2024 · 9b0094a · 9b0094a
1 parent 1238c57
commit 9b0094a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 28 deletions.
diff --git a/blackfox/api/serializers.py b/blackfox/api/serializers.py
@@ -12,15 +12,15 @@ class BodyStatsDiarySerializer(serializers.ModelSerializer):
 
     class Meta:
         model = BodyStatsDiary
-        exclude = ['id']
+        exclude = ['id',]
 
 
 class FoodDiarySerializer(serializers.ModelSerializer):
     """A serializer to read FoodDiary instances."""
 
     class Meta:
         model = FoodDiary
-        exclude = ['id']
+        exclude = ['id',]
 
 
 class ProjectSerializer(serializers.ModelSerializer):
@@ -29,7 +29,6 @@ class ProjectSerializer(serializers.ModelSerializer):
     user = CustomUserSerializer(read_only=True)
     coach = CustomUserSerializer(read_only=True)
     start_date = serializers.DateField()
-    deadline = serializers.DateField()
     target_calories = serializers.IntegerField(min_value=0, max_value=10_000)
     target_carbohydrate = serializers.FloatField(min_value=0, max_value=1_000)
     target_fat = serializers.FloatField(min_value=0, max_value=1_000)
@@ -40,19 +39,15 @@ class ProjectSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Project
-        exclude = ['id', 'is_closed']
+        exclude = ['id',]
 
 
-class CreateUpdateProjectSerializer(serializers.ModelSerializer):
+class CreateUpdateProjectSerializer(ProjectSerializer):
     """A serializer to create/update Project instances."""
 
     user = serializers.PrimaryKeyRelatedField(queryset=User.objects)
     coach = serializers.PrimaryKeyRelatedField(queryset=User.objects)
 
-    class Meta:
-        model = Project
-        exclude = ['id', 'is_closed']
-
     def to_representation(self, instance):
         request = self.context.get('request')
         context = {'request': request}

diff --git a/blackfox/db.sqlite3 b/blackfox/db.sqlite3
diff --git a/blackfox/training/migrations/0001_initial.py b/blackfox/training/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.16 on 2024-07-20 20:47
+# Generated by Django 3.2.16 on 2024-08-08 20:35
 
 import django.core.validators
 from django.db import migrations, models
@@ -55,15 +55,13 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('start_date', models.DateField(db_index=True, verbose_name='начало проекта')),
-                ('deadline', models.DateField(db_index=True, verbose_name='окончание проекта')),
                 ('target_calories', models.PositiveIntegerField(validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(10000)], verbose_name='калории план')),
                 ('target_carbohydrate', models.FloatField(validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='углеводы план')),
                 ('target_fat', models.FloatField(validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='жиры план')),
                 ('target_fiber', models.FloatField(validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='пищевые волокна план')),
                 ('target_protein', models.FloatField(validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='белки план')),
                 ('target_sugar', models.FloatField(validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='сахар план')),
                 ('target_weight', models.FloatField(validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(250)], verbose_name='целевой вес')),
-                ('is_closed', models.BooleanField(default=False, verbose_name='проект закрыт')),
             ],
             options={
                 'ordering': ['-start_date'],

diff --git a/blackfox/training/migrations/0002_initial.py b/blackfox/training/migrations/0002_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.16 on 2024-07-20 20:47
+# Generated by Django 3.2.16 on 2024-08-08 20:35
 
 from django.conf import settings
 from django.db import migrations, models
@@ -10,20 +10,20 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('training', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.AddField(
             model_name='project',
             name='coach',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='coach', to=settings.AUTH_USER_MODEL, verbose_name='тренер'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_coach', to=settings.AUTH_USER_MODEL, verbose_name='тренер'),
         ),
         migrations.AddField(
             model_name='project',
             name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project', to=settings.AUTH_USER_MODEL, verbose_name='спортсмен'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_user', to=settings.AUTH_USER_MODEL, verbose_name='спортсмен'),
         ),
         migrations.AddField(
             model_name='fooddiary',

diff --git a/blackfox/training/models.py b/blackfox/training/models.py
@@ -168,22 +168,18 @@ class Project(models.Model):
         User,
         on_delete=models.CASCADE,
         verbose_name='спортсмен',
-        related_name='project',
+        related_name='project_user',
     )
     coach = models.ForeignKey(
         User,
         on_delete=models.CASCADE,
         verbose_name='тренер',
-        related_name='coach',
+        related_name='project_coach',
     )
     start_date = models.DateField(
         verbose_name='начало проекта',
         db_index=True,
     )
-    deadline = models.DateField(
-        verbose_name='окончание проекта',
-        db_index=True,
-    )
     target_calories = models.PositiveIntegerField(
         verbose_name='калории план',
         validators=[MinValueValidator(0), MaxValueValidator(10_000)],
@@ -212,13 +208,9 @@ class Project(models.Model):
         verbose_name='целевой вес',
         validators=[MinValueValidator(30), MaxValueValidator(250)],
     )
-    is_closed = models.BooleanField(
-        verbose_name='проект закрыт',
-        default=False,
-    )
 
     class Meta:
         ordering = ['-start_date']
 
     def __str__(self):
-        return f'Цель {self.target_weight} кг. до {self.deadline} г.'
+        return f'{self.user.username}, целевой вес {self.target_weight} кг.'
diff --git a/blackfox/users/migrations/0001_initial.py b/blackfox/users/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.16 on 2024-07-20 20:47
+# Generated by Django 3.2.16 on 2024-08-08 20:35
 
 import django.contrib.auth.models
 import django.contrib.auth.validators