Merge pull request #22 from nickheyer/INIT_TEST_IMPL

TEST AND WORKFLOW IMPL

.dockerignore

@@ -3,4 +3,5 @@
 __pycache__/
 deploy/
 data/db.sqlite3
-data/django_key.txt
+data/django_key.txt
+.env

.github/workflows/docker-deploy.yml

@@ -0,0 +1,49 @@
+name: Docker Deploy
+
+on:
+  workflow_run:
+    workflows: ["Run Tests"]
+    branches: [main]
+    types:
+      - completed
+  workflow_dispatch:
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    if: >
+      github.event.workflow_run.conclusion == 'success' ||
+      github.event_name == 'workflow_dispatch'
+
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v2
+
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Build and push Docker image for x86
+      run: |
+        echo "Building ${app}-image for x86"
+        docker build -t "${docker_user}/${app}" .
+        echo "Pushing x86 ${app}-image to dockerhub"
+        docker push "${docker_user}/${app}"
+      env:
+        app: discoflix
+        docker_user: nickheyer
+
+    - name: Build and push Docker image for ARM64
+      run: |
+        echo "Building ${app}-image for ARM64"
+        export DOCKER_CLI_EXPERIMENTAL=enabled
+        docker buildx build --platform=linux/arm64 -t "${docker_user}/${app}_rpi" . --push
+      env:
+        app: discoflix
+        docker_user: nickheyer

.github/workflows/feed.yml

@@ -1,21 +1,13 @@
 
 name: Update Feed ~ Heyer.app
 
-# Controls when the workflow will run
-on:
-  # Triggers the workflow on push or pull request events but only for the "main" branch
-  push:
-    branches: [ "main" ]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
+on: push
 
 jobs:
 
   send-request:
     runs-on: ubuntu-latest
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
 
       - name: Send

.github/workflows/test.yml

@@ -0,0 +1,32 @@
+name: Run Tests
+
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.11'
+
+    - name: Cache Python dependencies
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+
+    - name: Run pytest
+      run: pytest

.gitignore

@@ -4,3 +4,4 @@ __pycache__/
 deploy/
 data/db.sqlite3
 data/django_key.txt
+.env

DiscoFlix/settings.py

@@ -91,6 +91,9 @@ def get_or_create_secret_key():
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
         "NAME": BASE_DIR / "data/db.sqlite3",
+        "TEST": {
+            "NAME": BASE_DIR / "data/test_db.sqlite3"
+        }
     }
 }
 

DiscoFlixBot/commands/echo.py

@@ -5,7 +5,7 @@ class EchoCommand(Command):
     def __init__(self) -> None:
         super().__init__()
         self.name = "echo"
-        self.permissions = ["user", "developer"]
+        self.permissions = ["developer"]
         self.description = "Confirm bot can respond to messages"
         self.aliases = ["echo"]
         self.requires_input = True

DiscoFlixBot/commands/error.py

@@ -5,7 +5,7 @@ class ErrorCommand(Command):
     def __init__(self) -> None:
         super().__init__()
         self.name = "error"
-        self.permissions = ["user", "developer", "owner"]
+        self.permissions = ["developer", "owner"]
         self.description = "Confirm bot is handling errors as intended"
         self.aliases = ["error"]
 

DiscoFlixBot/commands/log.py

@@ -5,7 +5,7 @@ class LogCommand(Command):
     def __init__(self) -> None:
         super().__init__()
         self.name = "log"
-        self.permissions = ["user", "developer", "owner"]
+        self.permissions = ["developer", "owner"]
         self.description = "Confirm bot is logging information to console/server as intended"
         self.aliases = ["log"]
         self.requires_input = True

DiscoFlixBot/commands/test.py

@@ -5,7 +5,7 @@ class TestCommand(Command):
     def __init__(self) -> None:
         super().__init__()
         self.name = "test"
-        self.permissions = ["owner", "admin", "user"]
+        self.permissions = ["owner", "admin"]
         self.description = "Confirm bot is on and listening"
         self.aliases = ["test"]
 

DiscoFlixBot/controller.py

@@ -1,6 +1,5 @@
-from DiscoFlixClient.utils import get_config, get_config_sync, get_state_sync
+from DiscoFlixClient.utils import get_config
 from DiscoFlixBot.bot import DiscordBot
-import asyncio
 
 
 async def main():