ADD COLUMN for med sources table

Author: taichan03

server/api/admin.py

@@ -12,7 +12,6 @@
 @admin.register(MedRule)
 class MedRuleAdmin(admin.ModelAdmin):
     list_display = ['rule_type', 'history_type', 'label']
-    filter_horizontal = ['medications', 'sources']
     search_fields = ['label', 'history_type', 'reason']
 
 
@@ -22,7 +21,7 @@ class MedicationAdmin(admin.ModelAdmin):
 
 
 @admin.register(Medication)
-class MedicationAdmin(admin.ModelAdmin): # noqa: F811
+class MedicationAdmin(admin.ModelAdmin):  # noqa: F811
     list_display = ['name', 'benefits', 'risks']
 
 

server/api/migrations/0012_remove_medrule_medications_medrulesource_and_more.py

@@ -0,0 +1,48 @@
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0011_embeddings_publication_embeddings_publication_date_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MedRuleSource',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True,
+                 primary_key=True, serialize=False, verbose_name='ID')),
+                ('embedding', models.ForeignKey(
+                    on_delete=django.db.models.deletion.CASCADE, to='api.embeddings')),
+                ('medication', models.ForeignKey(
+                    on_delete=django.db.models.deletion.CASCADE, to='api.medication')),
+                ('medrule', models.ForeignKey(
+                    on_delete=django.db.models.deletion.CASCADE, to='api.medrule')),
+            ],
+            options={
+                'db_table': 'api_medrule_sources',
+                'unique_together': {('medrule', 'embedding', 'medication')},
+            },
+        ),
+        migrations.SeparateDatabaseAndState(
+            database_operations=[],
+            state_operations=[
+                migrations.AlterField(
+                    model_name='medrule',
+                    name='sources',
+                    field=models.ManyToManyField(
+                        blank=True,
+                        related_name='med_rules',
+                        through='api.MedRuleSource',
+                        to='api.embeddings'
+                    ),
+                ),
+                migrations.RemoveField(
+                    model_name='medrule',
+                    name='medications',
+                ),
+            ]
+        ),
+    ]

server/api/models/model_medRule.py

@@ -11,12 +11,14 @@ class MedRule(models.Model):
     history_type = models.CharField(max_length=255)
     reason = models.TextField(blank=True, null=True)
     label = models.CharField(max_length=255, blank=True, null=True)
-    medications = models.ManyToManyField(Medication, related_name='med_rules')
+
     sources = models.ManyToManyField(
         Embeddings,
         related_name='med_rules',
-        blank=True
+        blank=True,
+        through='MedRuleSource'
     )
+
     explanation = models.TextField(blank=True, null=True)
 
     class Meta:
@@ -25,3 +27,14 @@ class Meta:
 
     def __str__(self):
         return f"{self.rule_type} - {self.label}"
+
+
+class MedRuleSource(models.Model):
+    medrule = models.ForeignKey(MedRule, on_delete=models.CASCADE)
+    embedding = models.ForeignKey(Embeddings, on_delete=models.CASCADE)
+    medication = models.ForeignKey(
+        Medication, on_delete=models.CASCADE)
+
+    class Meta:
+        db_table = 'api_medrule_sources'
+        unique_together = ('medrule', 'embedding', 'medication')

server/entrypoint.sh

@@ -11,8 +11,8 @@ then
     echo "PostgreSQL started"
 fi
 
-python manage.py makemigrations api --no-input
-# python manage.py flush --no-input
+# python manage.py makemigrations api 
+# # python manage.py flush --no-input
 python manage.py migrate
 # create superuser for postgre admin on start up
 python manage.py createsu