veritus · Ragnar-H · Jul 11, 2017 · Jun 19, 2017 · Jun 19, 2017 · Jun 19, 2017
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,12 @@
+.github/
+.vscode/
+env/
+logs/
+.coverage
+.coveragerc
+.gitignore
+.pylintrc
+.travis.yml
+
+#OSX
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,19 @@
+# Start with a python 3.6 image
+FROM python:3.6
+ENV PYTHONUNBUFFERED 1
+
+# Creates src folder in container
+RUN mkdir /code
+
+# Copy everything into the /code directory of the container
+ADD . /code/
+
+# Makes code dir the working directory
+# and we change directory into it
+WORKDIR /code
+
+# Install requirements
+RUN pip install -r requirements.txt
+
+# Run linter
+RUN pylint **/*.py
diff --git a/README.md b/README.md
@@ -81,3 +81,26 @@ After adding a new model or making a change in the model you should
 2. Add cronscript. For Ari on Ubuntu this worked:
 `SHELL=/bin/bash */5 * * * * cd home/path/to/project/directory source env/bin/activate && python manage.py runcrons
 3. Write correct path
+
+# Docker
+The docker image here is NOT suppose to be run alone. As the backend requires a database, there is no use running it alone. See the docker-compose repository for how to run the backend and the whole stack.
+
+## Docker commands
+### Build image
+```
+docker build -t veritus/backend .
+```
+###Login to docker cloud
+```
+docker login
+```
+Input credentials.
+
+###Push image to docker cloud
+```
+docker push <IMAGE-NAME>:</TAG>
+```
+Example:
+```
+docker push veritus/backend:latest
+```
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -0,0 +1,28 @@
+# Docker-compose file for spinning up a database service and building the backend
+# This allows the CI to run our unit tests against the database
+version: '2.1'
+
+services:
+  db:
+    image: postgres:9.6.3
+    environment:
+      - POSTGRES_USER=$POSTGRES_USER
+      - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
+    healthcheck:
+      test: ["CMD-SHELL", "psql -h 'localhost' -U 'postgres' -c '\\l'"]
+      interval: 30s
+      timeout: 30s
+      retries: 3
+
+  sut:
+    build: .
+    command: "bash -c 'python3 src/manage.py migrate && python3 src/manage.py loaddata init_data.json && python3 src/manage.py test'"
+    environment:
+      - POSTGRES_USER=$POSTGRES_USER
+      - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
+      - SECRET_KEY=$SECRET_KEY
+      - DB_HOST=db
+    depends_on:
+      db:
+        condition: service_healthy
+
diff --git a/politicians/migrations/0002_auto_20170709_1708.py b/politicians/migrations/0002_auto_20170709_1708.py
diff --git a/politicians/migrations/0003_auto_20170709_1712.py b/politicians/migrations/0003_auto_20170709_1712.py
diff --git a/promises/migrations/0002_promise_fulfilled.py b/promises/migrations/0002_promise_fulfilled.py
diff --git a/.pylintrc → pylintrc b/.pylintrc → pylintrc
@@ -1,15 +1,9 @@
 [MASTER]
-ignore=apps.py, admin, migrations, bin, lib, man
+ignore=manage.py, apps.py, admin.py, migrations, env
 load-plugins=pylint_django
 
 [MESSAGES CONTROL]
 disable=missing-docstring, broad-except, bare-except, no-self-use, invalid-name, not-callable, not-an-iterable, locally-disabled
 
 [TYPECHECK] 
 ignored-classes=WSGIRequest, Exception, Client
-
-
-[pre-commit-hook]
-command=custom_pylint
-params=--rcfile=/path/to/another/pylint.rc
-limit=8.0
diff --git a/case_gather/__init__.py → src/case_gather/__init__.py b/case_gather/__init__.py → src/case_gather/__init__.py
diff --git a/case_gather/admin.py → src/case_gather/admin.py b/case_gather/admin.py → src/case_gather/admin.py
diff --git a/case_gather/apps.py → src/case_gather/apps.py b/case_gather/apps.py → src/case_gather/apps.py
diff --git a/case_gather/cron_jobs.py → src/case_gather/cron_jobs.py b/case_gather/cron_jobs.py → src/case_gather/cron_jobs.py
diff --git a/case_gather/migrations/0001_initial.py → src/case_gather/migrations/0001_initial.py b/case_gather/migrations/0001_initial.py → src/case_gather/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-06-06 19:17
+# Generated by Django 1.10.3 on 2017-07-11 18:29
 from __future__ import unicode_literals
 
 from django.db import migrations, models

diff --git a/case_gather/migrations/__init__.py → src/case_gather/migrations/__init__.py b/case_gather/migrations/__init__.py → src/case_gather/migrations/__init__.py
diff --git a/case_gather/models.py → src/case_gather/models.py b/case_gather/models.py → src/case_gather/models.py
diff --git a/case_gather/serializers.py → src/case_gather/serializers.py b/case_gather/serializers.py → src/case_gather/serializers.py
diff --git a/case_gather/services.py → src/case_gather/services.py b/case_gather/services.py → src/case_gather/services.py
diff --git a/case_gather/test_data/case3details.txt → src/case_gather/test_data/case3details.txt b/case_gather/test_data/case3details.txt → src/case_gather/test_data/case3details.txt
diff --git a/case_gather/test_data/casedetails.txt → src/case_gather/test_data/casedetails.txt b/case_gather/test_data/casedetails.txt → src/case_gather/test_data/casedetails.txt
diff --git a/case_gather/test_data/caselist.txt → src/case_gather/test_data/caselist.txt b/case_gather/test_data/caselist.txt → src/case_gather/test_data/caselist.txt
diff --git a/case_gather/tests.py → src/case_gather/tests.py b/case_gather/tests.py → src/case_gather/tests.py
diff --git a/case_gather/views.py → src/case_gather/views.py b/case_gather/views.py → src/case_gather/views.py
diff --git a/case_gather/xml_helper.py → src/case_gather/xml_helper.py b/case_gather/xml_helper.py → src/case_gather/xml_helper.py
diff --git a/case_gather/xml_parser.py → src/case_gather/xml_parser.py b/case_gather/xml_parser.py → src/case_gather/xml_parser.py
diff --git a/district/__init__.py → src/district/__init__.py b/district/__init__.py → src/district/__init__.py
diff --git a/district/admin.py → src/district/admin.py b/district/admin.py → src/district/admin.py
diff --git a/district/apps.py → src/district/apps.py b/district/apps.py → src/district/apps.py
diff --git a/district/migrations/0001_initial.py → src/district/migrations/0001_initial.py b/district/migrations/0001_initial.py → src/district/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-06-06 19:17
+# Generated by Django 1.10.3 on 2017-07-11 18:29
 from __future__ import unicode_literals
 
 from django.db import migrations, models

diff --git a/district/migrations/__init__.py → src/district/migrations/__init__.py b/district/migrations/__init__.py → src/district/migrations/__init__.py
diff --git a/district/models.py → src/district/models.py b/district/models.py → src/district/models.py
diff --git a/district/serializers.py → src/district/serializers.py b/district/serializers.py → src/district/serializers.py
diff --git a/district/tests.py → src/district/tests.py b/district/tests.py → src/district/tests.py
diff --git a/district/views.py → src/district/views.py b/district/views.py → src/district/views.py
diff --git a/main/__init__.py → src/main/__init__.py b/main/__init__.py → src/main/__init__.py
diff --git a/main/admin.py → src/main/admin.py b/main/admin.py → src/main/admin.py
diff --git a/main/apps.py → src/main/apps.py b/main/apps.py → src/main/apps.py
diff --git a/main/migrations/__init__.py → src/main/migrations/__init__.py b/main/migrations/__init__.py → src/main/migrations/__init__.py
diff --git a/main/models.py → src/main/models.py b/main/models.py → src/main/models.py
diff --git a/manage.py → src/manage.py b/manage.py → src/manage.py
@@ -13,6 +13,7 @@
         # issue is really that Django is missing to avoid masking other
         # exceptions on Python 2.
         try:
+            # pylint: disable=unused-import
             import django
         except ImportError:
             raise ImportError(

diff --git a/parliament/__init__.py → src/parliament/__init__.py b/parliament/__init__.py → src/parliament/__init__.py
diff --git a/parliament/admin.py → src/parliament/admin.py b/parliament/admin.py → src/parliament/admin.py
diff --git a/parliament/apps.py → src/parliament/apps.py b/parliament/apps.py → src/parliament/apps.py
diff --git a/parliament/migrations/0001_initial.py → src/parliament/migrations/0001_initial.py b/parliament/migrations/0001_initial.py → src/parliament/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-06-06 19:17
+# Generated by Django 1.10.3 on 2017-07-11 18:29
 from __future__ import unicode_literals
 
 from django.db import migrations, models

diff --git a/parliament/migrations/__init__.py → src/parliament/migrations/__init__.py b/parliament/migrations/__init__.py → src/parliament/migrations/__init__.py
diff --git a/parliament/models.py → src/parliament/models.py b/parliament/models.py → src/parliament/models.py
diff --git a/parliament/serializers.py → src/parliament/serializers.py b/parliament/serializers.py → src/parliament/serializers.py
diff --git a/parliament/tests.py → src/parliament/tests.py b/parliament/tests.py → src/parliament/tests.py
diff --git a/parliament/views.py → src/parliament/views.py b/parliament/views.py → src/parliament/views.py
diff --git a/party/__init__.py → src/party/__init__.py b/party/__init__.py → src/party/__init__.py
diff --git a/party/admin.py → src/party/admin.py b/party/admin.py → src/party/admin.py
diff --git a/party/apps.py → src/party/apps.py b/party/apps.py → src/party/apps.py
diff --git a/party/migrations/0001_initial.py → src/party/migrations/0001_initial.py b/party/migrations/0001_initial.py → src/party/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-06-06 19:17
+# Generated by Django 1.10.3 on 2017-07-11 18:29
 from __future__ import unicode_literals
 
 from django.db import migrations, models

diff --git a/party/migrations/__init__.py → src/party/migrations/__init__.py b/party/migrations/__init__.py → src/party/migrations/__init__.py
diff --git a/party/models.py → src/party/models.py b/party/models.py → src/party/models.py
diff --git a/party/serializers.py → src/party/serializers.py b/party/serializers.py → src/party/serializers.py
diff --git a/party/tests.py → src/party/tests.py b/party/tests.py → src/party/tests.py
diff --git a/party/views.py → src/party/views.py b/party/views.py → src/party/views.py
diff --git a/politech_backend/__init__.py → src/politech_backend/__init__.py b/politech_backend/__init__.py → src/politech_backend/__init__.py
diff --git a/politech_backend/settings.py → src/politech_backend/settings.py b/politech_backend/settings.py → src/politech_backend/settings.py
@@ -20,12 +20,12 @@
 # See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 't8&(jop7)*h!v5eug$iufd8l1(l2dpfjxj=(+2xt5knv+7v-!='
+SECRET_KEY = os.environ["SECRET_KEY"]
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ["*"]
 
 
 # Application definition
@@ -121,12 +121,15 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'politech',
-        'USER': os.environ["DB_USER"],
-        'PASSWORD': os.environ["DB_PASS"],
-        'HOST': '127.0.0.1',
+        'NAME': 'postgres',
+        'USER': os.environ["POSTGRES_USER"],
+        'PASSWORD': os.environ["POSTGRES_PASSWORD"],
+        'HOST': os.environ["DB_HOST"], #f.x. 'db' OR '127.0.0.1',
         'PORT': '5432',
-        'ATOMIC_REQUESTS': True
+        'ATOMIC_REQUESTS': True,
+        'OPTIONS': {
+            'client_encoding': 'UTF8',
+        }
     }
 }
 

diff --git a/politech_backend/urls.py → src/politech_backend/urls.py b/politech_backend/urls.py → src/politech_backend/urls.py
diff --git a/politech_backend/wsgi.py → src/politech_backend/wsgi.py b/politech_backend/wsgi.py → src/politech_backend/wsgi.py
diff --git a/politicians/__init__.py → src/politicians/__init__.py b/politicians/__init__.py → src/politicians/__init__.py
diff --git a/politicians/admin.py → src/politicians/admin.py b/politicians/admin.py → src/politicians/admin.py
diff --git a/politicians/apps.py → src/politicians/apps.py b/politicians/apps.py → src/politicians/apps.py
diff --git a/politicians/migrations/0001_initial.py → src/politicians/migrations/0001_initial.py b/politicians/migrations/0001_initial.py → src/politicians/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-06-06 19:17
+# Generated by Django 1.10.3 on 2017-07-11 18:29
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -11,8 +11,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('party', '0001_initial'),
         ('district', '0001_initial'),
+        ('party', '0001_initial'),
     ]
 
     operations = [
@@ -25,7 +25,7 @@ class Migration(migrations.Migration):
                 ('modified', models.DateTimeField(auto_now=True)),
                 ('initials', models.TextField()),
                 ('districtNumber', models.IntegerField()),
-                ('district', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='district.District')),
+                ('district', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='politicians', to='district.District')),
                 ('party', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='party.Party')),
             ],
             options={

diff --git a/politicians/migrations/__init__.py → src/politicians/migrations/__init__.py b/politicians/migrations/__init__.py → src/politicians/migrations/__init__.py
diff --git a/politicians/models.py → src/politicians/models.py b/politicians/models.py → src/politicians/models.py
diff --git a/politicians/serializers.py → src/politicians/serializers.py b/politicians/serializers.py → src/politicians/serializers.py
diff --git a/politicians/tests.py → src/politicians/tests.py b/politicians/tests.py → src/politicians/tests.py
diff --git a/politicians/views.py → src/politicians/views.py b/politicians/views.py → src/politicians/views.py
diff --git a/promises/__init__.py → src/promises/__init__.py b/promises/__init__.py → src/promises/__init__.py
diff --git a/promises/admin.py → src/promises/admin.py b/promises/admin.py → src/promises/admin.py
diff --git a/promises/apps.py → src/promises/apps.py b/promises/apps.py → src/promises/apps.py
diff --git a/promises/cronjobs.py → src/promises/cronjobs.py b/promises/cronjobs.py → src/promises/cronjobs.py
diff --git a/promises/migrations/0001_initial.py → src/promises/migrations/0001_initial.py b/promises/migrations/0001_initial.py → src/promises/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-06-06 19:17
+# Generated by Django 1.10.3 on 2017-07-11 18:29
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -12,9 +12,9 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('parliament', '0001_initial'),
-        ('party', '0001_initial'),
-        ('case_gather', '0001_initial'),
         ('politicians', '0001_initial'),
+        ('case_gather', '0001_initial'),
+        ('party', '0001_initial'),
     ]
 
     operations = [
@@ -25,6 +25,7 @@ class Migration(migrations.Migration):
                 ('name', models.TextField()),
                 ('created', models.DateTimeField(auto_now_add=True)),
                 ('modified', models.DateTimeField(auto_now=True)),
+                ('fulfilled', models.BooleanField(default=False)),
                 ('small_description', models.TextField()),
                 ('long_description', models.TextField()),
                 ('parliament', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='parliament.Parliament')),

diff --git a/promises/migrations/__init__.py → src/promises/migrations/__init__.py b/promises/migrations/__init__.py → src/promises/migrations/__init__.py
diff --git a/promises/models.py → src/promises/models.py b/promises/models.py → src/promises/models.py
diff --git a/promises/serializers.py → src/promises/serializers.py b/promises/serializers.py → src/promises/serializers.py
diff --git a/promises/services.py → src/promises/services.py b/promises/services.py → src/promises/services.py
diff --git a/promises/tests.py → src/promises/tests.py b/promises/tests.py → src/promises/tests.py
diff --git a/promises/views.py → src/promises/views.py b/promises/views.py → src/promises/views.py
diff --git a/subjects/__init__.py → src/subjects/__init__.py b/subjects/__init__.py → src/subjects/__init__.py
diff --git a/subjects/admin.py → src/subjects/admin.py b/subjects/admin.py → src/subjects/admin.py
diff --git a/subjects/apps.py → src/subjects/apps.py b/subjects/apps.py → src/subjects/apps.py
diff --git a/subjects/migrations/0001_initial.py → src/subjects/migrations/0001_initial.py b/subjects/migrations/0001_initial.py → src/subjects/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-06-06 19:17
+# Generated by Django 1.10.3 on 2017-07-11 18:29
 from __future__ import unicode_literals
 
 from django.db import migrations, models

diff --git a/subjects/migrations/__init__.py → src/subjects/migrations/__init__.py b/subjects/migrations/__init__.py → src/subjects/migrations/__init__.py
diff --git a/subjects/models.py → src/subjects/models.py b/subjects/models.py → src/subjects/models.py
diff --git a/subjects/serializers.py → src/subjects/serializers.py b/subjects/serializers.py → src/subjects/serializers.py
diff --git a/subjects/tests.py → src/subjects/tests.py b/subjects/tests.py → src/subjects/tests.py
diff --git a/subjects/views.py → src/subjects/views.py b/subjects/views.py → src/subjects/views.py