fixed null error

luftdaten-at · Dec 9, 2024 · 47ed522 · 47ed522
1 parent db8e417
commit 47ed522
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 24 deletions.
diff --git a/app/api/migrations/0003_devicelogs_measurementnew_values.py b/app/api/migrations/0003_devicelogs_measurementnew_values.py
@@ -9,7 +9,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('api', '0002_alter_fk'),
         ('campaign', '0002_alter_campaign_id_alter_campaign_name_organization_and_more'),
-        ('devices', '0005_alter_sensor_id'),
+        ('devices', '0004_alter_device_model_remove_device_sensor_bme280_and_more'),
     ]
 
     operations = [

diff --git a/app/devices/migrations/0004_alter_device_model_remove_device_sensor_bme280_and_more.py b/app/devices/migrations/0004_alter_device_model_remove_device_sensor_bme280_and_more.py
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='device',
             name='model',
-            field=models.CharField(blank=True, default=None, max_length=255),
+            field=models.CharField(blank=True, max_length=255, null=True),
             preserve_default=False,
         ),
         migrations.RemoveField(
@@ -66,7 +66,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='device',
             name='device_name',
-            field=models.CharField(blank=True, default=None, max_length=255),
+            field=models.CharField(blank=True, max_length=255, null=True),
             preserve_default=False,
         ),
         migrations.AlterField(
@@ -86,7 +86,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='sensor',
             name='id',
-            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+            field=models.CharField(max_length=255, primary_key=True),
         ),
         migrations.DeleteModel(
             name='DeviceModel',

diff --git a/app/devices/migrations/0005_alter_sensor_id.py b/app/devices/migrations/0005_alter_sensor_id.py
diff --git a/app/devices/models.py b/app/devices/models.py
@@ -7,8 +7,8 @@ class Device(models.Model):
     Device model.
     """
     id = models.CharField(max_length=255, primary_key=True)
-    device_name = models.CharField(max_length=255, blank=True)
-    model = models.CharField(max_length=255, blank=True)
+    device_name = models.CharField(max_length=255, blank=True, null=True)
+    model = models.CharField(max_length=255, blank=True, null=True)
     firmware = models.CharField(max_length=12, blank=True)
     btmac_address = models.CharField(max_length=12, null=True, blank=True)
     last_update = models.DateTimeField(null=True, blank=True)

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,6 +11,7 @@ services:
   db:
     image: postgres:16-alpine
     volumes:
+      - ./db_backup/read:/docker-entrypoint-initdb.d/:ro
       - postgres_data:/var/lib/postgresql/data/
     env_file:
       - .env