Merge pull request #2860 from booklore-app/develop

Merge develop into master for release

Author: acx10

.dockerignore

@@ -0,0 +1,15 @@
+.git
+.github
+.idea
+.vscode
+.angular
+
+booklore-ui/node_modules
+booklore-ui/dist
+booklore-ui/.angular
+booklore-ui/test-results
+
+booklore-api/build/reports
+booklore-api/build/test-results
+
+*.md

.github/FUNDING.yml

@@ -3,7 +3,7 @@
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: booklore
-ko_fi: # Replace with a single Ko-fi username
+ko_fi: bookloredev
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username

.github/pull_request_template.md

@@ -1,59 +1,102 @@
-## 🚀 Pull Request
+## 📝 Description
 
-### 📝 Description
+<!-- Why is this change needed? Explain in your own words. -->
 
-<!-- Provide a clear and concise summary of the changes introduced in this pull request -->
-<!-- Reference related issues using "Fixes #123", "Closes #456", or "Relates to #789" -->
+**Linked Issue:** Fixes #<!-- issue number -->
 
-### 🛠️ Changes Implemented
+> **Required.** Every PR must reference an approved issue. If no issue exists, [open one](https://github.com/booklore-app/booklore/issues/new) and wait for maintainer approval before submitting a PR. Unsolicited PRs without a linked issue will be closed.
 
-<!-- Detail the specific modifications, additions, or removals made in this pull request -->
-- 
+## 🏷️ Type of Change
 
-### 🧪 Testing Strategy
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Enhancement to existing feature
+- [ ] Refactor (no behavior change)
+- [ ] Breaking change (existing functionality affected)
+- [ ] Documentation update
 
-<!-- Describe the testing methodology used to verify the correctness of these changes -->
-<!-- Include testing approach, scenarios covered, and edge cases considered -->
+## 🔧 Changes
 
-### 📸 Visual Changes _(if applicable)_
+<!-- List the specific modifications made -->
+-
 
-<!-- Attach screenshots or videos demonstrating UI/UX modifications -->
+## 🧪 Testing (MANDATORY)
 
+> **PRs without this section filled out will be closed.** "Tests pass" or "Tested locally" is not sufficient. You must provide specifics.
 
----
+**Manual testing steps you performed:**
+<!-- Walk through the exact steps you took to verify your change works. Be specific. -->
+1.
+2.
+3.
+
+**Regression testing:**
+<!-- How did you verify that existing related features still work after your change? -->
+-
+
+**Edge cases covered:**
+<!-- What boundary conditions or unusual inputs did you test? -->
+-
+
+**Test output:**
+<!-- Paste the actual terminal output from running tests. Not "all pass", the real output. -->
+
+<details>
+<summary>Backend test output (<code>./gradlew test</code>)</summary>
+
+```
+PASTE OUTPUT HERE
+```
 
-## ⚠️ Required Pre-Submission Checklist
+</details>
 
-### **Please Read - This Checklist is Mandatory**
+<details>
+<summary>Frontend test output (<code>ng test</code>)</summary>
 
-> **Important Notice:** We've experienced several production bugs recently due to incomplete pre-submission checks. To maintain code quality and prevent issues from reaching production, we're enforcing stricter adherence to this checklist.
->
-> **All checkboxes below must be completed before requesting review.** PRs that haven't completed these requirements will be sent back for completion.
+```
+PASTE OUTPUT HERE
+```
 
-#### **Mandatory Requirements** _(please check ALL boxes)_:
+</details>
+
+## 📸 Screen Recording / Screenshots (MANDATORY)
+
+> Every PR must include a **screen recording or screenshots** showing the change working end-to-end in a running local instance (both backend and frontend). This means you must have actually built, run, and tested the code yourself. PRs without visual proof will be closed without review.
+
+<!-- Attach screen recording or screenshots here -->
+
+---
 
-- [ ] **Code adheres to project style guidelines and conventions**
-- [ ] **Branch synchronized with latest `develop` branch** _(please resolve any merge conflicts)_
-- [ ] **🚨 CRITICAL: Automated unit tests added/updated to cover changes** _(MANDATORY for ALL Spring Boot backend and Angular frontend changes - this is non-negotiable)_
-- [ ] **🚨 CRITICAL: All tests pass locally** _(run `./gradlew test` for Spring Boot backend, and `ng test` for Angular frontend - NO EXCEPTIONS)_
-- [ ] **🚨 CRITICAL: Manual testing completed in local development environment** _(verify your changes work AND no existing functionality is broken - test related features thoroughly)_
-- [ ] **Flyway migration versioning follows correct sequence** _(if database schema was modified)_
-- [ ] **Documentation PR submitted to [booklore-docs](https://github.com/booklore-app/booklore-docs)** _(required for features or enhancements that introduce user-facing or visual changes)_
+## ✅ Pre-Submission Checklist
 
-#### **Why This Matters:**
+> **All boxes must be checked before requesting review.** Incomplete PRs will be closed without review. No exceptions.
 
-Recent production incidents have been traced back to:
+- [ ] This PR is linked to an approved issue
+- [ ] Code follows project style guidelines and conventions
+- [ ] Branch is up to date with `develop` (merge conflicts resolved)
+- [ ] I ran the full stack locally (backend + frontend + database) and verified the change works
+- [ ] Automated tests added or updated to cover changes (backend **and** frontend)
+- [ ] All tests pass locally and output is pasted above
+- [ ] Screen recording or screenshots are attached above proving the change works
+- [ ] PR is a single focused change (one bug fix OR one feature, not multiple unrelated changes)
+- [ ] PR is reasonably scoped (PRs over 1000+ changed lines will be closed, split into smaller PRs)
+- [ ] No unsolicited refactors, cleanups, or "improvements" are bundled in
+- [ ] Flyway migration versioning is correct _(if schema was modified)_
+- [ ] Documentation PR submitted to [booklore-docs](https://github.com/booklore-app/booklore-docs) _(if user-facing changes)_
 
-- **Incomplete testing coverage (especially backend)**
-- Merge conflicts not resolved before merge
-- Missing documentation for new features
+### 🤖 AI-Assisted Contributions
 
-**Backend changes without tests will not be accepted.** By completing this checklist thoroughly, you're helping maintain the quality and stability of Booklore for all users.
+> **If any part of this PR was generated or assisted by AI tools (Copilot, Claude, ChatGPT, etc.), all items below are mandatory.** You are fully responsible for every line you submit. "The AI wrote it" is not an excuse, and AI-generated PRs that clearly haven't been reviewed are the #1 reason PRs get closed.
 
-**Note to Reviewers:** Please verify the checklist is complete before beginning your review. If items are unchecked, kindly ask the contributor to complete them first.
+- [ ] I have read and understand every line of this PR and can explain any part of it during review
+- [ ] I personally ran the code and verified it works (not just trusted the AI's output)
+- [ ] PR is scoped to a single logical change, not a dump of everything the AI suggested
+- [ ] Tests validate actual behavior, not just coverage (AI-generated tests often assert nothing meaningful)
+- [ ] No dead code, placeholder comments, `TODO`s, or unused scaffolding left behind by AI
+- [ ] I did not submit refactors, style changes, or "improvements" the AI suggested beyond the scope of the issue
 
 ---
 
-### 💬 Additional Context _(optional)_
+## 💬 Additional Context _(optional)_
 
-<!-- Provide any supplementary information, implementation considerations, or discussion points for reviewers -->
+<!-- Any extra information or discussion points for reviewers -->

.github/release-drafter.yml

@@ -27,6 +27,9 @@ categories:
     labels:
       - 'bug'
       - 'fix'
+  - title: '⚡ Performance'
+    labels:
+      - 'performance'
   - title: '🛠️ Refactoring & Maintenance'
     labels:
       - 'refactor'

.github/workflows/develop-pipeline.yml

@@ -31,10 +31,10 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v6
 
-      - name: Set Up JDK 21
+      - name: Set Up JDK 25
         uses: actions/setup-java@v5
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'temurin'
           cache: gradle
 
@@ -85,7 +85,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Set Up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22'
           cache: 'npm'
@@ -140,15 +140,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      # ----------------------------------------
-      # Environment setup
-      # ----------------------------------------
-      - name: Set Up QEMU for Multi-Arch Builds
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set Up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       # ----------------------------------------
       # Image tagging
       # ----------------------------------------
@@ -166,6 +157,58 @@ jobs:
           echo "image_tag=$image_tag" >> $GITHUB_ENV
           echo "Image tag: $image_tag"
 
+      # ----------------------------------------
+      # Native Angular build
+      # ----------------------------------------
+      - name: Set Up Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: '22'
+          cache: 'npm'
+          cache-dependency-path: booklore-ui/package-lock.json
+
+      - name: Install Frontend Dependencies
+        working-directory: ./booklore-ui
+        run: npm ci --force
+
+      - name: Build Angular App
+        working-directory: ./booklore-ui
+        run: npx ng build --configuration=production
+
+      # ----------------------------------------
+      # Native Gradle build
+      # ----------------------------------------
+      - name: Set Up JDK 25
+        uses: actions/setup-java@v5
+        with:
+          java-version: '25'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Copy Angular Dist to Spring Boot Resources
+        run: cp -r booklore-ui/dist/booklore/browser/. booklore-api/src/main/resources/static/
+
+      - name: Inject Version into application.yaml
+        env:
+          APP_VERSION: ${{ env.image_tag }}
+        run: |
+          sudo wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v4.52.2/yq_linux_amd64
+          sudo chmod +x /usr/local/bin/yq
+          yq eval '.app.version = strenv(APP_VERSION)' -i booklore-api/src/main/resources/application.yaml
+
+      - name: Build Spring Boot JAR
+        working-directory: ./booklore-api
+        run: ./gradlew clean build -x test --no-daemon --parallel --build-cache
+
+      # ----------------------------------------
+      # Environment setup
+      # ----------------------------------------
+      - name: Set Up QEMU for Multi-Arch Builds
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set Up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       # ----------------------------------------
       # Docker login (pushes & internal PRs only)
       # ----------------------------------------
@@ -192,6 +235,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
+          file: Dockerfile.ci
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |

.github/workflows/master-pipeline.yml

@@ -43,10 +43,10 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v6
 
-      - name: Set Up JDK 21
+      - name: Set Up JDK 25
         uses: actions/setup-java@v5
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'temurin'
           cache: gradle
 
@@ -97,7 +97,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Set Up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22'
           cache: 'npm'
@@ -234,10 +234,57 @@ jobs:
           echo "bump=$bump" >> $GITHUB_ENV
           echo "new_tag=$next_version" >> $GITHUB_ENV
 
+      # ----------------------------------------
+      # Native Angular build
+      # ----------------------------------------
+      - name: Set Up Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: '22'
+          cache: 'npm'
+          cache-dependency-path: booklore-ui/package-lock.json
+
+      - name: Install Frontend Dependencies
+        working-directory: ./booklore-ui
+        run: npm ci --force
+
+      - name: Build Angular App
+        working-directory: ./booklore-ui
+        run: npx ng build --configuration=production
+
+      # ----------------------------------------
+      # Native Gradle build
+      # ----------------------------------------
+      - name: Set Up JDK 25
+        uses: actions/setup-java@v5
+        with:
+          java-version: '25'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Copy Angular Dist to Spring Boot Resources
+        run: cp -r booklore-ui/dist/booklore/browser/. booklore-api/src/main/resources/static/
+
+      - name: Inject Version into application.yaml
+        env:
+          APP_VERSION: ${{ env.new_tag }}
+        run: |
+          sudo wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v4.52.2/yq_linux_amd64
+          sudo chmod +x /usr/local/bin/yq
+          yq eval '.app.version = strenv(APP_VERSION)' -i booklore-api/src/main/resources/application.yaml
+
+      - name: Build Spring Boot JAR
+        working-directory: ./booklore-api
+        run: ./gradlew clean build -x test --no-daemon --parallel --build-cache
+
+      # ----------------------------------------
+      # Docker build & push
+      # ----------------------------------------
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
           context: .
+          file: Dockerfile.ci
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |

.gitignore

@@ -45,4 +45,4 @@ local-scripts/
 ### Dev config, books, and data ###
 booklore-ui/test-results/
 booklore-api/src/main/resources/application-local.yaml
-/shared/
+/shared/