Merge pull request #770 from MetaCell/feature/ch-59

CH-59 Update/Refactor the django application template

Author: filippomc

application-templates/django-app/api/templates/main.jinja2

@@ -14,13 +14,13 @@ from fastapi.staticfiles import StaticFiles
 
 {{imports | replace(".","openapi.")}}
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "__APP_NAME__.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_baseapp.settings")
 apps.populate(settings.INSTALLED_APPS)
 
 # migrate the Django models
 os.system("python manage.py migrate")
 
-from api.controllers import *
+from __APP_NAME__.controllers import *
 
 app = FastAPI(
     {% if info %}
@@ -66,10 +66,12 @@ async def add_process_time_header(request: Request, call_next):
 
 if os.environ.get('KUBERNETES_SERVICE_HOST', None):
     # init the auth service when running in/for k8s
-    from cloudharness_django.services import init_services, get_auth_service
-    init_services()
+    from cloudharness_django.services import init_services_in_background, get_auth_service
+    init_services_in_background()
+
     # start the kafka event listener when running in/for k8s
-    import cloudharness_django.services.events
+    from cloudharness_django.services.events import init_listener_in_background
+    init_listener_in_background()
 
 async def has_access():
     """

…emplates/django-app/backend/api/admin.py …django-app/backend/__APP_NAME__/admin.pyapplication-templates/django-app/backend/api/admin.py renamed to application-templates/django-app/backend/__APP_NAME__/admin.py application-templates/django-app/backend/api/admin.py renamed to application-templates/django-app/backend/__APP_NAME__/admin.py

@@ -3,4 +3,4 @@
 
 class ApiConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'api'
+    name = '__APP_NAME__'

…templates/django-app/backend/api/apps.py …/django-app/backend/__APP_NAME__/apps.pyapplication-templates/django-app/backend/api/apps.py renamed to application-templates/django-app/backend/__APP_NAME__/apps.py application-templates/django-app/backend/api/apps.py renamed to application-templates/django-app/backend/__APP_NAME__/apps.py

@@ -0,0 +1 @@
+import __APP_NAME__.controllers.test as test_controller

application-templates/django-app/backend/__APP_NAME__/controllers/__init__.py

@@ -1,24 +1,10 @@
-import os
-
 from django.db import migrations
 
 
-def create_kc_client_and_roles(apps, schema_editor):
-    if os.environ.get("KUBERNETES_SERVICE_HOST", None):
-        # running in K8S so create the KC client and roles
-        from cloudharness_django.services import get_auth_service, get_user_service, init_services
-
-        init_services()
-        get_auth_service().create_client()
-        get_user_service().sync_kc_users_groups()
-
-
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("cloudharness_django", "0001_initial"),
+        ("django_baseapp", "0001_initial"),
     ]
 
-    operations = [
-        migrations.RunPython(create_kc_client_and_roles),
-    ]
+    operations = []

…ango-app/backend/api/controllers/test.py …backend/__APP_NAME__/controllers/test.pyapplication-templates/django-app/backend/api/controllers/test.py renamed to application-templates/django-app/backend/__APP_NAME__/controllers/test.py application-templates/django-app/backend/api/controllers/test.py renamed to application-templates/django-app/backend/__APP_NAME__/controllers/test.py

@@ -1,24 +1,3 @@
-import mimetypes
-from pathlib import Path
+from django.shortcuts import render
 
-from django.conf import settings
-from django.http import FileResponse, HttpResponseRedirect
-from django.urls import reverse
-from django.utils._os import safe_join
-
-
-def view_404(request, exception=None):
-    return HttpResponseRedirect(reverse("index"))
-
-
-def index(request, path=""):
-    if path == "":
-        path = "index.html"
-    fullpath = Path(safe_join(settings.STATIC_ROOT, "www", path))
-    content_type, encoding = mimetypes.guess_type(str(fullpath))
-    content_type = content_type or "application/octet-stream"
-    try:
-        fullpath.open("rb")
-    except FileNotFoundError:
-        return index(request, "")  # index.html
-    return FileResponse(fullpath.open("rb"), content_type=content_type)
+# Create your views here.