Merge branch 'develop' into feature/csv-import

shimatta_kenkyusho/parts/urls.py

@@ -16,4 +16,5 @@ urlpatterns = [
     path('distributors/<slug:uuid>/', parts_views.DistributorDetailView.as_view(), name='parts-distributors-detail'),
     path('manufacturers/', parts_views.ManufacturersViewSet.as_view(), name='parts-manufacturers'),
     path("manufacturers/<slug:uuid>/", parts_views.ManufacturerDetailViewSet.as_view(), name='parts-manufacturers-detail'),
+    path("healthcheck/", parts_views.health_check_view, name='parts-health-check'),
 ]

shimatta_kenkyusho/parts/views.py

@@ -19,8 +19,10 @@ from .component_import import import_components_from_csv
 from django.db.models import Q
 from django.db.models.functions import Lower
 from django.forms import formset_factory
+from django.http import HttpResponse
 import uuid
 
+
 ParameterSearchFormSet = formset_factory(ComponentParameterSearchForm, extra=1)
 
 class QrSearchForm(forms.Form):
@@ -970,4 +972,12 @@ class ManufacturerDetailViewSet(LoginRequiredMixin, BaseTemplateMixin, DetailVie
         elif 'submit-manufacturer-edit' in request.POST:
             return self.edit_manufacturer(request)
         
-        return super().post(request, *args, **kwargs)
+        return super().post(request, *args, **kwargs)
+
+
+def health_check_view(request) -> HttpResponse:
+    """
+    Health checking view. Returns empty http response with HTTP status OK.
+    This will be used to check 
+    """
+    return HttpResponse(status=200)

shimatta_kenkyusho/shimatta_kenkyusho/settings_production.py

@@ -16,9 +16,13 @@ The following environment variables have to be set:
 - DJANGO_MEDIA_URL
 - DJANGO_MEDIA_ROOT
 - DJANGO_POSTGRESQL_SOCKET
+- DJANGO_POSTGRESQL_PORT
 
 The following can be set
+- DJANGO_POSTGRESQL_PW (assumed empty if missing)
+- DJANGO_POSTGRESQL_USER (assmumed empty if mssing)
 - DJANGO_SECURE_HSTS_SECONDS (defaults to 120)
+- DJANGO_FORCE_DEV_MODE
 
 """
 
@@ -46,8 +50,11 @@ SECRET_KEY = get_env_value('DJANGO_SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
+if get_env_value('DJANGO_FORCE_DEV_MODE', default=False) == 'True':
+    DEBUG = True
 
-ALLOWED_HOSTS = ['localhost', get_env_value('DJANGO_ALLOWED_HOST')]
+
+ALLOWED_HOSTS = ['127.0.0.1', 'localhost', get_env_value('DJANGO_ALLOWED_HOST')]
 
 
 # Application definition
@@ -232,4 +239,4 @@ CSRF_COOKIE_SECURE = True
 
 SECURE_SSL_REDIRECT = False
 
-SECURE_HSTS_SECONDS = get_env_value('DJANGO_SECURE_HSTS_SECONDS', default=120)
+SECURE_HSTS_SECONDS = get_env_value('DJANGO_SECURE_HSTS_SECONDS', default=120)