diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index e8179e0..bb0d3b5 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,26 +1,18 @@ - - sqlite.xerial + + postgresql true - org.sqlite.JDBC - jdbc:sqlite:$PROJECT_DIR$/db.sqlite3 + org.postgresql.Driver + jdbc:postgresql://c5hilnj7pn10vb.cluster-czrs8kj4isg7.us-east-1.rds.amazonaws.com:5432/da5qsrq0ik3lgm $ProjectFileDir$ - - - file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.43.0/org/xerial/sqlite-jdbc/3.43.0.0/sqlite-jdbc-3.43.0.0.jar - - - file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.43.0/org/xerial/sqlite-jdbc/3.43.0.0/sqlite-jdbc-3.43.0.0.jar - - - + postgresql true org.postgresql.Driver - jdbc:postgresql://c5hilnj7pn10vb.cluster-czrs8kj4isg7.us-east-1.rds.amazonaws.com:5432/da5qsrq0ik3lgm + jdbc:postgresql://localhost:5432/postgres $ProjectFileDir$ diff --git a/api/migrations/0009_food_initial_description.py b/api/migrations/0009_food_initial_description.py new file mode 100644 index 0000000..d2caf04 --- /dev/null +++ b/api/migrations/0009_food_initial_description.py @@ -0,0 +1,18 @@ +# Generated by Django 5.0.3 on 2024-05-29 20:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0008_meal_most_recent_follow_up'), + ] + + operations = [ + migrations.AddField( + model_name='food', + name='initial_description', + field=models.TextField(blank=True, null=True), + ), + ] diff --git a/api/models.py b/api/models.py index 0f8e892..40edc58 100644 --- a/api/models.py +++ b/api/models.py @@ -27,6 +27,7 @@ class Food(models.Model): """ id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) name = models.CharField(max_length=255, default="") + initial_description = models.TextField(blank=True, null=True) # the system with nutritional info is on a *range* of values, so we need to store the min and max values # all values are in grams calories_min = models.FloatField(default=0) diff --git a/api/views.py b/api/views.py index 79fdcc6..d71235f 100644 --- a/api/views.py +++ b/api/views.py @@ -126,9 +126,12 @@ def post(self, request): food_serializer = FoodSerializer(data=response) if food_serializer.is_valid(): food = food_serializer.save() + food.initial_description = description + food.save() else: raise ErrorMessage("Error saving food data to database") + self.add_food_to_meal(user, food, meal_type, date_str, name) # before returning, add the db id to the response json diff --git a/docker-compose.yml b/docker-compose.yml index 0117db3..dd6d26c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,12 @@ services: db: - image: postgres + image: postgres:latest environment: POSTGRES_DB: ${POSTGRES_DB} POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + ports: + - "5432:5432" volumes: - postgres_data:/var/lib/postgresql/data/