Handle import issues and add uniqueness constraints

src/api/migrations/0005_auto_20180514_1557.py

@@ -4,7 +4,10 @@
 
 from django.db import migrations, models
 
-from ...app import utils
+try:
+    from app import utils
+except ModuleNotFoundError:
+    from bullet_train_api.app import utils
 
 
 class Migration(migrations.Migration):

src/api/migrations/0011_auto_20180517_1646.py

@@ -4,7 +4,10 @@
 
 from django.db import migrations, models
 
-from ...app import utils
+try:
+    from app import utils
+except ModuleNotFoundError:
+    from bullet_train_api.app import utils
 
 
 class Migration(migrations.Migration):

src/api/migrations/0018_auto_20180524_1521.py

@@ -5,12 +5,21 @@
 from django.db import migrations, models
 import django.db.models.deletion
 
+try:
+    from users import apps
+    _dependencies = [
+        ('users', '0013_auto_20180524_1521'),
+        ('api', '0017_feature_description'),
+    ]
+except ModuleNotFoundError:
+    _dependencies = [
+        ('api', '0017_feature_description'),
+    ]
+
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('api', '0017_feature_description'),
-    ]
+    dependencies = _dependencies
 
     operations = [
         migrations.AlterField(

src/api/tests.py

@@ -2,15 +2,21 @@
 from rest_framework.authtoken.models import Token
 from rest_framework.test import APIClient
 
-from ..environments.models import Environment, Identity
-from ..features.models import Feature, FeatureState
-from ..projects.models import Project
-from ..organisations.models import Organisation
+try:
+    from environments.models import Environment, Identity
+    from features.models import Feature, FeatureState
+    from projects.models import Project
+    from organisations.models import Organisation
+    from users.models import FFAdminUser, Invite
+except ModuleNotFoundError:
+    from bullet_train_api.environments.models import Environment, Identity
+    from bullet_train_api.features.models import Feature, FeatureState
+    from bullet_train_api.projects.models import Project
+    from bullet_train_api.organisations.models import Organisation
+    from bullet_train_api.users.models import FFAdminUser, Invite
 
 from rest_framework import status
 
-from ..users.models import FFAdminUser, Invite
-
 
 class OrganisationTestCase(TestCase):
     put_template = '{ "name" : "%s"}'
@@ -326,8 +332,7 @@ def test_should_delete_feature_states_when_feature_deleted(self):
         # Given
         client = self.set_up()
         organisation = Organisation.objects.get(name="test org")
-        project = Project(name="test project", organisation=organisation)
-        project.save()
+        project = Project.objects.get(name="test project", organisation=organisation)
         environment_1 = Environment(name="env 1", project=project)
         environment_2 = Environment(name="env 2", project=project)
         environment_3 = Environment(name="env 3", project=project)

src/api/urls.py

@@ -1,6 +1,9 @@
 from django.conf.urls import url, include
 
-from ..features.views import SDKFeatureStates
+try:
+    from features.views import SDKFeatureStates
+except ModuleNotFoundError:
+    from bullet_train_api.features.views import SDKFeatureStates
 
 urlpatterns = [
     url(r'^v1/', include([

src/docs/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls import url
 
-from ..docs.views import schema_view
+from .views import schema_view
 
 urlpatterns = [
     url(r'^', schema_view, name='index')

src/environments/migrations/0001_initial.py

@@ -2,7 +2,10 @@
 # Generated by Django 1.11.13 on 2018-05-25 15:41
 from __future__ import unicode_literals
 
-from ...app import utils
+try:
+    from app import utils
+except ModuleNotFoundError:
+    from bullet_train_api.app import utils
 from django.db import migrations, models
 import django.db.models.deletion
 

src/environments/migrations/0003_auto_20180907_0313.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2018-09-07 03:13
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0002_auto_20180907_0313'),
+        ('environments', '0002_auto_20180809_0014'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='environment',
+            unique_together=set([('name', 'project')]),
+        ),
+        migrations.AlterUniqueTogether(
+            name='identity',
+            unique_together=set([('identifier', 'environment')]),
+        ),
+    ]

src/environments/models.py

@@ -4,10 +4,15 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-from ..app.utils import create_hash
 from django.utils.encoding import python_2_unicode_compatible
-from ..features.models import FeatureState
-from ..projects.models import Project
+try:
+    from app.utils import create_hash
+    from features.models import FeatureState
+    from projects.models import Project
+except ModuleNotFoundError:
+    from bullet_train_api.app.utils import create_hash
+    from bullet_train_api.features.models import FeatureState
+    from bullet_train_api.projects.models import Project
 
 
 @python_2_unicode_compatible
@@ -28,6 +33,7 @@ class Environment(models.Model):
     api_key = models.CharField(default=create_hash, unique=True, max_length=100)
 
     class Meta:
+        unique_together = ("name", "project")
         ordering = ['id']
 
     def save(self, *args, **kwargs):
@@ -72,6 +78,7 @@ class Identity(models.Model):
     )
 
     class Meta:
+        unique_together = ("identifier", "environment")
         verbose_name_plural = "Identities"
         ordering = ['id']
 

src/environments/serializers.py

@@ -1,8 +1,13 @@
 from rest_framework import serializers
 
-from ..features.serializers import FeatureStateSerializerFull
-from ..environments.models import Environment, Identity
-from ..projects.serializers import ProjectSerializer
+try:
+    from features.serializers import FeatureStateSerializerFull
+    from environments.models import Environment, Identity
+    from projects.serializers import ProjectSerializer
+except ModuleNotFoundError:
+    from bullet_train_api.features.serializers import FeatureStateSerializerFull
+    from bullet_train_api.environments.models import Environment, Identity
+    from bullet_train_api.projects.serializers import ProjectSerializer
 
 
 class EnvironmentSerializerFull(serializers.ModelSerializer):

src/environments/tests.py

@@ -1,9 +1,14 @@
 from django.test import TestCase
 
 from .models import Environment, Identity
-from ..features.models import Feature, FeatureState
-from ..organisations.models import Organisation
-from ..projects.models import Project
+try:
+    from features.models import Feature, FeatureState
+    from organisations.models import Organisation
+    from projects.models import Project
+except ModuleNotFoundError:
+    from bullet_train_api.features.models import Feature, FeatureState
+    from bullet_train_api.organisations.models import Organisation
+    from bullet_train_api.projects.models import Project
 
 
 class EnvironmentTestCase(TestCase):

src/environments/urls.py

@@ -1,7 +1,11 @@
 from django.conf.urls import url, include
 from rest_framework_nested import routers
 
-from ..features.views import FeatureStateViewSet
+try:
+    from features.views import FeatureStateViewSet
+except ModuleNotFoundError:
+    from bullet_train_api.features.views import FeatureStateViewSet
+
 from .views import IdentityViewSet, EnvironmentViewSet
 
 router = routers.DefaultRouter()

src/features/models.py

@@ -6,7 +6,10 @@
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
-from ..projects.models import Project
+try:
+    from projects.models import Project
+except ModuleNotFoundError:
+    from bullet_train_api.projects.models import Project
 
 
 # Feature Types

src/features/tests.py

@@ -1,9 +1,15 @@
 from django.test import TestCase
 
-from ..environments.models import Environment
+try:
+    from environments.models import Environment
+    from organisations.models import Organisation
+    from projects.models import Project
+except ModuleNotFoundError:
+    from bullet_train_api.environments.models import Environment
+    from bullet_train_api.organisations.models import Organisation
+    from bullet_train_api.projects.models import Project
+
 from .models import Feature, FeatureState
-from ..organisations.models import Organisation
-from ..projects.models import Project
 
 
 class FeatureTestCase(TestCase):

src/features/views.py

@@ -5,8 +5,12 @@
 from rest_framework.response import Response
 from rest_framework.schemas import AutoSchema
 
-from ..environments.models import Environment, Identity
-from ..projects.models import Project
+try:
+    from environments.models import Environment, Identity
+    from projects.models import Project
+except ModuleNotFoundError:
+    from bullet_train_api.environments.models import Environment, Identity
+    from bullet_train_api.projects.models import Project
 from .models import FeatureState, Feature
 from .serializers import FeatureStateSerializerBasic, FeatureStateSerializerFull, \
     FeatureStateSerializerCreate, CreateFeatureSerializer, FeatureSerializer, \

src/organisations/admin.py

@@ -3,8 +3,11 @@
 
 from django.contrib import admin
 
-from ..projects.models import Project
-from ..organisations.models import Organisation
+try:
+    from projects.models import Project
+except ModuleNotFoundError:
+    from bullet_train_api.projects.models import Project
+from .models import Organisation
 
 
 class ProjectInline(admin.StackedInline):

src/organisations/migrations/0003_auto_20180907_0313.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2018-09-07 03:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organisations', '0002_organisation_has_requested_features'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='organisation',
+            name='name',
+            field=models.CharField(max_length=2000, unique=True),
+        ),
+    ]

src/organisations/models.py

@@ -7,7 +7,7 @@
 
 @python_2_unicode_compatible
 class Organisation(models.Model):
-    name = models.CharField(max_length=2000)
+    name = models.CharField(max_length=2000, unique=True)
     has_requested_features = models.BooleanField(default=False)
 
     class Meta:

src/organisations/views.py

@@ -6,9 +6,13 @@
 from rest_framework.exceptions import ValidationError
 from rest_framework.response import Response
 
-from ..projects.serializers import ProjectSerializer
-from ..organisations.serializers import OrganisationSerializer
-from ..users.serializers import UserFullSerializer, InviteSerializer
+try:
+    from projects.serializers import ProjectSerializer
+    from users.serializers import UserFullSerializer, InviteSerializer
+except ModuleNotFoundError:
+    from bullet_train_api.projects.serializers import ProjectSerializer
+    from bullet_train_api.users.serializers import UserFullSerializer, InviteSerializer
+from .serializers import OrganisationSerializer
 
 
 class OrganisationViewSet(viewsets.ModelViewSet):

src/projects/admin.py

@@ -3,9 +3,13 @@
 
 from django.contrib import admin
 
-from ..environments.models import Environment
-from ..features.models import Feature
-from ..projects.models import Project
+try:
+    from environments.models import Environment
+    from features.models import Feature
+except ModuleNotFoundError:
+    from bullet_train_api.environments.models import Environment
+    from bullet_train_api.features.models import Feature
+from .models import Project
 
 
 class EnvironmentInline(admin.StackedInline):

src/projects/migrations/0002_auto_20180907_0313.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2018-09-07 03:13
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organisations', '0003_auto_20180907_0313'),
+        ('projects', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='project',
+            unique_together=set([('name', 'organisation')]),
+        ),
+    ]

src/projects/models.py

@@ -4,7 +4,10 @@
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 
-from ..organisations.models import Organisation
+try:
+    from organisations.models import Organisation
+except ModuleNotFoundError:
+    from bullet_train_api.organisations.models import Organisation
 
 
 @python_2_unicode_compatible
@@ -19,6 +22,7 @@ class Project(models.Model):
 
     class Meta:
         ordering = ['id']
+        unique_together = ('name', 'organisation')
 
     def __str__(self):
         return "Project %s" % self.name