Compare commits
10 Commits
ebcea643c4
...
cf073be6b0
| Author | SHA1 | Date | |
|---|---|---|---|
| cf073be6b0 | |||
| 433874d11e | |||
| 726c8f3afd | |||
| 0fc0416eb7 | |||
| 919aff07ff | |||
| cd8e781b07 | |||
| 490f0a6a5c | |||
| 1bd6c85fa8 | |||
| bb47bf25c5 | |||
| 11f80b9dd7 |
@@ -26,6 +26,10 @@ IMAP_INBOX_FOLDER=INBOX
|
|||||||
OPENAI_API_KEY=sk-replace-me
|
OPENAI_API_KEY=sk-replace-me
|
||||||
OPENAI_MODEL=gpt-4o
|
OPENAI_MODEL=gpt-4o
|
||||||
|
|
||||||
|
# ── Llama / Ollama (backend preview generation) ───────────────────────────────
|
||||||
|
LLAMA_BASE_URL=http://celtinha.desktop:11434
|
||||||
|
LLAMA_MODEL=gemma3:4b
|
||||||
|
|
||||||
# ── Application ───────────────────────────────────────────────────────────────
|
# ── Application ───────────────────────────────────────────────────────────────
|
||||||
APP_RECIPIENTS=friend1@example.com,friend2@example.com
|
APP_RECIPIENTS=friend1@example.com,friend2@example.com
|
||||||
|
|
||||||
|
|||||||
57
.gitea/workflows/ci.yml
Normal file
57
.gitea/workflows/ci.yml
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
name: CI
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches: ["develop"]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
backend-test:
|
||||||
|
name: Backend Tests
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
defaults:
|
||||||
|
run:
|
||||||
|
working-directory: backend
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up JDK 21
|
||||||
|
uses: actions/setup-java@v4
|
||||||
|
with:
|
||||||
|
java-version: "21"
|
||||||
|
distribution: temurin
|
||||||
|
cache: gradle
|
||||||
|
|
||||||
|
- name: Make Gradle wrapper executable
|
||||||
|
run: chmod +x gradlew
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: ./gradlew test --no-daemon
|
||||||
|
|
||||||
|
- name: Upload test results
|
||||||
|
if: always()
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: backend-test-results
|
||||||
|
path: backend/build/reports/tests/
|
||||||
|
|
||||||
|
frontend-test:
|
||||||
|
name: Frontend Tests
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
defaults:
|
||||||
|
run:
|
||||||
|
working-directory: frontend
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up Node 20
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: "20"
|
||||||
|
cache: npm
|
||||||
|
cache-dependency-path: frontend/package-lock.json
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: npm ci
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: npm run test
|
||||||
2
.github/agents/backend.agent.md
vendored
2
.github/agents/backend.agent.md
vendored
@@ -98,3 +98,5 @@ cd backend
|
|||||||
- DO NOT put business logic in controllers.
|
- DO NOT put business logic in controllers.
|
||||||
- DO NOT put prompt construction logic outside `PromptBuilderService`.
|
- DO NOT put prompt construction logic outside `PromptBuilderService`.
|
||||||
- DO NOT modify frontend code — your scope is `backend/` only.
|
- DO NOT modify frontend code — your scope is `backend/` only.
|
||||||
|
- DO enforce server-side persistence for all business/domain data; frontend must not be required to persist domain data.
|
||||||
|
- DO model generated test-message history as backend-owned task-related data with referential integrity and cleanup on task deletion.
|
||||||
|
|||||||
3
.github/agents/frontend.agent.md
vendored
3
.github/agents/frontend.agent.md
vendored
@@ -39,6 +39,8 @@ frontend/src/
|
|||||||
7. **Routes:** new pages go in `src/pages/`, registered in `src/router/index.tsx`, lazy-loaded.
|
7. **Routes:** new pages go in `src/pages/`, registered in `src/router/index.tsx`, lazy-loaded.
|
||||||
8. **Strings:** no hardcoded user-facing strings outside of constants.
|
8. **Strings:** no hardcoded user-facing strings outside of constants.
|
||||||
9. **No over-engineering:** only add what is explicitly needed — no extra abstractions, helpers, or features.
|
9. **No over-engineering:** only add what is explicitly needed — no extra abstractions, helpers, or features.
|
||||||
|
10. **Data ownership:** domain/business data must stay server-side; frontend never persists entities, tasks, generated messages, logs, or similar domain data in `localStorage`, `sessionStorage`, or `IndexedDB`.
|
||||||
|
11. **LLM calls:** frontend must never call OpenAI/Ollama/Llama directly; use backend APIs only.
|
||||||
|
|
||||||
## TDD Cycle
|
## TDD Cycle
|
||||||
|
|
||||||
@@ -60,3 +62,4 @@ frontend/src/
|
|||||||
- DO NOT build custom UI primitives when a shadcn/ui component exists.
|
- DO NOT build custom UI primitives when a shadcn/ui component exists.
|
||||||
- DO NOT write implementation code before the failing test exists.
|
- DO NOT write implementation code before the failing test exists.
|
||||||
- DO NOT modify backend code — your scope is `frontend/` only.
|
- DO NOT modify backend code — your scope is `frontend/` only.
|
||||||
|
- DO NOT store business/domain data in browser storage; only the backend-issued `httpOnly` session cookie is allowed for auth state.
|
||||||
14
.github/agents/infra.agent.md
vendored
14
.github/agents/infra.agent.md
vendored
@@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
name: infra
|
name: infra
|
||||||
description: "Use when working on Docker configuration, Docker Compose files, Dockerfiles, Nginx config, Supervisor config, GitHub Actions workflows, CI/CD pipelines, environment variables, or overall project architecture in the condado-news-letter project. Trigger phrases: docker, dockerfile, compose, nginx, ci/cd, github actions, publish image, build fails, infra, architecture, environment variables, container, supervisor, allinone image, docker hub."
|
description: "Use when working on Docker configuration, Docker Compose files, Dockerfiles, Nginx config, Supervisor config, Gitea Actions workflows, CI/CD pipelines, environment variables, or overall project architecture in the condado-news-letter project. Trigger phrases: docker, dockerfile, compose, nginx, ci/cd, gitea actions, build fails, infra, architecture, environment variables, container, supervisor, allinone image."
|
||||||
tools: [read, edit, search, execute, todo]
|
tools: [read, edit, search, execute, todo]
|
||||||
argument-hint: "Describe the infrastructure change or Docker/CI task to implement."
|
argument-hint: "Describe the infrastructure change or Docker/CI task to implement."
|
||||||
---
|
---
|
||||||
@@ -21,8 +21,7 @@ You are a senior DevOps / infrastructure engineer and software architect for the
|
|||||||
| `frontend/nginx.docker.conf` | Nginx config embedded in frontend image |
|
| `frontend/nginx.docker.conf` | Nginx config embedded in frontend image |
|
||||||
| `docker/supervisord.conf` | Supervisor config (manages postgres + java + nginx inside allinone) |
|
| `docker/supervisord.conf` | Supervisor config (manages postgres + java + nginx inside allinone) |
|
||||||
| `docker/entrypoint.sh` | Allinone container entrypoint (DB init, env wiring, supervisord start) |
|
| `docker/entrypoint.sh` | Allinone container entrypoint (DB init, env wiring, supervisord start) |
|
||||||
| `.github/workflows/ci.yml` | CI: backend tests + frontend tests on every push/PR |
|
| `.gitea/workflows/ci.yml` | CI: backend tests + frontend tests on pull requests to `develop` |
|
||||||
| `.github/workflows/publish.yml` | CD: build & push allinone image to Docker Hub on `main` merge |
|
|
||||||
| `.env.example` | Template for all environment variables |
|
| `.env.example` | Template for all environment variables |
|
||||||
|
|
||||||
## System Topology
|
## System Topology
|
||||||
@@ -80,14 +79,9 @@ All injected at runtime — never hardcoded in images.
|
|||||||
|
|
||||||
| Workflow | Trigger | What it does |
|
| Workflow | Trigger | What it does |
|
||||||
|---|---|---|
|
|---|---|---|
|
||||||
| `ci.yml` | Push / PR to any branch | Backend `./gradlew test` + Frontend `npm run test` |
|
| `ci.yml` | Pull request to `develop` | Backend `./gradlew test` + Frontend `npm run test` |
|
||||||
| `publish.yml` | Push to `main` | Builds `Dockerfile.allinone`, pushes `latest` + `<sha>` tags to Docker Hub |
|
|
||||||
|
|
||||||
**Required GitHub Secrets:** `DOCKERHUB_USERNAME`, `DOCKERHUB_TOKEN`
|
Legacy publish/version workflows were removed from in-repo automation.
|
||||||
|
|
||||||
**Image tags on main merge:**
|
|
||||||
- `<user>/condado-newsletter:latest`
|
|
||||||
- `<user>/condado-newsletter:<git-sha>`
|
|
||||||
|
|
||||||
## Implementation Rules
|
## Implementation Rules
|
||||||
|
|
||||||
|
|||||||
28
.github/agents/orchestrator.agent.md
vendored
28
.github/agents/orchestrator.agent.md
vendored
@@ -8,6 +8,8 @@ argument-hint: "Describe the feature, bug, or change to deliver end-to-end."
|
|||||||
|
|
||||||
You are the **delivery orchestrator** for the **Condado Abaixo da Média SA** project. You own the full lifecycle of a work item — from the moment the user describes what they want, to a merged-ready pull request with the version bumped. You never implement code yourself; you coordinate specialist agents and run git/shell commands.
|
You are the **delivery orchestrator** for the **Condado Abaixo da Média SA** project. You own the full lifecycle of a work item — from the moment the user describes what they want, to a merged-ready pull request with the version bumped. You never implement code yourself; you coordinate specialist agents and run git/shell commands.
|
||||||
|
|
||||||
|
Git hosting is Gitea at `http://gitea.lab/sancho41/condado-newsletter.git`, and workflow follows strict Git Flow.
|
||||||
|
|
||||||
## Pipeline Overview
|
## Pipeline Overview
|
||||||
|
|
||||||
```
|
```
|
||||||
@@ -41,10 +43,10 @@ Announce the label before proceeding: **"Classified as: `<label>`"**
|
|||||||
## Step 2 — Create Branch
|
## Step 2 — Create Branch
|
||||||
|
|
||||||
1. Verify the working tree is clean: `git status --short`. If dirty, stop and warn the user.
|
1. Verify the working tree is clean: `git status --short`. If dirty, stop and warn the user.
|
||||||
2. Ensure you are on `main` and it is up to date: `git checkout main && git pull`.
|
2. Ensure `main` and `develop` are up to date: `git checkout main && git pull && git checkout develop && git pull`.
|
||||||
3. Create and checkout the branch:
|
3. Create and checkout the branch:
|
||||||
```bash
|
```bash
|
||||||
git checkout -b <prefix>/<kebab-case-short-description>
|
git checkout -b <prefix>/<kebab-case-short-description> develop
|
||||||
```
|
```
|
||||||
Branch name must be lowercase, kebab-case, max 50 chars.
|
Branch name must be lowercase, kebab-case, max 50 chars.
|
||||||
4. Announce the branch name.
|
4. Announce the branch name.
|
||||||
@@ -118,11 +120,12 @@ Read the new version from `frontend/package.json` after bumping.
|
|||||||
git push -u origin <branch-name>
|
git push -u origin <branch-name>
|
||||||
```
|
```
|
||||||
|
|
||||||
2. Open a pull request using the GitHub CLI:
|
2. Open a pull request targeting `develop`.
|
||||||
|
If `tea` (Gitea CLI) is available, use:
|
||||||
```bash
|
```bash
|
||||||
gh pr create \
|
tea pr create \
|
||||||
--title "<conventional-commit-type>(<scope>): <short description>" \
|
--title "<conventional-commit-type>(<scope>): <short description>" \
|
||||||
--body "$(cat <<'EOF'
|
--description "$(cat <<'EOF'
|
||||||
## Summary
|
## Summary
|
||||||
<1-3 sentences describing what was done and why>
|
<1-3 sentences describing what was done and why>
|
||||||
|
|
||||||
@@ -141,9 +144,10 @@ Read the new version from `frontend/package.json` after bumping.
|
|||||||
- Build green: `./gradlew build` + `npm run build`
|
- Build green: `./gradlew build` + `npm run build`
|
||||||
EOF
|
EOF
|
||||||
)" \
|
)" \
|
||||||
--base main \
|
--base develop \
|
||||||
--head <branch-name>
|
--head <branch-name>
|
||||||
```
|
```
|
||||||
|
If `tea` is unavailable, provide the exact PR title/body and instruct opening a PR in the Gitea web UI with base `develop`.
|
||||||
|
|
||||||
3. Announce the PR URL.
|
3. Announce the PR URL.
|
||||||
|
|
||||||
@@ -152,13 +156,15 @@ Read the new version from `frontend/package.json` after bumping.
|
|||||||
## Constraints
|
## Constraints
|
||||||
|
|
||||||
- DO NOT implement any code yourself — delegate everything to specialist agents.
|
- DO NOT implement any code yourself — delegate everything to specialist agents.
|
||||||
- DO NOT commit directly to `main`.
|
- DO NOT commit directly to `main` or `develop`.
|
||||||
- DO NOT use `--force`, `--no-verify`, or `git reset --hard`.
|
- DO NOT use `--force`, `--no-verify`, or `git reset --hard`.
|
||||||
- DO NOT proceed to the next step if the current step's tests are not green.
|
- DO NOT proceed to the next step if the current step's tests are not green.
|
||||||
- DO NOT bump the version before all implementation commits are done.
|
- DO NOT bump the version before all implementation commits are done.
|
||||||
- ALWAYS verify `git status` is clean before creating the branch.
|
- ALWAYS verify `git status` is clean before creating the branch.
|
||||||
- ALWAYS use `gh pr create` (GitHub CLI) for pull requests — never instruct the user to open one manually unless `gh` is unavailable.
|
- ALWAYS target `develop` for regular feature/fix/chore PRs.
|
||||||
- If `gh` is not installed, clearly tell the user and provide the exact PR title and body to paste into the GitHub UI.
|
- Use Gitea flow for PR creation (`tea` if available, otherwise web UI instructions with exact PR metadata).
|
||||||
|
- ALWAYS enforce backend ownership of business/domain data; do not accept frontend browser storage solutions for domain persistence.
|
||||||
|
- ALWAYS enforce backend-mediated LLM calls; frontend must never call LLM providers directly.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
4
.github/agents/planner.agent.md
vendored
4
.github/agents/planner.agent.md
vendored
@@ -14,7 +14,7 @@ Full-stack monorepo:
|
|||||||
- **Frontend:** React 18 + Vite + TypeScript + shadcn/ui + TanStack Query v5 + Axios + React Router v6
|
- **Frontend:** React 18 + Vite + TypeScript + shadcn/ui + TanStack Query v5 + Axios + React Router v6
|
||||||
- **Auth:** Single admin, password via `APP_PASSWORD` env var, JWT in `httpOnly` cookie
|
- **Auth:** Single admin, password via `APP_PASSWORD` env var, JWT in `httpOnly` cookie
|
||||||
- **Infra:** Docker Compose (dev + prod) + all-in-one Dockerfile, Nginx reverse proxy
|
- **Infra:** Docker Compose (dev + prod) + all-in-one Dockerfile, Nginx reverse proxy
|
||||||
- **CI/CD:** GitHub Actions — tests on every PR, Docker Hub publish on `main` merge
|
- **CI/CD:** Gitea Actions — tests on pull requests to `develop`
|
||||||
|
|
||||||
## Your Workflow
|
## Your Workflow
|
||||||
|
|
||||||
@@ -52,6 +52,8 @@ For each step output:
|
|||||||
- DO reference specific existing files by path when relevant (e.g., `backend/src/main/kotlin/.../EntityService.kt`).
|
- DO reference specific existing files by path when relevant (e.g., `backend/src/main/kotlin/.../EntityService.kt`).
|
||||||
- ALWAYS check the existing codebase before planning — never assume something doesn't exist.
|
- ALWAYS check the existing codebase before planning — never assume something doesn't exist.
|
||||||
- ALWAYS respect the architecture: business logic in services, thin controllers, API layer in `src/api/`, React Query for server state.
|
- ALWAYS respect the architecture: business logic in services, thin controllers, API layer in `src/api/`, React Query for server state.
|
||||||
|
- ALWAYS enforce backend-first data ownership in plans: domain/business data persistence belongs to backend/database, not browser storage.
|
||||||
|
- NEVER plan frontend direct LLM calls; all LLM interactions must be backend-mediated endpoints.
|
||||||
|
|
||||||
## Delegation Hint
|
## Delegation Hint
|
||||||
|
|
||||||
|
|||||||
60
.github/workflows/bump-version.yml
vendored
60
.github/workflows/bump-version.yml
vendored
@@ -1,60 +0,0 @@
|
|||||||
name: Bump Frontend Version
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
bump:
|
|
||||||
description: Version bump type
|
|
||||||
required: true
|
|
||||||
default: patch
|
|
||||||
type: choice
|
|
||||||
options:
|
|
||||||
- patch
|
|
||||||
- minor
|
|
||||||
- major
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
bump-version:
|
|
||||||
name: Bump frontend package version
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Set up Node 20
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: "20"
|
|
||||||
|
|
||||||
- name: Bump frontend version
|
|
||||||
working-directory: frontend
|
|
||||||
run: npm version ${{ inputs.bump }} --no-git-tag-version
|
|
||||||
|
|
||||||
- name: Commit and push version update
|
|
||||||
run: |
|
|
||||||
git config user.name "github-actions[bot]"
|
|
||||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
|
||||||
git add frontend/package.json
|
|
||||||
if [ -f frontend/package-lock.json ]; then
|
|
||||||
git add frontend/package-lock.json
|
|
||||||
fi
|
|
||||||
if git diff --cached --quiet; then
|
|
||||||
echo "No version changes to commit"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
NEW_VERSION=$(node -p "require('./frontend/package.json').version")
|
|
||||||
TAG_NAME="frontend-v${NEW_VERSION}"
|
|
||||||
git commit -m "chore(frontend): bump version to ${NEW_VERSION}"
|
|
||||||
if git rev-parse "${TAG_NAME}" >/dev/null 2>&1; then
|
|
||||||
echo "Tag ${TAG_NAME} already exists"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
git tag -a "${TAG_NAME}" -m "Frontend ${NEW_VERSION}"
|
|
||||||
git push
|
|
||||||
git push origin "${TAG_NAME}"
|
|
||||||
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@@ -1,10 +1,8 @@
|
|||||||
name: CI
|
name: CI
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
|
||||||
branches: ["**"]
|
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: ["**"]
|
branches: ["develop"]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
backend-test:
|
backend-test:
|
||||||
|
|||||||
36
.github/workflows/publish.yml
vendored
36
.github/workflows/publish.yml
vendored
@@ -1,36 +0,0 @@
|
|||||||
name: Publish to Docker Hub
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-and-push:
|
|
||||||
name: Build & Push All-in-one Image
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
environment:
|
|
||||||
name: production
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
|
|
||||||
- name: Log in to Docker Hub
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Build and push
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
file: Dockerfile.allinone
|
|
||||||
push: true
|
|
||||||
tags: |
|
|
||||||
${{ secrets.DOCKERHUB_USERNAME }}/condado-newsletter:latest
|
|
||||||
${{ secrets.DOCKERHUB_USERNAME }}/condado-newsletter:${{ github.sha }}
|
|
||||||
cache-from: type=gha
|
|
||||||
cache-to: type=gha,mode=max
|
|
||||||
53
CLAUDE.md
53
CLAUDE.md
@@ -83,8 +83,8 @@ The cycle for every step is:
|
|||||||
| Reverse Proxy | Nginx (serves frontend + proxies `/api` to backend) |
|
| Reverse Proxy | Nginx (serves frontend + proxies `/api` to backend) |
|
||||||
| Dev Mail | Mailhog (SMTP trap + web UI) |
|
| Dev Mail | Mailhog (SMTP trap + web UI) |
|
||||||
| All-in-one image | Single Docker image: Nginx + Spring Boot + PostgreSQL + Supervisor |
|
| All-in-one image | Single Docker image: Nginx + Spring Boot + PostgreSQL + Supervisor |
|
||||||
| Image registry | Docker Hub (`<dockerhub-user>/condado-newsletter`) |
|
| Image registry | Not configured (legacy Docker Hub publish workflow removed) |
|
||||||
| CI/CD | GitHub Actions — build, test, push to Docker Hub on merge to `main` |
|
| CI/CD | Gitea Actions — run backend/frontend tests on pull requests to `develop` |
|
||||||
|
|
||||||
## Deployment Flavours
|
## Deployment Flavours
|
||||||
|
|
||||||
@@ -104,7 +104,7 @@ The all-in-one image (`Dockerfile.allinone`) bundles **everything** into a singl
|
|||||||
- **PostgreSQL** — embedded database
|
- **PostgreSQL** — embedded database
|
||||||
- **Supervisor** — process manager that starts and supervises all three processes
|
- **Supervisor** — process manager that starts and supervises all three processes
|
||||||
|
|
||||||
This image is published to Docker Hub at `<dockerhub-user>/condado-newsletter:latest`.
|
The all-in-one image is built locally or in external pipelines as needed (no default registry publish workflow in-repo).
|
||||||
|
|
||||||
**Minimal `docker run` command:**
|
**Minimal `docker run` command:**
|
||||||
```bash
|
```bash
|
||||||
@@ -121,7 +121,7 @@ docker run -d \
|
|||||||
-e IMAP_PORT=993 \
|
-e IMAP_PORT=993 \
|
||||||
-e APP_RECIPIENTS=friend1@example.com,friend2@example.com \
|
-e APP_RECIPIENTS=friend1@example.com,friend2@example.com \
|
||||||
-v condado-data:/var/lib/postgresql/data \
|
-v condado-data:/var/lib/postgresql/data \
|
||||||
<dockerhub-user>/condado-newsletter:latest
|
<registry-or-local-image>/condado-newsletter:latest
|
||||||
```
|
```
|
||||||
|
|
||||||
The app is then available at `http://localhost`.
|
The app is then available at `http://localhost`.
|
||||||
@@ -218,8 +218,10 @@ condado-news-letter/ ← repo root
|
|||||||
│
|
│
|
||||||
├── .github/
|
├── .github/
|
||||||
│ └── workflows/
|
│ └── workflows/
|
||||||
│ ├── ci.yml ← run tests on every PR
|
│ └── (legacy, unused after Gitea migration)
|
||||||
│ └── publish.yml ← build & push all-in-one image to Docker Hub on main merge
|
├── .gitea/
|
||||||
|
│ └── workflows/
|
||||||
|
│ └── ci.yml ← run tests on pull requests targeting `develop`
|
||||||
│
|
│
|
||||||
├── backend/ ← Spring Boot (Kotlin + Gradle)
|
├── backend/ ← Spring Boot (Kotlin + Gradle)
|
||||||
│ ├── build.gradle.kts
|
│ ├── build.gradle.kts
|
||||||
@@ -363,6 +365,19 @@ docker compose down
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## Data Ownership Policy (Critical)
|
||||||
|
|
||||||
|
- **All business data must be persisted server-side** (PostgreSQL via backend APIs).
|
||||||
|
- The frontend must treat the backend as the single source of truth for entities, tasks,
|
||||||
|
generated preview messages/history, logs, and any other domain data.
|
||||||
|
- The frontend must **not** persist business/domain data in browser storage (`localStorage`,
|
||||||
|
`sessionStorage`, `IndexedDB`) or call LLM providers directly.
|
||||||
|
- The only browser-stored auth state is the backend-issued session token cookie (`httpOnly` JWT).
|
||||||
|
- If a required endpoint does not exist yet, implement it in the backend first; do not add
|
||||||
|
frontend-side persistence workarounds.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Naming Conventions
|
## Naming Conventions
|
||||||
|
|
||||||
### Backend
|
### Backend
|
||||||
@@ -509,13 +524,17 @@ BODY:
|
|||||||
|
|
||||||
## Git Workflow & CI/CD
|
## Git Workflow & CI/CD
|
||||||
|
|
||||||
- Branch naming: `feature/<short-description>`, `fix/<short-description>`, `chore/<short-description>`
|
- Git hosting: Gitea instance at `http://gitea.lab`.
|
||||||
|
- Canonical remote: `origin = http://gitea.lab/sancho41/condado-newsletter.git`.
|
||||||
|
- Branch model: **Git Flow** (`main` + `develop` as permanent branches).
|
||||||
|
- Branch naming: `feature/<short-description>`, `fix/<short-description>`, `hotfix/<short-description>`, `release/<short-description>`, `chore/<short-description>`
|
||||||
- Commit messages follow [Conventional Commits](https://www.conventionalcommits.org/): `feat:`, `fix:`, `chore:`, `docs:`, `test:`
|
- Commit messages follow [Conventional Commits](https://www.conventionalcommits.org/): `feat:`, `fix:`, `chore:`, `docs:`, `test:`
|
||||||
- Scope your commits: `feat(backend):`, `feat(frontend):`, `chore(docker):`
|
- Scope your commits: `feat(backend):`, `feat(frontend):`, `chore(docker):`
|
||||||
- **TDD commit order per step:** first `test(<scope>): add failing tests for <step>`, then
|
- **TDD commit order per step:** first `test(<scope>): add failing tests for <step>`, then
|
||||||
`feat(<scope>): implement <step> — all tests passing`.
|
`feat(<scope>): implement <step> — all tests passing`.
|
||||||
- PRs require all CI checks to pass before merging.
|
- Pull requests must target `develop` for regular work.
|
||||||
- Never commit directly to `main`.
|
- CI runs on pull requests to `develop` and must pass before merge.
|
||||||
|
- Never commit directly to `main` or `develop`.
|
||||||
|
|
||||||
### Commit Rules (enforced by AI)
|
### Commit Rules (enforced by AI)
|
||||||
|
|
||||||
@@ -551,23 +570,13 @@ Good examples:
|
|||||||
- `feat(frontend): implement step 2 - per-entity scheduled task creation`
|
- `feat(frontend): implement step 2 - per-entity scheduled task creation`
|
||||||
- `docs(config): clarify english-first language policy and commit quality rules`
|
- `docs(config): clarify english-first language policy and commit quality rules`
|
||||||
|
|
||||||
### GitHub Actions Workflows
|
### Gitea Actions Workflows
|
||||||
|
|
||||||
| Workflow file | Trigger | What it does |
|
| Workflow file | Trigger | What it does |
|
||||||
|----------------------------|----------------------------|-----------------------------------------------------------|
|
|----------------------------|----------------------------|-----------------------------------------------------------|
|
||||||
| `.github/workflows/ci.yml` | Push / PR to any branch | Backend tests (`./gradlew test`) + Frontend tests (`npm run test`) |
|
| `.gitea/workflows/ci.yml` | PR to `develop` | Backend tests (`./gradlew test`) + Frontend tests (`npm run test`) |
|
||||||
| `.github/workflows/publish.yml` | Push to `main` | Builds `Dockerfile.allinone`, tags as `latest` + git SHA, pushes to Docker Hub |
|
|
||||||
|
|
||||||
**Required GitHub Secrets:**
|
Current policy: old publish/version automation workflows were removed during the Gitea migration.
|
||||||
|
|
||||||
| Secret | Description |
|
|
||||||
|-----------------------|--------------------------------------------|
|
|
||||||
| `DOCKERHUB_USERNAME` | Docker Hub account username |
|
|
||||||
| `DOCKERHUB_TOKEN` | Docker Hub access token (not password) |
|
|
||||||
|
|
||||||
**Image tags pushed on every `main` merge:**
|
|
||||||
- `<dockerhub-user>/condado-newsletter:latest`
|
|
||||||
- `<dockerhub-user>/condado-newsletter:<git-sha>` (for pinning)
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import java.util.UUID
|
|||||||
data class EntityTaskCreateDto(
|
data class EntityTaskCreateDto(
|
||||||
@field:NotNull val entityId: UUID,
|
@field:NotNull val entityId: UUID,
|
||||||
@field:NotBlank val name: String,
|
@field:NotBlank val name: String,
|
||||||
@field:NotBlank val prompt: String,
|
val prompt: String,
|
||||||
@field:NotBlank val scheduleCron: String,
|
@field:NotBlank val scheduleCron: String,
|
||||||
@field:NotBlank val emailLookback: String
|
@field:NotBlank val emailLookback: String
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ class EntityService(
|
|||||||
|
|
||||||
/** Returns all virtual entities. */
|
/** Returns all virtual entities. */
|
||||||
fun findAll(): List<VirtualEntityResponseDto> =
|
fun findAll(): List<VirtualEntityResponseDto> =
|
||||||
virtualEntityRepository.findAll().map { VirtualEntityResponseDto.from(it) }
|
virtualEntityRepository.findAllByActiveTrue().map { VirtualEntityResponseDto.from(it) }
|
||||||
|
|
||||||
/** Returns one entity by ID, or null if not found. */
|
/** Returns one entity by ID, or null if not found. */
|
||||||
fun findById(id: UUID): VirtualEntityResponseDto? =
|
fun findById(id: UUID): VirtualEntityResponseDto? =
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ import org.springframework.web.client.RestClient
|
|||||||
@Service
|
@Service
|
||||||
class LlamaPreviewService(
|
class LlamaPreviewService(
|
||||||
private val restClient: RestClient,
|
private val restClient: RestClient,
|
||||||
@Value("\${llama.base-url:http://localhost:11434}") private val baseUrl: String,
|
@Value("\${llama.base-url}") private val baseUrl: String,
|
||||||
@Value("\${llama.model:gemma3:4b}") private val model: String
|
@Value("\${llama.model}") private val model: String
|
||||||
) {
|
) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -49,8 +49,8 @@ openai:
|
|||||||
model: ${OPENAI_MODEL:gpt-4o}
|
model: ${OPENAI_MODEL:gpt-4o}
|
||||||
|
|
||||||
llama:
|
llama:
|
||||||
base-url: ${LLAMA_BASE_URL:http://localhost:11434}
|
base-url: ${LLAMA_BASE_URL}
|
||||||
model: ${LLAMA_MODEL:gemma3:4b}
|
model: ${LLAMA_MODEL}
|
||||||
|
|
||||||
springdoc:
|
springdoc:
|
||||||
swagger-ui:
|
swagger-ui:
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
package com.condado.newsletter.controller
|
||||||
|
|
||||||
|
import com.condado.newsletter.model.VirtualEntity
|
||||||
|
import com.condado.newsletter.repository.EntityTaskRepository
|
||||||
|
import com.condado.newsletter.repository.GeneratedMessageHistoryRepository
|
||||||
|
import com.condado.newsletter.repository.VirtualEntityRepository
|
||||||
|
import com.condado.newsletter.scheduler.EntityScheduler
|
||||||
|
import com.condado.newsletter.service.JwtService
|
||||||
|
import com.ninjasquad.springmockk.MockkBean
|
||||||
|
import jakarta.servlet.http.Cookie
|
||||||
|
import org.junit.jupiter.api.AfterEach
|
||||||
|
import org.junit.jupiter.api.Test
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired
|
||||||
|
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest
|
||||||
|
import org.springframework.http.MediaType
|
||||||
|
import org.springframework.test.web.servlet.MockMvc
|
||||||
|
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post
|
||||||
|
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath
|
||||||
|
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
@AutoConfigureMockMvc
|
||||||
|
class EntityTaskControllerTest {
|
||||||
|
|
||||||
|
@Autowired lateinit var mockMvc: MockMvc
|
||||||
|
@Autowired lateinit var jwtService: JwtService
|
||||||
|
@Autowired lateinit var virtualEntityRepository: VirtualEntityRepository
|
||||||
|
@Autowired lateinit var entityTaskRepository: EntityTaskRepository
|
||||||
|
@Autowired lateinit var generatedMessageHistoryRepository: GeneratedMessageHistoryRepository
|
||||||
|
|
||||||
|
@MockkBean lateinit var entityScheduler: EntityScheduler
|
||||||
|
|
||||||
|
private fun authCookie() = Cookie("jwt", jwtService.generateToken())
|
||||||
|
|
||||||
|
@AfterEach
|
||||||
|
fun cleanUp() {
|
||||||
|
generatedMessageHistoryRepository.deleteAll()
|
||||||
|
entityTaskRepository.deleteAll()
|
||||||
|
virtualEntityRepository.deleteAll()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun should_createTask_when_promptIsBlankInCreateRequest() {
|
||||||
|
val entity = virtualEntityRepository.save(
|
||||||
|
VirtualEntity(
|
||||||
|
name = "Entity A",
|
||||||
|
email = "entity-a@condado.com",
|
||||||
|
jobTitle = "Ops"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
val payload = """
|
||||||
|
{
|
||||||
|
"entityId": "${entity.id}",
|
||||||
|
"name": "Morning Blast",
|
||||||
|
"prompt": "",
|
||||||
|
"scheduleCron": "0 8 * * 1-5",
|
||||||
|
"emailLookback": "last_week"
|
||||||
|
}
|
||||||
|
""".trimIndent()
|
||||||
|
|
||||||
|
mockMvc.perform(
|
||||||
|
post("/api/v1/tasks")
|
||||||
|
.cookie(authCookie())
|
||||||
|
.contentType(MediaType.APPLICATION_JSON)
|
||||||
|
.content(payload)
|
||||||
|
)
|
||||||
|
.andExpect(status().isCreated)
|
||||||
|
.andExpect(jsonPath("$.entityId").value(entity.id.toString()))
|
||||||
|
.andExpect(jsonPath("$.name").value("Morning Blast"))
|
||||||
|
.andExpect(jsonPath("$.prompt").value(""))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -138,4 +138,32 @@ class TaskGeneratedMessageControllerTest {
|
|||||||
.andExpect(jsonPath("$").isArray)
|
.andExpect(jsonPath("$").isArray)
|
||||||
.andExpect(jsonPath("$.length()").value(0))
|
.andExpect(jsonPath("$.length()").value(0))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun should_deleteOnlySelectedHistoryItem_when_multipleMessagesExist() {
|
||||||
|
val task = createTask()
|
||||||
|
val firstMessage = generatedMessageHistoryRepository.save(
|
||||||
|
GeneratedMessageHistory(
|
||||||
|
task = task,
|
||||||
|
label = "Message #1",
|
||||||
|
content = "SUBJECT: First\nBODY:\nHello"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
val secondMessage = generatedMessageHistoryRepository.save(
|
||||||
|
GeneratedMessageHistory(
|
||||||
|
task = task,
|
||||||
|
label = "Message #2",
|
||||||
|
content = "SUBJECT: Second\nBODY:\nHi"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
mockMvc.perform(delete("/api/v1/tasks/${task.id}/generated-messages/${firstMessage.id}").cookie(authCookie()))
|
||||||
|
.andExpect(status().isNoContent)
|
||||||
|
|
||||||
|
mockMvc.perform(get("/api/v1/tasks/${task.id}/generated-messages").cookie(authCookie()))
|
||||||
|
.andExpect(status().isOk)
|
||||||
|
.andExpect(jsonPath("$.length()").value(1))
|
||||||
|
.andExpect(jsonPath("$[0].id").value(secondMessage.id.toString()))
|
||||||
|
.andExpect(jsonPath("$[0].label").value("Message #2"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,6 +62,17 @@ class VirtualEntityControllerTest {
|
|||||||
.andExpect(status().isOk).andExpect(jsonPath("$").isArray).andExpect(jsonPath("$[0].name").value("Test Entity"))
|
.andExpect(status().isOk).andExpect(jsonPath("$").isArray).andExpect(jsonPath("$[0].name").value("Test Entity"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun should_returnOnlyActiveEntities_when_getAllEntities() {
|
||||||
|
virtualEntityRepository.save(VirtualEntity(name = "Active Entity", email = "active@condado.com", jobTitle = "Tester", active = true))
|
||||||
|
virtualEntityRepository.save(VirtualEntity(name = "Inactive Entity", email = "inactive@condado.com", jobTitle = "Tester", active = false))
|
||||||
|
|
||||||
|
mockMvc.perform(get("/api/v1/virtual-entities").cookie(authCookie()))
|
||||||
|
.andExpect(status().isOk)
|
||||||
|
.andExpect(jsonPath("$.length()").value(1))
|
||||||
|
.andExpect(jsonPath("$[0].name").value("Active Entity"))
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun should_return200AndEntity_when_getById() {
|
fun should_return200AndEntity_when_getById() {
|
||||||
val entity = virtualEntityRepository.save(VirtualEntity(name = "Test Entity", email = "entity@condado.com", jobTitle = "Test Job"))
|
val entity = virtualEntityRepository.save(VirtualEntity(name = "Test Entity", email = "entity@condado.com", jobTitle = "Test Job"))
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package com.condado.newsletter.service
|
||||||
|
|
||||||
|
import org.assertj.core.api.Assertions.assertThat
|
||||||
|
import org.junit.jupiter.api.Test
|
||||||
|
import org.springframework.beans.factory.annotation.Value
|
||||||
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.Path
|
||||||
|
|
||||||
|
class LlamaConfigurationBindingTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun should_bindLlamaBaseUrlAndModelWithoutFallback_when_readingServiceValueAnnotations() {
|
||||||
|
val constructor = LlamaPreviewService::class.java.declaredConstructors.single()
|
||||||
|
val baseUrlExpression = constructor.parameters[1].getAnnotation(Value::class.java).value
|
||||||
|
val modelExpression = constructor.parameters[2].getAnnotation(Value::class.java).value
|
||||||
|
|
||||||
|
assertThat(baseUrlExpression).isEqualTo("\${llama.base-url}")
|
||||||
|
assertThat(modelExpression).isEqualTo("\${llama.model}")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun should_referenceEnvironmentPlaceholdersWithoutFallback_when_readingApplicationYaml() {
|
||||||
|
val yaml = Files.readString(Path.of("src/main/resources/application.yml"))
|
||||||
|
|
||||||
|
assertThat(yaml).contains("base-url: \${LLAMA_BASE_URL}")
|
||||||
|
assertThat(yaml).contains("model: \${LLAMA_MODEL}")
|
||||||
|
assertThat(yaml).doesNotContain("LLAMA_BASE_URL:http://localhost:11434")
|
||||||
|
assertThat(yaml).doesNotContain("LLAMA_MODEL:gemma3:4b")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -38,3 +38,7 @@ imap:
|
|||||||
openai:
|
openai:
|
||||||
api-key: test-api-key
|
api-key: test-api-key
|
||||||
model: gpt-4o
|
model: gpt-4o
|
||||||
|
|
||||||
|
llama:
|
||||||
|
base-url: http://localhost:11434
|
||||||
|
model: gemma3:4b
|
||||||
|
|||||||
@@ -44,7 +44,12 @@ services:
|
|||||||
IMAP_INBOX_FOLDER: ${IMAP_INBOX_FOLDER}
|
IMAP_INBOX_FOLDER: ${IMAP_INBOX_FOLDER}
|
||||||
OPENAI_API_KEY: ${OPENAI_API_KEY}
|
OPENAI_API_KEY: ${OPENAI_API_KEY}
|
||||||
OPENAI_MODEL: ${OPENAI_MODEL}
|
OPENAI_MODEL: ${OPENAI_MODEL}
|
||||||
|
LLAMA_BASE_URL: ${LLAMA_BASE_URL}
|
||||||
|
LLAMA_MODEL: ${LLAMA_MODEL}
|
||||||
APP_RECIPIENTS: ${APP_RECIPIENTS}
|
APP_RECIPIENTS: ${APP_RECIPIENTS}
|
||||||
|
extra_hosts:
|
||||||
|
- "celtinha.desktop:host-gateway"
|
||||||
|
- "host.docker.internal:host-gateway"
|
||||||
networks:
|
networks:
|
||||||
- condado-net
|
- condado-net
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,12 @@ services:
|
|||||||
IMAP_INBOX_FOLDER: ${IMAP_INBOX_FOLDER}
|
IMAP_INBOX_FOLDER: ${IMAP_INBOX_FOLDER}
|
||||||
OPENAI_API_KEY: ${OPENAI_API_KEY}
|
OPENAI_API_KEY: ${OPENAI_API_KEY}
|
||||||
OPENAI_MODEL: ${OPENAI_MODEL}
|
OPENAI_MODEL: ${OPENAI_MODEL}
|
||||||
|
LLAMA_BASE_URL: ${LLAMA_BASE_URL}
|
||||||
|
LLAMA_MODEL: ${LLAMA_MODEL}
|
||||||
APP_RECIPIENTS: ${APP_RECIPIENTS}
|
APP_RECIPIENTS: ${APP_RECIPIENTS}
|
||||||
|
extra_hosts:
|
||||||
|
- "celtinha.desktop:host-gateway"
|
||||||
|
- "host.docker.internal:host-gateway"
|
||||||
networks:
|
networks:
|
||||||
- condado-net
|
- condado-net
|
||||||
|
|
||||||
|
|||||||
4
frontend/package-lock.json
generated
4
frontend/package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "condado-newsletter-frontend",
|
"name": "condado-newsletter-frontend",
|
||||||
"version": "0.2.1",
|
"version": "0.2.2",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "condado-newsletter-frontend",
|
"name": "condado-newsletter-frontend",
|
||||||
"version": "0.2.1",
|
"version": "0.2.2",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@radix-ui/react-dialog": "^1.0.5",
|
"@radix-ui/react-dialog": "^1.0.5",
|
||||||
"@radix-ui/react-dropdown-menu": "^2.0.6",
|
"@radix-ui/react-dropdown-menu": "^2.0.6",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "condado-newsletter-frontend",
|
"name": "condado-newsletter-frontend",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.2.1",
|
"version": "0.2.2",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -294,6 +294,45 @@ describe('EditTaskPage', () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('should_removeOnlyDeletedGeneratedMessage_when_deleteSucceedsWithoutRefetch', async () => {
|
||||||
|
persistedHistory = [
|
||||||
|
{
|
||||||
|
id: 'message-2',
|
||||||
|
taskId: 'task-1',
|
||||||
|
label: 'Message #2',
|
||||||
|
content: 'SUBJECT: Second\nBODY:\nSecond output',
|
||||||
|
createdAt: '2026-03-27T12:10:00Z',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'message-1',
|
||||||
|
taskId: 'task-1',
|
||||||
|
label: 'Message #1',
|
||||||
|
content: 'SUBJECT: First\nBODY:\nFirst output',
|
||||||
|
createdAt: '2026-03-27T12:00:00Z',
|
||||||
|
},
|
||||||
|
]
|
||||||
|
vi.mocked(tasksApi.getTaskGeneratedMessages).mockResolvedValue(persistedHistory)
|
||||||
|
vi.mocked(tasksApi.deleteTaskGeneratedMessage).mockResolvedValue(undefined)
|
||||||
|
|
||||||
|
renderPage()
|
||||||
|
|
||||||
|
const secondMessageHistoryItem = await screen.findByRole('button', { name: /^message #2$/i })
|
||||||
|
expect(await screen.findByRole('button', { name: /^message #1$/i })).toBeInTheDocument()
|
||||||
|
|
||||||
|
fireEvent.click(
|
||||||
|
screen.getByRole('button', {
|
||||||
|
name: /delete message #1/i,
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(tasksApi.deleteTaskGeneratedMessage).toHaveBeenCalledWith('task-1', 'message-1')
|
||||||
|
expect(screen.queryByRole('button', { name: /^message #1$/i })).not.toBeInTheDocument()
|
||||||
|
expect(secondMessageHistoryItem).toBeInTheDocument()
|
||||||
|
expect(screen.getByText(/Second output/i)).toBeInTheDocument()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
it('should_loadPersistedGeneratedMessageHistory_when_pageLoads', async () => {
|
it('should_loadPersistedGeneratedMessageHistory_when_pageLoads', async () => {
|
||||||
persistedHistory = [
|
persistedHistory = [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -89,6 +89,23 @@ describe('EntitiesPage', () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('should_removeDeletedEntityFromList_when_deleteSucceeds', async () => {
|
||||||
|
vi.mocked(entitiesApi.getEntities).mockResolvedValue([mockEntity])
|
||||||
|
vi.mocked(entitiesApi.deleteEntity).mockResolvedValue(undefined)
|
||||||
|
|
||||||
|
render(<EntitiesPage />, { wrapper })
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(screen.getByText('Test Entity')).toBeInTheDocument()
|
||||||
|
})
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole('button', { name: /delete|deactivate/i }))
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(screen.queryByText('Test Entity')).not.toBeInTheDocument()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
it('should_renderDetailLink_when_entitiesLoaded', async () => {
|
it('should_renderDetailLink_when_entitiesLoaded', async () => {
|
||||||
vi.mocked(entitiesApi.getEntities).mockResolvedValue([mockEntity])
|
vi.mocked(entitiesApi.getEntities).mockResolvedValue([mockEntity])
|
||||||
render(<EntitiesPage />, { wrapper })
|
render(<EntitiesPage />, { wrapper })
|
||||||
|
|||||||
@@ -255,8 +255,15 @@ export default function EditTaskPage() {
|
|||||||
|
|
||||||
const deleteGeneratedMessageMutation = useMutation({
|
const deleteGeneratedMessageMutation = useMutation({
|
||||||
mutationFn: (messageId: string) => deleteTaskGeneratedMessage(taskId, messageId),
|
mutationFn: (messageId: string) => deleteTaskGeneratedMessage(taskId, messageId),
|
||||||
onSuccess: async () => {
|
onSuccess: ( _data, messageId) => {
|
||||||
await queryClient.invalidateQueries({ queryKey: ['task-generated-messages', taskId] })
|
queryClient.setQueryData(
|
||||||
|
['task-generated-messages', taskId],
|
||||||
|
(
|
||||||
|
currentMessages:
|
||||||
|
| Awaited<ReturnType<typeof getTaskGeneratedMessages>>
|
||||||
|
| undefined
|
||||||
|
) => currentMessages?.filter((message) => message.id !== messageId) ?? []
|
||||||
|
)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,13 @@ export default function EntitiesPage() {
|
|||||||
|
|
||||||
const deleteMutation = useMutation({
|
const deleteMutation = useMutation({
|
||||||
mutationFn: (id: string) => deleteEntity(id),
|
mutationFn: (id: string) => deleteEntity(id),
|
||||||
onSuccess: () => queryClient.invalidateQueries({ queryKey: ['entities'] }),
|
onSuccess: (_data, id) => {
|
||||||
|
queryClient.setQueryData(
|
||||||
|
['entities'],
|
||||||
|
(currentEntities: Awaited<ReturnType<typeof getEntities>> | undefined) =>
|
||||||
|
currentEntities?.filter((entity) => entity.id !== id) ?? []
|
||||||
|
)
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
Reference in New Issue
Block a user