basic tests should be working. Jenkins p1

11 files changed, 42 insertions, 70 deletions

diff --git a/carer/carer/__init__.py b/carer/app/__init__.py
index e69de29..e69de29 100644
--- a/carer/carer/__init__.py
+++ b/carer/app/__init__.py
diff --git a/carer/app/manage.py b/carer/app/manage.py
new file mode 100644
index 0000000..9ae482e
--- /dev/null
+++ b/carer/app/manage.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "carer.app.settings")
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/carer/app/settings.py b/carer/app/settings.py
new file mode 100644
index 0000000..55dd93b
--- /dev/null
+++ b/carer/app/settings.py
@@ -0,0 +1,24 @@
+import os
+
+INSTALLED_APPS = [
+    "django.contrib.postgres",
+    "django.contrib.contenttypes",
+    "carer.mtwerk",
+]
+
+DATABASES = {
+    "default": {
+        "ENGINE": "django.db.backends.postgresql",
+        "NAME": os.environ.get("DB_NAME", "thl-test"),
+        "USER": os.environ.get("DB_USER", "postgres"),
+        "PASSWORD": os.environ.get("DB_PASSWORD", "password"),
+        "HOST": os.environ.get("DB_HOST", "127.0.0.1"),
+        "PORT": "5432",
+    }
+}
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+LANGUAGE_CODE = "en-us"
+TIME_ZONE = "UTC"
+USE_I18N = True
+USE_L10N = True
+USE_TZ = True
diff --git a/carer/apps.py b/carer/apps.py
new file mode 100644
index 0000000..c96687b
--- /dev/null
+++ b/carer/apps.py
@@ -0,0 +1,9 @@
+from django.apps import AppConfig
+
+
+class MTwerkSchemaConfig(AppConfig):
+    name = "carer.mtwerk"
+    label = "mtwerk"
+
+    def ready(self):
+        from .mtwerk import models  # pycharm: keep
diff --git a/carer/carer/settings/base.py b/carer/carer/settings/base.py
deleted file mode 100644
index c83e0fe..0000000
--- a/carer/carer/settings/base.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from pathlib import Path
-import os
-
-# Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
-
-SECRET_KEY = os.environ.get("CARER_SECRET_KEY")
-
-INSTALLED_APPS = [
-    "carer.mtwerk",
-]
-
-LANGUAGE_CODE = "en-us"
-TIME_ZONE = "UTC"
-USE_I18N = True
-USE_TZ = True
-
-DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
diff --git a/carer/carer/settings/unittest.py b/carer/carer/settings/unittest.py
deleted file mode 100644
index a147794..0000000
--- a/carer/carer/settings/unittest.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import os
-
-# noinspection PyUnresolvedReferences
-from .base import *
-
-DEBUG = True
-ALLOWED_HOSTS = ["*"]
-
-DEFAULT_HTTP_PROTOCOL = "https"
-CSRF_COOKIE_HTTPONLY = True  # Get from page, never cookie
-
-DB_NAME = os.environ.get("DB_NAME")
-DB_USER = os.environ.get("DB_USER")
-DB_PASSWORD = os.environ.get("DB_PASSWORD")
-DB_POSTGRESQL_HOST = os.environ.get("DB_POSTGRESQL_HOST")
-
-DATABASES = dict(
-    default={
-        "ENGINE": "django.db.backends.postgresql",
-        "NAME": DB_NAME,
-        "USER": DB_USER,
-        "PASSWORD": DB_PASSWORD,
-        "HOST": DB_POSTGRESQL_HOST,
-        "PORT": "5432",
-        "ENCODING": "utf8mb4",
-        "COLLATION": "utf8mb4_unicode_520_ci",
-    }
-)
-
-print(f"Using test database: {DB_NAME} on {DATABASES['default']['HOST']}")
diff --git a/carer/manage.py b/carer/manage.py
deleted file mode 100644
index 091b39b..0000000
--- a/carer/manage.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-"""Django's command-line utility for administrative tasks."""
-import os
-import sys
-
-
-def main():
-    """Run administrative tasks."""
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "carer.settings")
-    try:
-        from django.core.management import execute_from_command_line
-    except ImportError as exc:
-        raise ImportError(
-            "Couldn't import Django. Are you sure it's installed and "
-            "available on your PYTHONPATH environment variable? Did you "
-            "forget to activate a virtual environment?"
-        ) from exc
-    execute_from_command_line(sys.argv)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/carer/carer/mtwerk/__init__.py b/carer/mtwerk/__init__.py
index e69de29..e69de29 100644
--- a/carer/carer/mtwerk/__init__.py
+++ b/carer/mtwerk/__init__.py
diff --git a/carer/carer/mtwerk/migrations/0001_initial.py b/carer/mtwerk/migrations/0001_initial.py
index d5c856a..d5c856a 100644
--- a/carer/carer/mtwerk/migrations/0001_initial.py
+++ b/carer/mtwerk/migrations/0001_initial.py
diff --git a/carer/carer/mtwerk/migrations/__init__.py b/carer/mtwerk/migrations/__init__.py
index e69de29..e69de29 100644
--- a/carer/carer/mtwerk/migrations/__init__.py
+++ b/carer/mtwerk/migrations/__init__.py
diff --git a/carer/carer/mtwerk/models.py b/carer/mtwerk/models.py
index 5cb026d..5cb026d 100644
--- a/carer/carer/mtwerk/models.py
+++ b/carer/mtwerk/models.py