Skip to content

Commit

Permalink
Make the meta field optional in Asset & Bed Tables (#769)
Browse files Browse the repository at this point in the history
* Make the meta field optional in asset

* Make the meta field optional in bed tables

* Remove default in optional meta fields

* Update migrations

* Remove null and keep defaults

* Update migrations

* Fix migrations
  • Loading branch information
rabilrbl authored Jun 19, 2022
1 parent 9040fdb commit d8429f9
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 4 deletions.
43 changes: 43 additions & 0 deletions care/facility/migrations/0296_auto_20220527_2324.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Generated by Django 2.2.11 on 2022-05-27 17:54

import django.contrib.postgres.fields.jsonb
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('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',
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),
),
]
2 changes: 1 addition & 1 deletion care/facility/models/asset.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,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, 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)
Expand Down
6 changes: 3 additions & 3 deletions care/facility/models/bed.py
Original file line number Diff line number Diff line change
Expand Up @@ -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, blank=True)
assets = models.ManyToManyField(Asset, through="AssetBed")
location = models.ForeignKey(AssetLocation, on_delete=models.PROTECT, null=False, blank=False)

Expand All @@ -42,7 +42,7 @@ def __str__(self):
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, blank=True)

def __str__(self):
return f"{self.asset.name} - {self.bed.name}"
Expand All @@ -53,4 +53,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, blank=True)

0 comments on commit d8429f9

Please sign in to comment.