Add Makefiles and fix backend tests

Author: Pau Tena

.github/workflows/test-backend.yml

@@ -12,9 +12,17 @@ on:
 jobs:
   test-backend:
     runs-on: ubuntu-latest
+    env:
+      ENVIRONMENT: local
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Install 1Password CLI
+        uses: 1password/install-cli-action@v1
+      - name: Load secrets from 1Password
+        uses: 1password/load-secrets-action/configure@v2
+        with:
+          service-account-token: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -25,12 +33,12 @@ jobs:
           version: "0.4.15"
           enable-cache: true
       - run: docker compose down -v --remove-orphans
-      - run: docker compose up -d db mailcatcher
+      - run: op run --no-masking --env-file="./.env" -- docker compose up -d db mailcatcher
       - name: Migrate DB
-        run: uv run bash scripts/prestart.sh
+        run: op run --no-masking --env-file="../.env" -- uv run bash scripts/prestart.sh
         working-directory: backend
       - name: Run tests
-        run: uv run bash scripts/tests-start.sh "Coverage for ${{ github.sha }}"
+        run: op run --no-masking --env-file="../.env" -- uv run bash scripts/tests-start.sh "Coverage for ${{ github.sha }}"
         working-directory: backend
       - run: docker compose down -v --remove-orphans
       - name: Store coverage files

Makefile

@@ -0,0 +1,13 @@
+export ENVIRONMENT=local
+
+
+watch:
+	op run --env-file=".env" -- docker compose watch
+
+up:
+	op run --env-file=".env" -- docker compose up
+
+build:
+	op run --env-file=".env" -- docker compose build
+
+.PHONY: watch up build

backend/Makefile

@@ -0,0 +1,13 @@
+export ENVIRONMENT=local
+
+test:
+	docker compose down -v --remove-orphans; \
+	op run --no-masking --env-file="../.env" -- docker compose up -d db mailcatcher; \
+	op run --no-masking --env-file="../.env" -- uv run bash scripts/prestart.sh; \
+	op run --no-masking --env-file="../.env" -- uv run bash scripts/tests-start.sh $(MSG); \
+	docker compose down -v --remove-orphans;
+
+lint:
+	uv run bash scripts/lint.sh
+
+.PHONY: test lint

backend/app/tests/api/routes/test_login.py

@@ -72,8 +72,8 @@ def test_recovery_password_user_not_exits(
 def test_reset_password(
     client: TestClient, superuser_token_headers: dict[str, str], db: Session
 ) -> None:
-    token = generate_password_reset_token(email=settings.FIRST_SUPERUSER)
-    data = {"new_password": "changethis", "token": token}
+    token = generate_password_reset_token(email=settings.EMAIL_TEST_USER)
+    data = {"new_password": "different pasasword", "token": token}
     r = client.post(
         f"{settings.API_V1_STR}/reset-password/",
         headers=superuser_token_headers,
@@ -82,7 +82,7 @@ def test_reset_password(
     assert r.status_code == 200
     assert r.json() == {"message": "Password updated successfully"}
 
-    user_query = select(User).where(User.email == settings.FIRST_SUPERUSER)
+    user_query = select(User).where(User.email == settings.EMAIL_TEST_USER)
     user = db.exec(user_query).first()
     assert user
     assert verify_password(data["new_password"], user.hashed_password)
@@ -91,7 +91,7 @@ def test_reset_password(
 def test_reset_password_invalid_token(
     client: TestClient, superuser_token_headers: dict[str, str]
 ) -> None:
-    data = {"new_password": "changethis", "token": "invalid"}
+    data = {"new_password": "different password", "token": "invalid"}
     r = client.post(
         f"{settings.API_V1_STR}/reset-password/",
         headers=superuser_token_headers,

docker-compose.yml

@@ -11,8 +11,6 @@ services:
       timeout: 10s
     volumes:
       - app-db-data:/var/lib/postgresql/data/pgdata
-    env_file:
-      - .env
     environment:
       - PGDATA=/var/lib/postgresql/data/pgdata
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD?Variable not set}
@@ -54,9 +52,8 @@ services:
         condition: service_healthy
         restart: true
     command: bash scripts/prestart.sh
-    env_file:
-      - .env
     environment:
+      - PROJECT_NAME=${PROJECT_NAME}
       - DOMAIN=${DOMAIN}
       - FRONTEND_HOST=${FRONTEND_HOST?Variable not set}
       - ENVIRONMENT=${ENVIRONMENT}
@@ -87,9 +84,8 @@ services:
         restart: true
       prestart:
         condition: service_completed_successfully
-    env_file:
-      - .env
     environment:
+      - PROJECT_NAME=${PROJECT_NAME}
       - DOMAIN=${DOMAIN}
       - FRONTEND_HOST=${FRONTEND_HOST?Variable not set}
       - ENVIRONMENT=${ENVIRONMENT}