From ed205169bb88930c74dce1b701bc25e80afcc640 Mon Sep 17 00:00:00 2001 From: Mohammed Rabil Date: Fri, 20 May 2022 03:48:40 +0000 Subject: [PATCH 1/7] Make the meta field optional in asset --- care/facility/models/asset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/care/facility/models/asset.py b/care/facility/models/asset.py index b08069744a..2baff15315 100644 --- a/care/facility/models/asset.py +++ b/care/facility/models/asset.py @@ -58,7 +58,7 @@ class Status(enum.Enum): not_working_reason = models.CharField(max_length=1024, blank=True, null=True) serial_number = models.CharField(max_length=1024, blank=True, null=True) warranty_details = models.TextField(null=True, blank=True, default="") - meta = JSONField(default=dict) + meta = JSONField(default=dict, null=True, blank=True) # Vendor Details vendor_name = models.CharField(max_length=1024, blank=True, null=True) support_name = models.CharField(max_length=1024, blank=True, null=True) From a63caddc74e233ad84385edbf22c13e2544555f9 Mon Sep 17 00:00:00 2001 From: Mohammed Rabil Date: Fri, 20 May 2022 03:48:49 +0000 Subject: [PATCH 2/7] Make the meta field optional in bed tables --- care/facility/models/bed.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/care/facility/models/bed.py b/care/facility/models/bed.py index ad9833bcbb..71d592b360 100644 --- a/care/facility/models/bed.py +++ b/care/facility/models/bed.py @@ -31,7 +31,7 @@ class BedType(enum.Enum): description = models.TextField(default="", blank=True) bed_type = models.IntegerField(choices=BedTypeChoices, default=BedType.REGULAR.value) facility = models.ForeignKey(Facility, on_delete=models.PROTECT, null=False, blank=False) # Deprecated - meta = JSONField(default=dict) + meta = JSONField(default=dict, null=True, blank=True) assets = models.ManyToManyField(Asset, through="AssetBed") location = models.ForeignKey(AssetLocation, on_delete=models.PROTECT, null=False, blank=False) @@ -39,7 +39,7 @@ class BedType(enum.Enum): class AssetBed(BaseModel): asset = models.ForeignKey(Asset, on_delete=models.PROTECT, null=False, blank=False) bed = models.ForeignKey(Bed, on_delete=models.PROTECT, null=False, blank=False) - meta = JSONField(default=dict) + meta = JSONField(default=dict, null=True, blank=True) class ConsultationBed(BaseModel): @@ -47,4 +47,4 @@ class ConsultationBed(BaseModel): bed = models.ForeignKey(Bed, on_delete=models.PROTECT, null=False, blank=False) start_date = models.DateTimeField(null=False, blank=False) end_date = models.DateTimeField(null=True, blank=True, default=None) - meta = JSONField(default=dict) + meta = JSONField(default=dict, null=True, blank=True) From b74e73ae6a8c23ed191fb54f7a1e05ff74f5f1ba Mon Sep 17 00:00:00 2001 From: Mohammed Rabil Date: Fri, 20 May 2022 04:09:05 +0000 Subject: [PATCH 3/7] Remove default in optional meta fields --- care/facility/models/asset.py | 2 +- care/facility/models/bed.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/care/facility/models/asset.py b/care/facility/models/asset.py index 2baff15315..aa803f241d 100644 --- a/care/facility/models/asset.py +++ b/care/facility/models/asset.py @@ -58,7 +58,7 @@ class Status(enum.Enum): not_working_reason = models.CharField(max_length=1024, blank=True, null=True) serial_number = models.CharField(max_length=1024, blank=True, null=True) warranty_details = models.TextField(null=True, blank=True, default="") - meta = JSONField(default=dict, null=True, blank=True) + meta = JSONField(null=True, blank=True) # Vendor Details vendor_name = models.CharField(max_length=1024, blank=True, null=True) support_name = models.CharField(max_length=1024, blank=True, null=True) diff --git a/care/facility/models/bed.py b/care/facility/models/bed.py index 71d592b360..9f884bf291 100644 --- a/care/facility/models/bed.py +++ b/care/facility/models/bed.py @@ -31,7 +31,7 @@ class BedType(enum.Enum): description = models.TextField(default="", blank=True) bed_type = models.IntegerField(choices=BedTypeChoices, default=BedType.REGULAR.value) facility = models.ForeignKey(Facility, on_delete=models.PROTECT, null=False, blank=False) # Deprecated - meta = JSONField(default=dict, null=True, blank=True) + meta = JSONField(null=True, blank=True) assets = models.ManyToManyField(Asset, through="AssetBed") location = models.ForeignKey(AssetLocation, on_delete=models.PROTECT, null=False, blank=False) @@ -39,7 +39,7 @@ class BedType(enum.Enum): class AssetBed(BaseModel): asset = models.ForeignKey(Asset, on_delete=models.PROTECT, null=False, blank=False) bed = models.ForeignKey(Bed, on_delete=models.PROTECT, null=False, blank=False) - meta = JSONField(default=dict, null=True, blank=True) + meta = JSONField(null=True, blank=True) class ConsultationBed(BaseModel): @@ -47,4 +47,4 @@ class ConsultationBed(BaseModel): bed = models.ForeignKey(Bed, on_delete=models.PROTECT, null=False, blank=False) start_date = models.DateTimeField(null=False, blank=False) end_date = models.DateTimeField(null=True, blank=True, default=None) - meta = JSONField(default=dict, null=True, blank=True) + meta = JSONField(null=True, blank=True) From 0f8cfe884594612a3b6c17d48c8eed36fa082b3e Mon Sep 17 00:00:00 2001 From: Mohammed Rabil Date: Fri, 20 May 2022 05:23:34 +0000 Subject: [PATCH 4/7] Update migrations --- .../migrations/0293_auto_20220520_1053.py | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 care/facility/migrations/0293_auto_20220520_1053.py diff --git a/care/facility/migrations/0293_auto_20220520_1053.py b/care/facility/migrations/0293_auto_20220520_1053.py new file mode 100644 index 0000000000..960a33da92 --- /dev/null +++ b/care/facility/migrations/0293_auto_20220520_1053.py @@ -0,0 +1,34 @@ +# Generated by Django 2.2.11 on 2022-05-20 05:23 + +import django.contrib.postgres.fields.jsonb +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('facility', '0292_auto_20220430_1748'), + ] + + operations = [ + migrations.AlterField( + model_name='asset', + name='meta', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), + ), + migrations.AlterField( + model_name='assetbed', + name='meta', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), + ), + migrations.AlterField( + model_name='bed', + name='meta', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), + ), + migrations.AlterField( + model_name='consultationbed', + name='meta', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), + ), + ] From a7a3b68e9c8559eb8ebfb3b3433f39ac53b8edd6 Mon Sep 17 00:00:00 2001 From: Rabil Date: Fri, 27 May 2022 22:48:07 +0530 Subject: [PATCH 5/7] Remove null and keep defaults --- care/facility/models/asset.py | 2 +- care/facility/models/bed.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/care/facility/models/asset.py b/care/facility/models/asset.py index aa803f241d..829fd5ee11 100644 --- a/care/facility/models/asset.py +++ b/care/facility/models/asset.py @@ -58,7 +58,7 @@ class Status(enum.Enum): not_working_reason = models.CharField(max_length=1024, blank=True, null=True) serial_number = models.CharField(max_length=1024, blank=True, null=True) warranty_details = models.TextField(null=True, blank=True, default="") - meta = JSONField(null=True, blank=True) + meta = JSONField(default=dict, blank=True) # Vendor Details vendor_name = models.CharField(max_length=1024, blank=True, null=True) support_name = models.CharField(max_length=1024, blank=True, null=True) diff --git a/care/facility/models/bed.py b/care/facility/models/bed.py index 9f884bf291..765cd472eb 100644 --- a/care/facility/models/bed.py +++ b/care/facility/models/bed.py @@ -31,7 +31,7 @@ class BedType(enum.Enum): description = models.TextField(default="", blank=True) bed_type = models.IntegerField(choices=BedTypeChoices, default=BedType.REGULAR.value) facility = models.ForeignKey(Facility, on_delete=models.PROTECT, null=False, blank=False) # Deprecated - meta = JSONField(null=True, blank=True) + meta = JSONField(default=dict, blank=True) assets = models.ManyToManyField(Asset, through="AssetBed") location = models.ForeignKey(AssetLocation, on_delete=models.PROTECT, null=False, blank=False) @@ -39,7 +39,7 @@ class BedType(enum.Enum): class AssetBed(BaseModel): asset = models.ForeignKey(Asset, on_delete=models.PROTECT, null=False, blank=False) bed = models.ForeignKey(Bed, on_delete=models.PROTECT, null=False, blank=False) - meta = JSONField(null=True, blank=True) + meta = JSONField(default=dict, blank=True) class ConsultationBed(BaseModel): @@ -47,4 +47,4 @@ class ConsultationBed(BaseModel): bed = models.ForeignKey(Bed, on_delete=models.PROTECT, null=False, blank=False) start_date = models.DateTimeField(null=False, blank=False) end_date = models.DateTimeField(null=True, blank=True, default=None) - meta = JSONField(null=True, blank=True) + meta = JSONField(default=dict, blank=True) From 484095171004cb660f7748b4c94f8e963281e0ac Mon Sep 17 00:00:00 2001 From: Rabil Date: Fri, 27 May 2022 22:56:52 +0530 Subject: [PATCH 6/7] Update migrations --- .../migrations/0294_auto_20220527_2256.py | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 care/facility/migrations/0294_auto_20220527_2256.py diff --git a/care/facility/migrations/0294_auto_20220527_2256.py b/care/facility/migrations/0294_auto_20220527_2256.py new file mode 100644 index 0000000000..dde1628e36 --- /dev/null +++ b/care/facility/migrations/0294_auto_20220527_2256.py @@ -0,0 +1,34 @@ +# Generated by Django 2.2.11 on 2022-05-27 17:26 + +import django.contrib.postgres.fields.jsonb +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('facility', '0293_auto_20220520_1053'), + ] + + operations = [ + migrations.AlterField( + model_name='asset', + name='meta', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='assetbed', + name='meta', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='bed', + name='meta', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='consultationbed', + name='meta', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + ] From b8ba6569d479cc3e106c2174c272706aad07463f Mon Sep 17 00:00:00 2001 From: Rabil Date: Fri, 27 May 2022 23:29:46 +0530 Subject: [PATCH 7/7] Fix migrations --- .../migrations/0293_auto_20220520_1053.py | 34 ------------------- ...527_2256.py => 0296_auto_20220527_2324.py} | 15 ++++++-- 2 files changed, 12 insertions(+), 37 deletions(-) delete mode 100644 care/facility/migrations/0293_auto_20220520_1053.py rename care/facility/migrations/{0294_auto_20220527_2256.py => 0296_auto_20220527_2324.py} (63%) diff --git a/care/facility/migrations/0293_auto_20220520_1053.py b/care/facility/migrations/0293_auto_20220520_1053.py deleted file mode 100644 index 960a33da92..0000000000 --- a/care/facility/migrations/0293_auto_20220520_1053.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 2.2.11 on 2022-05-20 05:23 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('facility', '0292_auto_20220430_1748'), - ] - - operations = [ - migrations.AlterField( - model_name='asset', - name='meta', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), - ), - migrations.AlterField( - model_name='assetbed', - name='meta', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), - ), - migrations.AlterField( - model_name='bed', - name='meta', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), - ), - migrations.AlterField( - model_name='consultationbed', - name='meta', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), - ), - ] diff --git a/care/facility/migrations/0294_auto_20220527_2256.py b/care/facility/migrations/0296_auto_20220527_2324.py similarity index 63% rename from care/facility/migrations/0294_auto_20220527_2256.py rename to care/facility/migrations/0296_auto_20220527_2324.py index dde1628e36..7321e9b697 100644 --- a/care/facility/migrations/0294_auto_20220527_2256.py +++ b/care/facility/migrations/0296_auto_20220527_2324.py @@ -1,16 +1,25 @@ -# Generated by Django 2.2.11 on 2022-05-27 17:26 +# Generated by Django 2.2.11 on 2022-05-27 17:54 import django.contrib.postgres.fields.jsonb -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('facility', '0293_auto_20220520_1053'), + ('facility', '0295_merge_20220527_1430'), ] operations = [ + migrations.AlterModelOptions( + name='facilitycapacity', + options={'verbose_name_plural': 'Facility Capacities'}, + ), + migrations.AlterField( + model_name='asset', + name='asset_class', + field=models.IntegerField(blank=True, choices=[('ONVIF', 'onvif'), ('HL7MONITOR', 'hl7monitor')], default=None, null=True), + ), migrations.AlterField( model_name='asset', name='meta',