Chore/ci cd second

.github/workflows/django.yml

@@ -0,0 +1,54 @@
+name: AHC CI|CD
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    env:
+      POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
+      POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
+      POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+      CELERY_BROKER_URL: ${{ secrets.CELERY_BROKER_URL }}
+      FLOWER_PORT: ${{ secrets.FLOWER_PORT }}
+      FLOWER_BASIC_AUTH: ${{ secrets.FLOWER_BASIC_AUTH }}
+      DB_NAME: ${{ secrets.DB_NAME }}
+      DB_USER: ${{ secrets.DB_USER }}
+      DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+      DB_HOST: ${{ secrets.DB_HOST }}
+      DB_PORT: ${{ secrets.DB_PORT }}
+      COUCHDB_USER: ${{ secrets.COUCHDB_USER }}
+      COUCHDB_PASSWORD: ${{ secrets.COUCHDB_PASSWORD }}
+      COUCHDB_PORT: ${{ secrets.COUCHDB_PORT }}
+      COUCH_CONNECTOR: ${{ secrets.COUCH_CONNECTOR }}
+      CELERY_BACKEND: ${{ secrets.CELERY_BACKEND }}
+      EMAIL_BACKEND: ${{ secrets.EMAIL_BACKEND }}
+      EMAIL_HOST: ${{ secrets.EMAIL_HOST }}
+      EMAIL_PORT: ${{ secrets.EMAIL_PORT }}
+      EMAIL_USE_TLS: ${{ secrets.EMAIL_USE_TLS }}
+      EMAIL_HOST_USER: ${{ secrets.EMAIL_HOST_USER }}
+      EMAIL_HOST_PASSWORD: ${{ secrets.EMAIL_HOST_PASSWORD }}
+      DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
+    strategy:
+      max-parallel: 4
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+
+      - name: Prepare environment and run tests
+        run: |
+          cd ./AHC_app
+          pip install pipenv
+          pipenv install --dev
+          pipenv graph
+          pipenv run python manage.py test

AHC_app/.env.template.txt

@@ -0,0 +1,39 @@
+# PostgresDB for docker-compose.yml - dev
+POSTGRES_DB=
+POSTGRES_USER=
+POSTGRES_PASSWORD=
+
+# Celery for docker-compose.yml - dev
+CELERY_BROKER_URL=
+FLOWER_PORT=
+FLOWER_BASIC_AUTH=
+
+# PostgresDB for settings.py - dev
+DB_NAME=
+DB_USER=
+DB_PASSWORD=
+DB_HOST=
+DB_PORT=
+
+# CouchDB for docker-compose - dev
+COUCHDB_USER=
+COUCHDB_PASSWORD=
+COUCHDB_PORT=
+
+# CouchDB for settings.py - dev
+COUCH_CONNECTOR=Server("")
+
+# Celery for settings.py - dev
+CELERY_BROKER_URL=
+CELERY_BACKEND=
+
+# SMTP for settings.py - dev
+EMAIL_BACKEND = ""
+EMAIL_HOST = ""
+EMAIL_PORT = ""
+EMAIL_USE_TLS =
+EMAIL_HOST_USER = ""
+EMAIL_HOST_PASSWORD = ""
+
+# Discord bot token
+DISCORD_TOKEN = ""

AHC_app/.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
         types: [python]
         require_serial: true
         args: ['--in-place', '--remove-all-unused-imports']
-        exclude: '^requirements\.txt$'
+        exclude: '^requirements\.txt$|^setup_couchdb\.sh$'
 -   repo: https://github.com/PyCQA/isort
     rev: 5.12.0
     hooks:

AHC_app/AHC_app/celery_notifications/config.py

@@ -4,6 +4,7 @@
 from celery.utils.log import get_task_logger
 from django.conf import settings
 
+from AHC_app.celery_notifications.utils.discord_utils import send_via_discord
 from AHC_app.celery_notifications.utils.sending_utils import (
     send_via_email,  # , send_via_sms, send_via_discord
 )
@@ -20,7 +21,7 @@
 
 
 @celery_obj.task()
-def send_email_notifications(**kwargs):
+def send_email_notifications(*args, **kwargs):
     recipient_list = kwargs.get("email")
     subject = kwargs.get("subject")
     message = kwargs.get("message")
@@ -42,6 +43,7 @@ def send_sms_notifications(**kwargs):
 
 
 @shared_task(bind=True)
-def send_discord_notifications(**kwargs):
-    # send_via_discord(**kwargs)
-    pass
+def send_discord_notifications(self, *args, **kwargs):
+    user_id = kwargs.get("user_id")
+    user_message = kwargs.get("user_message")
+    send_via_discord(user_id, user_message)

AHC_app/AHC_app/celery_notifications/cron.py

@@ -9,10 +9,12 @@
 
 from django.db.models import Q, QuerySet
 from django.utils import timezone
-from django_cron import CronJobBase, Schedule
 from medical_notes.models.type_feeding_notes import EmailNotification
 
-from AHC_app.celery_notifications.config import send_email_notifications
+from AHC_app.celery_notifications.config import (
+    send_discord_notifications,
+    send_email_notifications,
+)
 from AHC_app.celery_notifications.utils.example_task import send_mail_fnc
 
 logger = logging.getLogger("crons_logger")
@@ -138,21 +140,37 @@ def send_sms():
 
 @log_exceptions_and_notifications
 def send_discord_notes():
-    pass
-
-
-class SynchNotificationsCron(CronJobBase):
-    RUN_EVERY_MINS = 60
-
-    schedule = Schedule(run_every_mins=RUN_EVERY_MINS)
-    code = "AHC_app.SynchNotificationsCronJob"
-
-    run_at_times = ["55"]
-
-    @staticmethod
-    def cron_send_emails():
-        from icecream import ic
-
-        ic()
-
-        send_emails()
+    # notifications_to_send = get_notifications_to_send()
+    #
+    # if not notifications_to_send:
+    #     return None
+
+    user_id: int = 422570242275934219
+    # user_id: int = 530756049913905172
+    user_message = "Test message"
+    delay: int = 0
+
+    send_discord_notifications.apply_async(kwargs={"user_id": user_id, "user_message": user_message}, countdown=delay)
+
+
+# class SynchNotificationsCron(CronJobBase):
+#     RUN_EVERY_MINS = 60
+#
+#     schedule = Schedule(run_every_mins=RUN_EVERY_MINS)
+#     code = "AHC_app.SynchNotificationsCronJob"
+#
+#     # run_at_times = ["55"]
+#
+#     @staticmethod
+#     def cron_send_emails():
+#         from icecream import ic
+#         ic()
+#
+#         send_emails()
+#
+#     @staticmethod
+#     def cron_send_discord():
+#         from icecream import ic
+#         ic()
+#
+#         send_discord_notes()

AHC_app/AHC_app/celery_notifications/utils/discord_utils.py

@@ -0,0 +1,33 @@
+import asyncio
+
+from discord import Client, Intents
+from discord.ext import commands
+from django.conf import settings
+
+TOKEN = settings.DISCORD_TOKEN
+
+
+def send_via_discord(user_id: int, user_message: str) -> None:
+    def init_bot() -> Client:
+        intents = Intents.default()
+        intents.members = True
+        intents.message_content = True
+
+        # discord_client = Client(intents=intents)
+        discord_client = commands.Bot(command_prefix="!", intents=intents)
+
+        return discord_client
+
+    client = init_bot()
+
+    @client.event
+    async def on_ready():
+        for guild in client.guilds:
+            user = guild.get_member(user_id)
+            if user:
+                await user.send(user_message)
+
+        await asyncio.sleep(2)
+        await client.close()
+
+    client.run(TOKEN)

AHC_app/AHC_app/settings.py

@@ -10,12 +10,13 @@
 https://docs.djangoproject.com/en/4.2/ref/settings/
 """
 import os
+import sys
 
 from pathlib import Path
 
-from decouple import config
+import pycouchdb
 
-# from ibmcloudant.cloudant_v1 import CloudantV1
+from decouple import config
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -95,36 +96,39 @@
 # Database
 # https://docs.djangoproject.com/en/4.2/ref/settings/#databases
 
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.postgresql",
-        "NAME": config("DB_NAME"),
-        "USER": config("DB_USER"),
-        "PASSWORD": config("DB_PASSWORD"),
-        "HOST": config("DB_HOST"),
-        "PORT": config("DB_PORT", default="5432"),
+if "test" in sys.argv:
+    DATABASES = {
+        "default": {
+            "ENGINE": "django.db.backends.sqlite3",
+            "NAME": "mydatabase",
+        }
+    }
+else:
+    DATABASES = {
+        "default": {
+            "ENGINE": "django.db.backends.postgresql",
+            "NAME": config("DB_NAME"),
+            "USER": config("DB_USER"),
+            "PASSWORD": config("DB_PASSWORD"),
+            "HOST": config("DB_HOST"),
+            "PORT": config("DB_PORT", default="5432"),
+        }
     }
-}
 
 # COUCH_CONNECTOR = (config("COUCH_CONNECTOR"),)
 
-COUCHDB_USER = config("COUCHDB_USER")
-COUCHDB_PASSWORD = config("COUCHDB_PASSWORD")
-# COUCHDB_URL = f'http://{COUCHDB_USER}:{COUCHDB_PASSWORD}@localhost:5984'
-# COUCHDB_DATABASE_NAME = 'your_database_name'  # Dostosuj nazwę bazy danych
-#
-# client = Cloudant(COUCHDB_USER, COUCHDB_PASSWORD, url=COUCHDB_URL)
-# client.connect()
-#
-# COUCHDB_ATTACHMENTS_DATABASES = {
-#     'default': {
-#         'ENGINE': 'django_couchdb.backends.Cloudant',
-#         'NAME': COUCHDB_DATABASE_NAME,
-#         'USER': COUCHDB_USER,
-#         'PASSWORD': COUCHDB_PASSWORD,
-#         'URL': COUCHDB_URL,
-#     },
-# }
+if "test" not in sys.argv:
+
+    COUCHDB_USER = config("COUCHDB_USER")
+    COUCHDB_PASSWORD = config("COUCHDB_PASSWORD")
+    COUCHDB_PORT = config("COUCHDB_PORT")
+
+    COUCH_SERVER = pycouchdb.Server(
+        f"http://{COUCHDB_USER}:{COUCHDB_PASSWORD}@appendixes-db:{COUCHDB_PORT}/", authmethod="basic"
+    )
+    COUCH_DB = COUCH_SERVER.database("appendixes")
+
+    COUCH_DB_LIMIT_PER_NOTE = 5
 
 
 # Password validation
@@ -155,9 +159,7 @@
 LANGUAGE_CODE = "en-us"
 
 TIME_ZONE = "Europe/Warsaw"
-
 USE_I18N = True
-
 USE_TZ = True
 
 
@@ -201,10 +203,10 @@
 
 
 CRONJOBS = [
-    ("*/4 * * * *", "AHC_app.celery_notifications.cron.send_emails"),
-    ("*/2 * * * *", "AHC_app.celery_notifications.cron.send_email_example"),
-    # ('2 * * * *', 'AHC_app.celery_notifications.cron:send_emails'),
-    ("4 * * * *", "AHC_app.celery_notifications.cron.send_sms"),
+    # ("*/4 * * * *", "AHC_app.celery_notifications.cron.send_emails"),
+    # ("*/2 * * * *", "AHC_app.celery_notifications.cron.send_email_example"),
+    # # ('2 * * * *', 'AHC_app.celery_notifications.cron:send_emails'),
+    # ("4 * * * *", "AHC_app.celery_notifications.cron.send_sms"),
     ("6 * * * *", "AHC_app.celery_notifications.cron.send_discord_notes"),
 ]
 
@@ -222,3 +224,7 @@
 EMAIL_USE_TLS = config("EMAIL_USE_TLS", default=False, cast=bool)
 EMAIL_HOST_USER = config("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = config("EMAIL_HOST_PASSWORD")
+
+DISCORD_TOKEN = config("DISCORD_TOKEN")
+
+TEST_RUNNER = "django.test.runner.DiscoverRunner"

AHC_app/AHC_app/urls.py

@@ -17,7 +17,6 @@
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
-from django.contrib.staticfiles.storage import staticfiles_storage
 from django.urls import include, path
 from django.views.generic.base import RedirectView
 
@@ -29,6 +28,6 @@
     path("note/", include("medical_notes.urls")),
     path(
         "favicon.ico",
-        RedirectView.as_view(url=staticfiles_storage.url("media/icons/chinchilla.png")),
+        RedirectView.as_view(url=static("media/icons/chinchilla.png")),
     ),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

AHC_app/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11.3
+FROM python:3.12
 LABEL authors="AM"
 WORKDIR /app
 COPY Pipfile Pipfile.lock ./