diff --git a/country/migrations/0034_auto_20210505_1156.py b/country/migrations/0034_auto_20210505_1156.py new file mode 100644 index 0000000..9e7b2b4 --- /dev/null +++ b/country/migrations/0034_auto_20210505_1156.py @@ -0,0 +1,34 @@ +# Generated by Django 3.1.7 on 2021-05-05 11:56 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('country', '0033_merge_20210416_0530'), + ] + + operations = [ + migrations.AddField( + model_name='buyer', + name='country', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='buyers', to='country.country'), + ), + migrations.AddField( + model_name='buyer', + name='summary', + field=models.JSONField(null=True), + ), + migrations.AddField( + model_name='supplier', + name='country', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='suppliers', to='country.country'), + ), + migrations.AddField( + model_name='supplier', + name='summary', + field=models.JSONField(null=True), + ), + ] diff --git a/country/models.py b/country/models.py index 261f73d..ca5cfa3 100644 --- a/country/models.py +++ b/country/models.py @@ -138,6 +138,8 @@ class Supplier(models.Model): verbose_name=_("Supplier name"), max_length=250, null=True, blank=True, db_index=True ) supplier_address = models.CharField(verbose_name=_("Supplier address"), max_length=250, null=True, blank=True) + country = models.ForeignKey(Country, on_delete=models.CASCADE, related_name="suppliers", null=True) + summary = models.JSONField(null=True) objects = SupplierManager() def __str__(self): @@ -148,6 +150,8 @@ class Buyer(models.Model): buyer_id = models.CharField(verbose_name=_("Buyer ID"), max_length=50, null=True) buyer_name = models.CharField(verbose_name=_("Buyer name"), max_length=250, null=True, blank=True, db_index=True) buyer_address = models.CharField(verbose_name=_("Buyer address"), max_length=250, null=True, blank=True) + country = models.ForeignKey(Country, on_delete=models.CASCADE, related_name="buyers", null=True) + summary = models.JSONField(null=True) objects = BuyerManager() def __str__(self): diff --git a/country/tasks.py b/country/tasks.py index 4236cf9..06e893d 100644 --- a/country/tasks.py +++ b/country/tasks.py @@ -265,6 +265,7 @@ def import_tender_from_batch_id(batch_id, country, currency): supplier_id=supplier_id, supplier_name=supplier_name, supplier_address=supplier_address, + country=country_obj, ) supplier_obj.save() else: @@ -280,6 +281,7 @@ def import_tender_from_batch_id(batch_id, country, currency): buyer_id=buyer_id, buyer_name=buyer_name, buyer_address=buyer_address, + country=country_obj, ) buyer_obj.save() else: