From d45bdf5c4ee807b9557f911c2e212e282c0c556e Mon Sep 17 00:00:00 2001
From: Eduardo Cuducos <cuducos@gmail.com>
Date: Wed, 25 Jul 2018 10:49:53 -0300
Subject: [PATCH] Change Django app architecture

Following previus discussion on another Serenata Django project:
https://github.com/okfn-brasil/jarbas/issues/28
---
 perfil/Dockerfile => Dockerfile             |  0
 docker-compose.yml                          |  4 ++--
 perfil/manage.py => manage.py               |  0
 perfil/{perfil => }/__init__.py             |  0
 perfil/election/models.py                   |  4 ++--
 perfil/mandate/models.py                    |  4 ++--
 perfil/person/admin.py                      |  2 +-
 perfil/person/models.py                     |  2 +-
 perfil/{perfil => }/settings.py             | 12 ++++++------
 perfil/{perfil => }/urls.py                 |  0
 perfil/{perfil => }/wsgi.py                 |  0
 perfil/requirements.txt => requirements.txt |  0
 12 files changed, 14 insertions(+), 14 deletions(-)
 rename perfil/Dockerfile => Dockerfile (100%)
 rename perfil/manage.py => manage.py (100%)
 rename perfil/{perfil => }/__init__.py (100%)
 rename perfil/{perfil => }/settings.py (96%)
 rename perfil/{perfil => }/urls.py (100%)
 rename perfil/{perfil => }/wsgi.py (100%)
 rename perfil/requirements.txt => requirements.txt (100%)

diff --git a/perfil/Dockerfile b/Dockerfile
similarity index 100%
rename from perfil/Dockerfile
rename to Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
index 37c4fbda..bdb7c67a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
 
   django:
     build:
-      context: perfil
+      context: .
     depends_on:
       - db
     env_file:
@@ -11,7 +11,7 @@ services:
     ports:
       - "8000:8000"
     volumes:
-      - ./perfil:/code
+      - ./perfil:/code/perfil
 
   notebooks:
     build:
diff --git a/perfil/manage.py b/manage.py
similarity index 100%
rename from perfil/manage.py
rename to manage.py
diff --git a/perfil/perfil/__init__.py b/perfil/__init__.py
similarity index 100%
rename from perfil/perfil/__init__.py
rename to perfil/__init__.py
diff --git a/perfil/election/models.py b/perfil/election/models.py
index dd1d419c..5da18554 100644
--- a/perfil/election/models.py
+++ b/perfil/election/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 
-from party.models import Party
-from person.models import Person
+from perfil.party.models import Party
+from perfil.person.models import Person
 from .choices import ELECTION_RESULT, POSITIONS
 
 
diff --git a/perfil/mandate/models.py b/perfil/mandate/models.py
index 9152e92d..998f323a 100644
--- a/perfil/mandate/models.py
+++ b/perfil/mandate/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 
-from party.models import Party
-from person.models import Person
+from perfil.party.models import Party
+from perfil.person.models import Person
 
 
 class Politic(models.Model):
diff --git a/perfil/person/admin.py b/perfil/person/admin.py
index 47329007..e0fd17be 100644
--- a/perfil/person/admin.py
+++ b/perfil/person/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from election.models import Election
+from perfil.election.models import Election
 from .models import Person
 
 
diff --git a/perfil/person/models.py b/perfil/person/models.py
index 5786e066..2cf25d28 100644
--- a/perfil/person/models.py
+++ b/perfil/person/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 
-from utils.infos import STATES
+from perfil.utils.infos import STATES
 
 
 class Person(models.Model):
diff --git a/perfil/perfil/settings.py b/perfil/settings.py
similarity index 96%
rename from perfil/perfil/settings.py
rename to perfil/settings.py
index b116feda..2e24184c 100644
--- a/perfil/perfil/settings.py
+++ b/perfil/settings.py
@@ -40,12 +40,12 @@
     'django.contrib.staticfiles',
 
     # apps
-    'company',
-    'election',
-    'mandate',
-    'party',
-    'person',
-    'utils',
+    'perfil.company',
+    'perfil.election',
+    'perfil.mandate',
+    'perfil.party',
+    'perfil.person',
+    'perfil.utils',
 
     # third-party
     'django_extensions',
diff --git a/perfil/perfil/urls.py b/perfil/urls.py
similarity index 100%
rename from perfil/perfil/urls.py
rename to perfil/urls.py
diff --git a/perfil/perfil/wsgi.py b/perfil/wsgi.py
similarity index 100%
rename from perfil/perfil/wsgi.py
rename to perfil/wsgi.py
diff --git a/perfil/requirements.txt b/requirements.txt
similarity index 100%
rename from perfil/requirements.txt
rename to requirements.txt