Ajustado e-mail de confirmacao e CI/CD

.dockerignore

@@ -1,3 +1,4 @@
 fly.toml
 .git/
 *.sqlite3
+.venv

.github/workflows/cd.yml

@@ -0,0 +1,44 @@
+name: Deploy
+
+on:
+  workflow_run:
+    workflows:
+      - Integração contínua
+    types:
+      - completed
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    env:
+      FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Fly CLI
+        uses: superfly/flyctl-actions/setup-flyctl@master
+
+      - name: Fetch Fly.io secrets
+        id: fetch_secrets
+        run: |
+          chmod +x ./set_secrets.sh
+          ./set_secrets.sh
+        if: always() # Importante: executa mesmo com erro para melhor logging
+
+      - name: Deploy to Fly.io
+        run: flyctl deploy --remote-only
+        env:
+          EMAIL_BACKEND: ${{ env.EMAIL_BACKEND }}
+          EMAIL_HOST: ${{ env.EMAIL_HOST }}
+          EMAIL_PORT: ${{ env.EMAIL_PORT }}
+          EMAIL_USE_TLS: ${{ env.EMAIL_USE_TLS }}
+          EMAIL_HOST_USER: ${{ env.EMAIL_HOST_USER }}
+          EMAIL_HOST_PASSWORD: ${{ env.EMAIL_HOST_PASSWORD }}
+          DEFAULT_FROM_EMAIL: ${{ env.DEFAULT_FROM_EMAIL }}
+        if: steps.fetch_secrets.outcome == 'success' # Só deploya se a etapa anterior foi bem sucedida
+
+    environment:
+      name: production
+      url: https://eventex.fly.dev

.github/workflows/django_ci.yml → .github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Django CI
+name: Integração contínua
 
 on:
   pull_request:
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:
@@ -33,4 +33,3 @@ jobs:
       - name: Run tests
         run: |
           pipenv run python manage.py test
-

.github/workflows/set_secrets.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e # Sai imediatamente se houver qualquer erro
+
+# Tenta obter cada secret e define uma variável. Se falhar, sai com erro.
+EMAIL_BACKEND=$(flyctl secrets get EMAIL_BACKEND) || exit 1
+EMAIL_HOST=$(flyctl secrets get EMAIL_HOST) || exit 1
+EMAIL_PORT=$(flyctl secrets get EMAIL_PORT) || exit 1
+EMAIL_USE_TLS=$(flyctl secrets get EMAIL_USE_TLS) || exit 1
+EMAIL_HOST_USER=$(flyctl secrets get EMAIL_HOST_USER) || exit 1
+EMAIL_HOST_PASSWORD=$(flyctl secrets get EMAIL_HOST_PASSWORD) || exit 1
+DEFAULT_FROM_EMAIL=$(flyctl secrets get DEFAULT_FROM_EMAIL) || exit 1
+
+# Define as variáveis de ambiente do GitHub Actions
+echo "EMAIL_BACKEND=$EMAIL_BACKEND" >> $GITHUB_ENV
+echo "EMAIL_HOST=$EMAIL_HOST" >> $GITHUB_ENV
+echo "EMAIL_PORT=$EMAIL_PORT" >> $GITHUB_ENV
+echo "EMAIL_USE_TLS=$EMAIL_USE_TLS" >> $GITHUB_ENV
+echo "EMAIL_HOST_USER=$EMAIL_HOST_USER" >> $GITHUB_ENV
+echo "EMAIL_HOST_PASSWORD=$EMAIL_HOST_PASSWORD" >> $GITHUB_ENV
+echo "DEFAULT_FROM_EMAIL=$DEFAULT_FROM_EMAIL" >> $GITHUB_ENV

Dockerfile

@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.10-slim-bullseye
+ARG PYTHON_VERSION=3.10-slim
 
 FROM python:${PYTHON_VERSION}
 
@@ -20,9 +20,9 @@ COPY Pipfile Pipfile.lock /code/
 RUN pipenv install --deploy --system
 COPY . /code
 
-ENV SECRET_KEY "yUmJW4nXzm3ecLpS4S7Dc7jPaje16aWMrOo1UxMJGcLsbkC00o"
-# RUN python manage.py collectstatic --noinput
+ENV SECRET_KEY "z2qrNgGtnBQCvgW8e8jcs9AiDBIAEaLE3DtC5WCfT47ztXkVUB"
+RUN python manage.py collectstatic --noinput
 
 EXPOSE 8000
 
-CMD ["gunicorn", "--bind", ":8000", "--workers", "2", "eventex.wsgi"]
+CMD ["gunicorn","--bind",":8000","--workers","2","eventex.wsgi"]

Pipfile

@@ -12,11 +12,9 @@ gunicorn = "*"
 psycopg2-binary = "*"
 ipython = "*"
 notebook = "==6.5.5"
-django-extensions = "*"
 traitlets = "==5.9.0"
 django-test-without-migrations = "*"
-sqlformatter = "*"
-jupyterlab-pygments = "*"
+django-extensions = "*"
 
 [dev-packages]
 flake8 = "*"

eventex/core/tests/test_model_contact.py

@@ -58,9 +58,9 @@ def setUp(self):
     def test_email(self):
         qs = Contact.objects.emails()
         expected = ['[email protected]']
-        self.assertQuerysetEqual(qs, expected, lambda o: o.value)
+        self.assertListEqual(list(qs.values_list('value', flat=True)), expected)
 
     def test_phones(self):
         qs = Contact.objects.phones()
         expected = ['21-996186180']
-        self.assertQuerysetEqual(qs, expected, lambda o: o.value)
+        self.assertListEqual(list(qs.values_list('value', flat=True)), expected)

eventex/core/tests/test_model_talk.py

@@ -56,12 +56,12 @@ def test_manager(self):
     def test_at_morning(self):
         qs = Talk.objects.at_morning()
         expected = ['Morning Talk']
-        self.assertQuerysetEqual(qs, expected, lambda o: o.title)
+        self.assertListEqual(list(qs.values_list('title', flat=True)), expected)
 
     def test_at_afternoon(self):
         qs = Talk.objects.at_afternoon()
         expected = ['Afternoon Talk']
-        self.assertQuerysetEqual(qs, expected, lambda o: o.title)
+        self.assertListEqual(list(qs.values_list('title', flat=True)), expected)
 
 
 class CourseModelTest(TestCase):

eventex/settings.py

@@ -9,7 +9,7 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/5.0/ref/settings/
 """
-
+# from email.policy import default
 from pathlib import Path
 from decouple import config, Csv
 from dj_database_url import parse as dburl
@@ -139,5 +139,5 @@
 EMAIL_HOST_PASSWORD = config('EMAIL_HOST_PASSWORD')
 DEFAULT_FROM_EMAIL = config("DEFAULT_FROM_EMAIL")
 
-CSRF_TRUSTED_ORIGINS = ["https://wttd.fly.dev/"]
+CSRF_TRUSTED_ORIGINS = ["https://eventex.fly.dev/"]
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')

eventex/subscriptions/views.py

@@ -31,7 +31,7 @@ def create(request):
     _send_email('Confirmação de inscrição',
                 settings.DEFAULT_FROM_EMAIL,
                 subscription.email,
-                'subscriptions/subscription_detail.html',
+                'subscriptions/subscription_email.txt',
                 {'subscription': subscription})
 
     return HttpResponseRedirect(r('subscriptions:detail', subscription.pk))

fly.toml

@@ -1,9 +1,9 @@
-# fly.toml app configuration file generated for wttd on 2024-02-06T21:42:37-03:00
+# fly.toml app configuration file generated for eventex on 2024-10-08T19:51:08-03:00
 #
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #
 
-app = 'wttd'
+app = 'eventex'
 primary_region = 'gru'
 console_command = '/code/manage.py shell'
 
@@ -15,10 +15,11 @@ console_command = '/code/manage.py shell'
 [env]
   PORT = '8000'
 
+
 [http_service]
   internal_port = 8000
   force_https = true
-  auto_stop_machines = true
+  auto_stop_machines = 'stop'
   auto_start_machines = true
   min_machines_running = 0
   processes = ['app']
@@ -29,5 +30,5 @@ console_command = '/code/manage.py shell'
   memory_mb = 1024
 
 [[statics]]
-  guest_path = '/code/staticfiles'
+  guest_path = '/code/static'
   url_prefix = '/static/'