Merge branch 'master' into feature/invite_users

OneSila · Nov 27, 2023 · 3618115 · 3618115
2 parents b325c97 + 9bea722
commit 3618115
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 2 deletions.
diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml
@@ -6,6 +6,25 @@ jobs:
   build:
     runs-on: ubuntu-latest
     name: Test OneSilaHeadless
+    services:
+      postgres:
+        image: postgres:12
+        env:
+          POSTGRES_USER: fake
+          POSTGRES_PASSWORD: fake
+          POSTGRES_DB: fake
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v2
@@ -14,6 +33,14 @@ jobs:
     - name: Install requirements
       run: pip install -r requirements.txt
     - name: Run tests and collect coverage
+      env:
+        POSTGRES_HOST: localhost
+        POSTGRES_USER: fake
+        POSTGRES_PASSWORD: fake
+        POSTGRES_DB: fake
+        POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
+        REDIS_HOST: localhost
+        REDIS_PORT: ${{ job.services.redis.ports[6379] }}
       run: cd OneSila && coverage run --source='.' manage.py test
     - name: Upload coverage reports to Codecov with GitHub Action
       uses: codecov/codecov-action@v3

diff --git a/OneSila/OneSila/settings/__init__.py b/OneSila/OneSila/settings/__init__.py
@@ -1,3 +1,7 @@
 import socket
 from .base import *
-from .local import *
+
+try:
+    from .local import *
+except ModuleNotFoundError:
+    pass
diff --git a/OneSila/OneSila/settings/base.py b/OneSila/OneSila/settings/base.py
@@ -13,7 +13,9 @@
 from pathlib import Path
 from django.utils.translation import gettext_lazy as _
 from operator import itemgetter
+import os
 
+SECRET_KEY = "FAKE-KEY-DONT-KEEP-THIS-YOU-SHOULD-SET-A-NEW-ONE"
 
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -87,6 +89,18 @@
 ASGI_APPLICATION = 'OneSila.asgi.application'
 
 
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': os.getenv('POSTGRES_DB', 'fake'),
+        'USER': os.getenv('POSTGRES_USER', 'fake'),
+        'PASSWORD': os.getenv('POSTGRES_PASSWORD', 'fake'),
+        'HOST': os.getenv('POSTGRES_HOST', 'localhost'),
+        'PORT': '5432',
+    }
+}
+
+
 # Password validation
 # https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
 
@@ -138,6 +152,8 @@
 # Strawberry graphql settings
 #
 
+STRAWBERRY_DJANGO_REGISTER_USER_AUTO_LOGIN = False
+
 STRAWBERRY_DJANGO = {
     "FIELD_DESCRIPTION_FROM_HELP_TEXT": True,
     "TYPE_DESCRIPTION_FROM_MODEL_DOCSTRING": True,
@@ -149,7 +165,7 @@
     "default": {
         "BACKEND": "channels_redis.core.RedisChannelLayer",
         "CONFIG": {
-            "hosts": [("127.0.0.1", 6379)],
+            "hosts": [(os.getenv('REDIS_HOST', "127.0.0.1"), os.getenv('REDIS_PORT', 6379))],
         },
     },
 }
@@ -159,3 +175,16 @@
 #
 
 CORS_ALLOW_CREDENTIALS = True
+
+CORS_ALLOWED_ORIGINS = [
+    '*',
+    # 'http://172.19.250.107:3000',
+]
+
+CORS_ALLOWED_HEADERS = [
+    '*'
+]
+
+CORS_ALLOWED_METHODS = [
+    '*'
+]