Flyway migration to separate module, it's huge

Author: posadskiy

Answer.class

@@ -31,11 +31,8 @@ public void createFrame() {
         setContentPane(content);
 
         // User content goes into CENTER by default (BorderLayout.CENTER)
-        JButton button = new JButton();
-button.setIcon(new ImageIcon("icon.png"));
-button.setText("Text");
-button.setIconTextGap(5);
-add(button);
+        JTextField field = new JTextField();
+add(field);
 
         setTitle(headerText);
         setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);

Answer.java

@@ -38,6 +38,8 @@ results of their code in a visual, interactive environment.
 The project follows a multi-module Maven architecture:
 
 - **`domain`**: Shared DTOs, request/response models, and domain entities used across modules
+- **`flyway`**: Database migrations (SQL only); consumed by the service classpath and by the Flyway Docker image / K8s
+  Job
 - **`service`**: Spring Boot REST API backend providing:
     - User authentication and management
     - Lesson and task management
@@ -99,14 +101,15 @@ mvn clean package -pl desktop-client -am
 ```
 
 This produces a runnable JAR file:
-- `desktop-client/target/desktop-client-1.0-SNAPSHOT.jar`
+
+- `desktop-client/target/desktop-client-<version>.jar`
 
 ### Step 3: Run Desktop Client
 
 Launch the desktop application:
 
 ```bash
-java -jar desktop-client/target/desktop-client-1.0-SNAPSHOT.jar
+java -jar desktop-client/target/desktop-client-<version>.jar
 ```
 
 The client automatically connects to the backend service at `http://localhost:8080`.
@@ -138,13 +141,13 @@ The client automatically connects to the backend service at `http://localhost:80
 
 #### Backend Service
 
-| Variable                            | Description                 | Default                                                   |
-|-------------------------------------|-----------------------------|-----------------------------------------------------------|
-| `JAVA_SWING_TUTOR_DB_URL`           | PostgreSQL connection URL   | `jdbc:postgresql://localhost:5450/java_swing_tutor`       |
-| `JAVA_SWING_TUTOR_DB_USER`          | Database username           | `java_swing_tutor`                                        |
-| `JAVA_SWING_TUTOR_DB_PASSWORD`      | Database password           | `java_swing_tutor`                                        |
-| `JAVA_SWING_TUTOR_SERVICE_PORT`      | Service port                | `8080`                                                    |
-| `SPRING_PROFILES_ACTIVE`             | Spring profile (dev/docker) | `dev`                                                     |
+| Variable                             | Description                 | Default                                             |
+|--------------------------------------|-----------------------------|-----------------------------------------------------|
+| `JAVA_SWING_TUTOR_DATABASE_URL`      | PostgreSQL connection URL   | `jdbc:postgresql://localhost:5450/java_swing_tutor` |
+| `JAVA_SWING_TUTOR_DATABASE_USER`     | Database username           | `java_swing_tutor`                                  |
+| `JAVA_SWING_TUTOR_DATABASE_PASSWORD` | Database password           | `java_swing_tutor`                                  |
+| `JAVA_SWING_TUTOR_SERVICE_PORT`      | Service port                | `8080`                                              |
+| `SPRING_PROFILES_ACTIVE`             | Spring profile (dev/docker) | `dev`                                               |
 
 ### Docker Compose Configuration
 
@@ -185,7 +188,7 @@ This allows for faster iteration during development with hot-reload capabilities
 mvn clean package -pl desktop-client -am
 
 # Run the client (connects to backend at http://localhost:8080)
-java -jar desktop-client/target/desktop-client-1.0-SNAPSHOT.jar
+java -jar desktop-client/target/desktop-client-<version>.jar
 ```
 
 ## 📁 Project Structure
@@ -207,14 +210,16 @@ java-swing-tutor/
 │           ├── infrastructure/ # JPA repositories and external clients
 │           └── web/          # REST controllers
 │   └── src/main/resources/
-│       ├── application.yml   # Spring Boot configuration
-│       └── db/migration/     # Flyway database migrations
-│           ├── common/      # Schema and common data
-│           ├── lesson/      # Base lesson data
-│           ├── lesson_en/   # English translations
-│           ├── lesson_ru/   # Russian translations
-│           ├── lesson_es/   # Spanish translations
-│           └── lesson_it/   # Italian translations
+│       └── application.yml   # Spring Boot configuration
+│
+├── flyway/                   # Database migrations (separate from service)
+│   └── src/main/resources/db/migration/
+│       ├── common/           # Schema and common data
+│       ├── lesson/           # Base lesson data
+│       ├── lesson_en/        # English translations
+│       ├── lesson_ru/        # Russian translations
+│       ├── lesson_es/        # Spanish translations
+│       └── lesson_it/        # Italian translations
 │
 ├── desktop-client/            # Swing desktop UI client
 │   └── src/main/java/
@@ -228,9 +233,10 @@ java-swing-tutor/
 │       └── i18n/            # Internationalization files
 │
 ├── deployment/                # Shared cluster config and scripts (see deployment/README.md)
+├── flyway/                    # Migrations module + Flyway image and K8s Job (flyway/deployment/)
 ├── website/                   # Next.js website (and website/deployment/ for deploy)
 ├── docker-compose.yml         # Docker services configuration
-├── service/Dockerfile        # Service container image (build context: repo root)
+├── service/Dockerfile         # Service container image (build context: repo root)
 └── pom.xml                   # Root Maven POM
 ```
 
@@ -266,8 +272,9 @@ The backend service exposes REST APIs at `http://localhost:8080/api`:
 
 ## 🗄️ Database
 
-The application uses PostgreSQL with Flyway for database migrations. All migrations are located in:
-- `service/src/main/resources/db/migration/`
+The application uses PostgreSQL with Flyway for database migrations. All migrations are in the **`flyway`** module:
+
+- `flyway/src/main/resources/db/migration/`
 
 The database schema includes:
 
@@ -326,17 +333,24 @@ docker compose logs -f service
 
 ## ☸️ Kubernetes deployment
 
-**Flow:** deploy common cluster config from the **parent** `deployment/`, then **build images and deploy from each module** (website, service). There is no central “build and push all”; each module builds and pushes its own image, then deploys. See **[deployment/README.md](deployment/README.md)** for layout and backend prerequisites.
+**Flow:** deploy common cluster config from the **parent** `deployment/`, then **build images and deploy from each
+module** (website, flyway, service). Flyway and service are separate: deploy Flyway first (migrations), then the backend
+service. There is no central “build and push all”; each module builds and pushes its own image, then deploys. See *
+*[deployment/README.md](deployment/README.md)** for layout and prerequisites.
 
-**Step 1** applies: namespace, Docker Hub secret, ConfigMap, Secrets, Traefik Let's Encrypt, Traefik middleware, and Traefik IngressRoute (routing for java-swing.com and api.java-swing.com). Step 2 deploys the website and backend so traffic can reach them.
 
 ```bash
 # 1. Deploy common cluster config from parent (namespace, secret, ConfigMap, Secrets, Traefik IngressRoute + middleware)
 ./deployment/scripts/k3s/deploy-to-k3s.sh
 
-# 2. Build, push, and deploy each module from its own folder
+# 2. Website (from website/)
 cd website && ./deployment/scripts/build-and-push.sh <version> && ./deployment/scripts/deploy.sh <version>
-cd ../service && ./deployment/scripts/build-and-push.sh <version> && ./deployment/scripts/deploy.sh <version>
+
+# 3. Flyway migrations (from flyway/) — run before the backend service
+cd flyway && ./deployment/scripts/build-and-push.sh <version> && ./deployment/scripts/deploy.sh <version>
+
+# 4. Backend service (from service/)
+cd service && ./deployment/scripts/build-and-push.sh <version> && ./deployment/scripts/deploy.sh <version>
 ```
 
 ## 📚 Learning Path

README.md

@@ -4,4 +4,5 @@ metadata:
   name: java-swing-tutor-config
   namespace: java-swing-tutor
 data:
-  db.url: "jdbc:postgresql://postgres-service:5432/java_swing_tutor"
+  db.url: "jdbc:postgresql://shared-posadskiy.e.aivencloud.com:25370/java_swing_tutor_db?sslmode=require"
+  db.user: "avnadmin"

deployment/configmap.yaml

@@ -7,7 +7,7 @@ set -e
 # Deploy backend:  ./service/deployment/scripts/deploy.sh <version>
 #
 # Required env: DOCKERHUB_USERNAME, DOCKERHUB_TOKEN; K3S_SERVER_IP, K3S_SSH_USER (see setup-env.sh).
-# For backend secrets: JAVA_SWING_TUTOR_DB_PASSWORD etc. (see secrets.yaml).
+# For backend secrets: JAVA_SWING_TUTOR_DATABASE_PASSWORD etc. (see secrets.yaml).
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 DEPLOYMENT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"

deployment/scripts/k3s/deploy-to-k3s.sh

@@ -22,7 +22,7 @@ REQUIRED_VARS=(
 
 # Optional for full deployment (backend + DB secrets)
 OPTIONAL_VARS=(
-  "JAVA_SWING_TUTOR_DB_PASSWORD"
+  "JAVA_SWING_TUTOR_DATABASE_PASSWORD"
 )
 
 MISSING_VARS=()

deployment/scripts/k3s/setup-env.sh

@@ -5,6 +5,4 @@ metadata:
   namespace: java-swing-tutor
 type: Opaque
 stringData:
-  db.user: "${JAVA_SWING_TUTOR_DB_USER:-java_swing_tutor}"
-  # Set JAVA_SWING_TUTOR_DB_PASSWORD (or leave placeholder and apply secret manually)
-  db.password: "${JAVA_SWING_TUTOR_DB_PASSWORD:-change-me}"
+  db.password: "${JAVA_SWING_TUTOR_DATABASE_PASSWORD_PROD}"

deployment/secrets.yaml

@@ -25,7 +25,7 @@ services:
       FLYWAY_PASSWORD: java_swing_tutor
       FLYWAY_LOCATIONS: filesystem:/flyway/sql
     volumes:
-      - ./service/src/main/resources/db/migration:/flyway/sql:ro
+      - ./flyway/src/main/resources/db/migration:/flyway/sql:ro
 
   service:
     build:
@@ -37,9 +37,9 @@ services:
     ports:
       - "8080:8080"
     environment:
-      JAVA_SWING_TUTOR_DB_URL: jdbc:postgresql://db:5432/java_swing_tutor
-      JAVA_SWING_TUTOR_DB_USER: java_swing_tutor
-      JAVA_SWING_TUTOR_DB_PASSWORD: java_swing_tutor
+      JAVA_SWING_TUTOR_DATABASE_URL: jdbc:postgresql://db:5432/java_swing_tutor
+      JAVA_SWING_TUTOR_DATABASE_USER: java_swing_tutor
+      JAVA_SWING_TUTOR_DATABASE_PASSWORD: java_swing_tutor
       JAVA_SWING_TUTOR_SERVICE_PORT: 8080
       SPRING_PROFILES_ACTIVE: docker
       AUTH_SERVICE_BASE_URL: http://auth-service:8100

docker-compose.yml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.posadskiy</groupId>
         <artifactId>java-swing-tutor</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>domain</artifactId>

domain/pom.xml

@@ -4,12 +4,13 @@
 
     <groupId>com.posadskiy</groupId>
     <artifactId>java-swing-tutor</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <packaging>pom</packaging>
     <name>java-swing-tutor</name>
 
     <modules>
         <module>domain</module>
+        <module>flyway</module>
         <module>service</module>
         <module>desktop-client</module>
     </modules>