update migrations and database

Evgeniy-Golodnykh · Jul 20, 2024 · 85dad4e · 85dad4e
1 parent 870c8d5
commit 85dad4e
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 57 deletions.
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-06-08 15:13
+# Generated by Django 3.2.16 on 2024-07-20 20:47
 
 import django.core.validators
 from django.db import migrations, models
@@ -13,67 +13,41 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Anthropometry',
+            name='BodyStatsDiary',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('measurement_date', models.DateField(db_index=True, verbose_name='дата замера')),
-                ('steps', models.PositiveIntegerField(verbose_name='шаги')),
-                ('weight', models.FloatField(validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(250)], verbose_name='вес')),
-                ('height', models.FloatField(validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(250)], verbose_name='рост')),
-                ('waist', models.FloatField(validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(150)], verbose_name='талия')),
-                ('belly', models.FloatField(validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(150)], verbose_name='живот')),
-                ('hips', models.FloatField(validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(150)], verbose_name='бедра')),
-                ('chest', models.FloatField(validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(150)], verbose_name='грудь')),
+                ('date', models.DateField(db_index=True, verbose_name='дата питания')),
+                ('abdominal', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(250)], verbose_name='живот')),
+                ('chest', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(250)], verbose_name='грудь')),
+                ('hips', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(250)], verbose_name='бедра')),
+                ('neck', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(20), django.core.validators.MaxValueValidator(100)], verbose_name='шея')),
+                ('waist', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(250)], verbose_name='талия')),
+                ('weight', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(250)], verbose_name='вес')),
             ],
             options={
-                'ordering': ['-measurement_date'],
+                'ordering': ['-date'],
             },
         ),
         migrations.CreateModel(
-            name='Diet',
+            name='FoodDiary',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('url', models.URLField(verbose_name='ссылка на питание')),
-                ('diet_date', models.DateField(db_index=True, verbose_name='дата питания')),
-                ('calories', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='калории')),
-                ('calories_rdr', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='рсп калории')),
-                ('calories_perc', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='% калории')),
-                ('protein', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(500)], verbose_name='белки')),
-                ('protein_rdr', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(500)], verbose_name='рсп белки')),
-                ('protein_perc', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='% белки')),
-                ('fat', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(500)], verbose_name='жиры')),
-                ('fat_rdr', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(500)], verbose_name='рсп жиры')),
-                ('fat_perc', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='% жиры')),
-                ('carb', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(500)], verbose_name='углеводы')),
-                ('carb_rdr', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(500)], verbose_name='рсп углеводы')),
-                ('carb_perc', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='% углеводы')),
-                ('fiber', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(200)], verbose_name='клетчатка')),
-                ('fiber_rdr', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(200)], verbose_name='рсп клетчатка')),
-                ('fiber_perc', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='% клетчатка')),
-                ('water', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='вода')),
-                ('water_rdr', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='рсп вода')),
-                ('water_perc', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='% вода')),
-                ('vitamin_d', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='витамин Д')),
-                ('vitamin_d_rdr', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='рсп витамин Д')),
-                ('vitamin_d_perc', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='% витамин Д')),
-                ('potassium', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='калий')),
-                ('potassium_rdr', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='рсп калий')),
-                ('potassium_perc', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='% калий')),
-                ('calcium', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='кальций')),
-                ('calcium_rdr', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='рсп кальций')),
-                ('calcium_perc', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='% кальций')),
-                ('natrium', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='натрий')),
-                ('natrium_rdr', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='рсп натрий')),
-                ('natrium_perc', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='% натрий')),
-                ('ferrum', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='железо')),
-                ('ferrum_rdr', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='рсп железо')),
-                ('ferrum_perc', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='% железо')),
-                ('cholesterin', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='холистерин')),
-                ('cholesterin_rdr', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5000)], verbose_name='рсп холистерин')),
-                ('cholesterin_perc', models.FloatField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='% холистерин')),
+                ('date', models.DateField(db_index=True, verbose_name='дата питания')),
+                ('calories_actual', models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(10000)], verbose_name='калории факт')),
+                ('calories_target', models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(10000)], verbose_name='калории план')),
+                ('carbohydrate_actual', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='углеводы факт')),
+                ('carbohydrate_target', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='углеводы план')),
+                ('fat_actual', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='жиры факт')),
+                ('fat_target', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='жиры план')),
+                ('fiber_actual', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='пищевые волокна факт')),
+                ('fiber_target', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='пищевые волокна план')),
+                ('protein_actual', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='белки факт')),
+                ('protein_target', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='белки план')),
+                ('sugar_actual', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='сахар факт')),
+                ('sugar_target', models.FloatField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000)], verbose_name='сахар план')),
             ],
             options={
-                'ordering': ['-diet_date'],
+                'ordering': ['-date'],
             },
         ),
         migrations.CreateModel(
@@ -82,6 +56,12 @@ class Migration(migrations.Migration):
                 ('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='проект закрыт')),
             ],

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-06-08 15:13
+# Generated by Django 3.2.16 on 2024-07-20 20:47
 
 from django.conf import settings
 from django.db import migrations, models
@@ -26,13 +26,21 @@ class Migration(migrations.Migration):
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project', to=settings.AUTH_USER_MODEL, verbose_name='спортсмен'),
         ),
         migrations.AddField(
-            model_name='diet',
+            model_name='fooddiary',
             name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='diet', to=settings.AUTH_USER_MODEL, verbose_name='спортсмен'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='food_diary', to=settings.AUTH_USER_MODEL, verbose_name='спортсмен'),
         ),
         migrations.AddField(
-            model_name='anthropometry',
+            model_name='bodystatsdiary',
             name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='anthropometry', to=settings.AUTH_USER_MODEL, verbose_name='спортсмен'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bodystats_diary', to=settings.AUTH_USER_MODEL, verbose_name='спортсмен'),
+        ),
+        migrations.AddConstraint(
+            model_name='fooddiary',
+            constraint=models.UniqueConstraint(fields=('user', 'date'), name='unique_food_diary'),
+        ),
+        migrations.AddConstraint(
+            model_name='bodystatsdiary',
+            constraint=models.UniqueConstraint(fields=('user', 'date'), name='unique_bodystats_diary'),
         ),
     ]
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-06-08 15:13
+# Generated by Django 3.2.16 on 2024-07-20 20:47
 
 import django.contrib.auth.models
 import django.contrib.auth.validators