Added organization types

buildly/management/commands/loadinitialdata.py

@@ -6,7 +6,7 @@
 from django.db import transaction
 
 from core.models import ROLE_VIEW_ONLY, ROLE_ORGANIZATION_ADMIN, ROLE_WORKFLOW_ADMIN, ROLE_WORKFLOW_TEAM, \
-    Organization, CoreUser, CoreGroup
+    Organization, CoreUser, CoreGroup, OrganizationType
 
 logger = logging.getLogger(__name__)
 
@@ -27,6 +27,11 @@ def __init__(self, *args, **kwargs):
         self._su_group = None
         self._default_org = None
 
+    def _create_organization_types(self):
+        if settings.ORGANIZATION_TYPES:
+            for organization_type in settings.ORGANIZATION_TYPES:
+                OrganizationType.objects.get_or_create(name=organization_type)
+
     def _create_default_organization(self):
         if settings.DEFAULT_ORG:
             self._default_org, _ = Organization.objects.get_or_create(name=settings.DEFAULT_ORG)
@@ -73,5 +78,6 @@ def _create_user(self):
     @transaction.atomic
     def handle(self, *args, **options):
         self._create_groups()
+        self._create_organization_types()
         self._create_default_organization()
         self._create_user()

buildly/settings/base.py

@@ -198,3 +198,12 @@
 SWAGGER_SETTINGS = {
     'DEFAULT_INFO': 'gateway.urls.swagger_info',
 }
+
+ORGANIZATION_TYPES = [
+    'Logistics Provider',
+	'Packer',
+	'Producer',
+	'Receiver',
+	'Shipper',
+	'Warehouse'
+]

buildly/tests/test_loadinitialdata.py

@@ -5,7 +5,7 @@
 from django.core.management import call_command
 from django.test import TransactionTestCase, override_settings
 
-from core.models import CoreGroup, CoreUser, Organization
+from core.models import CoreGroup, CoreUser, Organization, OrganizationType
 
 
 class DevNull(object):
@@ -34,6 +34,7 @@ def test_full_initial_data(self):
         call_command('loadinitialdata', *args, **opts)
 
         assert CoreGroup.objects.filter(name='Global Admin', is_global=True, permissions=15).count() == 1
+        assert OrganizationType.objects.filter().count() >= 6
         assert Organization.objects.filter(name=settings.DEFAULT_ORG).count() == 1
         assert CoreUser.objects.filter(is_superuser=True).count() == 1
 

core/admin.py

@@ -2,7 +2,8 @@
 from django.contrib.auth.admin import UserAdmin
 from django.utils.translation import ugettext_lazy as _
 
-from core.models import CoreUser, CoreGroup, CoreSites, EmailTemplate, Industry, LogicModule, Organization, Consortium
+from core.models import CoreUser, CoreGroup, CoreSites, EmailTemplate, \
+    Industry, LogicModule, Organization, OrganizationType, Consortium
 
 
 class LogicModuleAdmin(admin.ModelAdmin):
@@ -17,8 +18,13 @@ class CoreSitesAdmin(admin.ModelAdmin):
     search_fields = ('name',)
 
 
+class OrganizationTypeAdmin(admin.ModelAdmin):
+    list_display = ('name',)
+    display = 'Organization Type'
+
+
 class OrganizationAdmin(admin.ModelAdmin):
-    list_display = ('name', 'create_date', 'edit_date')
+    list_display = ('name', 'organization_type', 'create_date', 'edit_date')
     display = 'Organization'
 
 
@@ -64,6 +70,7 @@ class EmailTemplateAdmin(admin.ModelAdmin):
 
 admin.site.register(LogicModule, LogicModuleAdmin)
 admin.site.register(Organization, OrganizationAdmin)
+admin.site.register(OrganizationType, OrganizationTypeAdmin)
 admin.site.register(CoreGroup, CoreGroupAdmin)
 admin.site.register(CoreUser, CoreUserAdmin)
 admin.site.register(CoreSites, CoreSitesAdmin)

core/migrations/0007_organization_type.py

@@ -0,0 +1,30 @@
+# Generated by Django 2.2.10 on 2021-06-04 06:40
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0006_consortium'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OrganizationType',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(blank=True, help_text='Organization type', max_length=255, verbose_name='Name')),
+            ],
+            options={
+                'verbose_name_plural': 'Organization Types',
+                'ordering': ('name',),
+            },
+        ),
+        migrations.AddField(
+            model_name='organization',
+            name='organization_type',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.OrganizationType'),
+        ),
+    ]

core/models.py

@@ -78,6 +78,25 @@ def save(self, *args, **kwargs):
     def __str__(self):
         return self.name
 
+class OrganizationType(models.Model):
+    """
+    Allows organization to be of multiple types.
+    Supported types are:
+    1. Logistics Provider
+	2. Packer
+	3. Producer
+	4. Receiver
+	5. Shipper
+	6. Warehouse
+    """
+    name = models.CharField("Name", max_length=255, blank=True, help_text="Organization type")
+
+    class Meta:
+        ordering = ('name',)
+        verbose_name_plural = "Organization Types"
+
+    def __str__(self):
+        return str(self.name)
 
 class Organization(models.Model):
     """
@@ -96,6 +115,8 @@ class Organization(models.Model):
     phone = models.CharField(max_length=20, blank=True, null=True)
     allow_import_export = models.BooleanField('To allow import export functionality', default=False)
     radius = models.FloatField(max_length=20, blank=True, null=True)
+    organization_type = models.ForeignKey(OrganizationType,on_delete=models.CASCADE,null=True)
+
     class Meta:
         ordering = ('name',)
         verbose_name_plural = "Organizations"

core/tests/test_serializers.py

@@ -24,6 +24,7 @@ def test_org_serializer(request_factory, org):
         'industries',
         'allow_import_export',
         'radius',
+        'organization_type'
     ]
     assert set(data.keys()) == set(keys)