Migrate Accounting Service to standalone multi-module Gradle project

Transform ftgo-accounting-service into a self-contained multi-module project:
- Create 6 submodules: domain, persistence, command-handlers, event-handling, restapi, main
- Embed API classes from ftgo-accounting-service-api
- Move existing service files to appropriate submodules
- Migrate to Spring Boot 3.x/Jakarta EE
- Set up contract tests in command-handlers module
- Update Dockerfile, docker-compose.yaml, and build-and-test-all.sh

Co-authored by Claude Code

Author: cer

build-and-test-all.sh

@@ -30,6 +30,7 @@ MIGRATED_SERVICES=(
   "ftgo-order-service"
   "ftgo-consumer-service"
   "ftgo-kitchen-service"
+  "ftgo-accounting-service"
 )
 
 # Publish contract stubs first

docker-compose.yaml

@@ -26,6 +26,15 @@ services:
       POSTGRES_PASSWORD: postgrespw
       POSTGRES_DB: eventuate
 
+  accounting-service-db:
+    image: eventuateio/eventuate-vanilla-postgres:0.21.0.BUILD-SNAPSHOT
+    ports:
+      - "5435:5432"
+    environment:
+      POSTGRES_USER: postgresuser
+      POSTGRES_PASSWORD: postgrespw
+      POSTGRES_DB: eventuate
+
   kafka:
     image: confluentinc/cp-kafka:7.5.0
     ports:
@@ -107,11 +116,27 @@ services:
       EVENTUATE_CDC_READER_READER3_OFFSETSTORAGETOPICNAME: kitchen_schema.cdc_offset_store
       EVENTUATE_CDC_READER_READER3_OUTBOXID: "3"
       EVENTUATE_CDC_READER_READER3_MONITORINGSCHEMA: public
+      # Accounting Service database pipeline
+      EVENTUATE_CDC_PIPELINE_PIPELINE4_TYPE: eventuate-tram
+      EVENTUATE_CDC_PIPELINE_PIPELINE4_READER: reader4
+      EVENTUATE_CDC_PIPELINE_PIPELINE4_EVENTUATEDATABASESCHEMA: public
+
+      # Reader 4 - Accounting Service database
+      EVENTUATE_CDC_READER_READER4_TYPE: postgres-wal
+      EVENTUATE_CDC_READER_READER4_DATASOURCEURL: jdbc:postgresql://accounting-service-db:5432/eventuate
+      EVENTUATE_CDC_READER_READER4_DATASOURCEUSERNAME: postgresuser
+      EVENTUATE_CDC_READER_READER4_DATASOURCEPASSWORD: postgrespw
+      EVENTUATE_CDC_READER_READER4_DATASOURCEDRIVERCLASSNAME: org.postgresql.Driver
+      EVENTUATE_CDC_READER_READER4_LEADERSHIPLOCKPATH: /eventuate/cdc/leader/accounting
+      EVENTUATE_CDC_READER_READER4_OFFSETSTORAGETOPICNAME: accounting_schema.cdc_offset_store
+      EVENTUATE_CDC_READER_READER4_OUTBOXID: "4"
+      EVENTUATE_CDC_READER_READER4_MONITORINGSCHEMA: public
     depends_on:
       - kafka
       - order-service-db
       - consumer-service-db
       - kitchen-service-db
+      - accounting-service-db
 
   ftgo-consumer-service:
     build:
@@ -166,3 +191,21 @@ services:
       - kitchen-service-db
       - kafka
       - cdc-service
+
+  ftgo-accounting-service:
+    build:
+      context: ./ftgo-accounting-service
+      args:
+        baseImageVersion: "0.21.0.BUILD-SNAPSHOT"
+    ports:
+      - "8084:8080"
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:postgresql://accounting-service-db:5432/eventuate
+      SPRING_DATASOURCE_USERNAME: postgresuser
+      SPRING_DATASOURCE_PASSWORD: postgrespw
+      SPRING_DATASOURCE_DRIVER_CLASS_NAME: org.postgresql.Driver
+      EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:29092
+    depends_on:
+      - accounting-service-db
+      - kafka
+      - cdc-service

docs/features/upgrade-to-2026/upgrade-to-2026-plan.md

@@ -344,64 +344,64 @@ Migrate the Accounting Service to complete the CreateOrderSaga flow.
 
 The `ftgo-accounting-service/` directory already exists. Transform it into a multi-module project:
 
-- [ ] Create `settings.gradle` with pluginManagement block and subproject includes:
-  - [ ] `accounting-service-domain` - Core domain model (Account) and events
-  - [ ] `accounting-service-persistence` - JPA repositories and orm.xml
-  - [ ] `accounting-service-command-handlers` - Handles commands from Order Service
-  - [ ] `accounting-service-event-handling` - Consumes Consumer events + consumer contract tests
-  - [ ] `accounting-service-restapi` - REST controllers
-  - [ ] `accounting-service-main` - Spring Boot application, component tests
-- [ ] Create `gradle.properties` with version properties
-- [ ] Create root `build.gradle` with common configuration
-- [ ] Create each subproject's `build.gradle`
-- [ ] Generate Gradle wrapper using `gradle wrapper`
-- [ ] Configure `java-test-fixtures` plugin in domain module
-- [ ] Verify `./gradlew tasks` runs successfully
+- [x] Create `settings.gradle` with pluginManagement block and subproject includes:
+  - [x] `accounting-service-domain` - Core domain model (Account) and events
+  - [x] `accounting-service-persistence` - JPA repositories and orm.xml
+  - [x] `accounting-service-command-handlers` - Handles commands from Order Service
+  - [x] `accounting-service-event-handling` - Consumes Consumer events + consumer contract tests
+  - [x] `accounting-service-restapi` - REST controllers
+  - [x] `accounting-service-main` - Spring Boot application, component tests
+- [x] Create `gradle.properties` with version properties
+- [x] Create root `build.gradle` with common configuration
+- [x] Create each subproject's `build.gradle`
+- [x] Generate Gradle wrapper using `gradle wrapper`
+- [x] Configure `java-test-fixtures` plugin in domain module
+- [x] Verify `./gradlew tasks` runs successfully
 
 ### Task 4.2: Embed API and shared classes into Accounting Service subprojects
 
-- [ ] Copy shared classes into `accounting-service-domain/src/main/java/`
-- [ ] Copy API classes from `ftgo-accounting-service-api/` into appropriate subprojects
-- [ ] Copy Order Service API classes into `accounting-service-command-handlers/`
-- [ ] Copy Consumer Service API classes into `accounting-service-event-handling/`
-- [ ] Update subproject dependencies
+- [x] Copy shared classes into `accounting-service-domain/src/main/java/`
+- [x] Copy API classes from `ftgo-accounting-service-api/` into appropriate subprojects
+- [x] Copy Order Service API classes into `accounting-service-command-handlers/`
+- [x] Copy Consumer Service API classes into `accounting-service-event-handling/`
+- [x] Update subproject dependencies
 
 ### Task 4.3: Move source files to subprojects and migrate to Spring Boot 3.x / Jakarta EE
 
-- [ ] Move domain classes to `accounting-service-domain/`
-- [ ] Move persistence classes to `accounting-service-persistence/`
-- [ ] Move command handlers to `accounting-service-command-handlers/`
-- [ ] Move event handling to `accounting-service-event-handling/`
-- [ ] Move REST controllers to `accounting-service-restapi/`
-- [ ] Move main class to `accounting-service-main/`
-- [ ] Perform `javax.*` to `jakarta.*` migration
-- [ ] Update for Spring Boot 3.x compatibility
+- [x] Move domain classes to `accounting-service-domain/`
+- [x] Move persistence classes to `accounting-service-persistence/`
+- [x] Move command handlers to `accounting-service-command-handlers/`
+- [x] Move event handling to `accounting-service-event-handling/`
+- [x] Move REST controllers to `accounting-service-restapi/`
+- [x] Move main class to `accounting-service-main/`
+- [x] Perform `javax.*` to `jakarta.*` migration
+- [x] Update for Spring Boot 3.x compatibility
 
 ### Task 4.4: Migrate Accounting Service tests to appropriate subprojects
 
-- [ ] Move unit tests alongside source files in each subproject
-- [ ] Update JUnit 4 to JUnit 5
-- [ ] Update `javax.*` to `jakarta.*` imports
-- [ ] Verify `./gradlew test` passes
-- [ ] Create integration tests in `accounting-service-main/src/integrationTest/`
-- [ ] Verify `./gradlew integrationTest` passes
-- [ ] Create component tests in `accounting-service-main/src/componentTest/`
-- [ ] Verify `./gradlew componentTest` passes
+- [x] Move unit tests alongside source files in each subproject
+- [x] Update JUnit 4 to JUnit 5
+- [x] Update `javax.*` to `jakarta.*` imports
+- [x] Verify `./gradlew test` passes
+- [x] Create integration tests in `accounting-service-main/src/integrationTest/`
+- [x] Verify `./gradlew integrationTest` passes
+- [ ] Create component tests in `accounting-service-main/src/componentTest/` (deferred)
+- [ ] Verify `./gradlew componentTest` passes (deferred)
 
-### Task 4.5: Embed contract tests in accounting-service-event-handling
+### Task 4.5: Embed contract tests in accounting-service-command-handlers
 
-- [ ] Copy contracts from `ftgo-accounting-service-contracts/` to `accounting-service-event-handling/src/contractTest/`
-- [ ] Configure Spring Cloud Contract 4.x
-- [ ] Configure stub publishing
-- [ ] Verify `./gradlew contractTest` passes
+- [x] Copy contracts from `ftgo-accounting-service-contracts/` to `accounting-service-command-handlers/src/contractTest/`
+- [x] Configure Spring Cloud Contract 4.x
+- [x] Configure stub publishing
+- [x] Verify `./gradlew contractTest` passes
 
 ### Task 4.6: Update Accounting Service Dockerfile and infrastructure
 
-- [ ] Update `ftgo-accounting-service/Dockerfile` for Java 17
-- [ ] Add `accounting-service-db` to root `docker-compose.yaml`
-- [ ] Add `ftgo-accounting-service` to root `docker-compose.yaml`
-- [ ] Update `build-and-test-all.sh` to include Accounting Service
-- [ ] Verify Docker build and service startup
+- [x] Update `ftgo-accounting-service/Dockerfile` for multi-module structure
+- [x] Add `accounting-service-db` to root `docker-compose.yaml`
+- [x] Add `ftgo-accounting-service` to root `docker-compose.yaml`
+- [x] Update `build-and-test-all.sh` to include Accounting Service
+- [ ] Verify Docker build and service startup (deferred)
 
 ### Task 4.7: Add end-to-end test for complete CreateOrderSaga happy path
 
@@ -418,10 +418,10 @@ The `ftgo-accounting-service/` directory already exists. Transform it into a mul
 
 ### Task 4.8: Verify full saga integration
 
-- [ ] Run `./build-and-test-all.sh` and verify all four services build
-- [ ] Verify Docker Compose starts all services
-- [ ] Verify end-to-end test demonstrates complete saga flow
-- [ ] Commit all changes for Steel Thread 4
+- [x] Run `./build-and-test-all.sh` and verify all four services build
+- [ ] Verify Docker Compose starts all services (deferred)
+- [ ] Verify end-to-end test demonstrates complete saga flow (deferred)
+- [x] Commit all changes for Steel Thread 4
 
 ---
 

ftgo-accounting-service/Dockerfile

@@ -1,3 +1,3 @@
 ARG baseImageVersion
 FROM eventuateio/eventuate-examples-docker-images-spring-example-base-image:$baseImageVersion
-COPY build/libs/ftgo-accounting-service.jar service.jar
+COPY accounting-service-main/build/libs/accounting-service-main-*.jar service.jar

ftgo-accounting-service/accounting-service-command-handlers/build.gradle

@@ -0,0 +1,59 @@
+plugins {
+    id 'org.springframework.cloud.contract' version "$springCloudContractDependenciesVersion"
+    id 'maven-publish'
+}
+
+sourceSets {
+    contractTest {
+        java {
+            srcDir 'src/contractTest/java'
+        }
+        resources {
+            srcDir 'src/contractTest/resources'
+        }
+    }
+}
+
+dependencies {
+    api project(':accounting-service-domain')
+
+    implementation 'io.eventuate.tram.sagas:eventuate-tram-sagas-spring-participant'
+    implementation 'io.eventuate.tram.sagas:eventuate-tram-sagas-event-sourcing-support'
+    implementation 'org.springframework:spring-context'
+
+    contractTestImplementation project(':accounting-service-domain')
+    contractTestImplementation 'org.springframework.boot:spring-boot-starter-test'
+    contractTestImplementation 'org.springframework.cloud:spring-cloud-starter-contract-verifier'
+    contractTestImplementation 'io.eventuate.tram.core:eventuate-tram-spring-in-memory'
+    contractTestImplementation 'io.eventuate.tram.testingsupport.springcloudcontract:eventuate-tram-spring-testing-support-cloud-contract'
+}
+
+contracts {
+    testFramework = org.springframework.cloud.contract.verifier.config.TestFramework.JUNIT5
+    contractsDslDir = file("${projectDir}/src/contractTest/resources/contracts")
+    baseClassForTests = "net.chrisrichardson.ftgo.accountingservice.contracts.MessagingBase"
+}
+
+contractTest {
+    useJUnitPlatform()
+}
+
+tasks.named('processContractTestResources') {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
+// Publish stubs for consumer contract testing
+publishing {
+    publications {
+        stubs(MavenPublication) {
+            artifactId = "ftgo-accounting-service"
+            artifact verifierStubsJar
+        }
+    }
+    repositories {
+        maven {
+            name = 'local'
+            url = "${rootProject.projectDir}/../build/repo"
+        }
+    }
+}

ftgo-accounting-service/accounting-service-command-handlers/src/contractTest/java/net/chrisrichardson/ftgo/accountingservice/contracts/MessagingBase.java

@@ -0,0 +1,33 @@
+package net.chrisrichardson.ftgo.accountingservice.contracts;
+
+import io.eventuate.tram.messaging.producer.MessageProducer;
+import io.eventuate.tram.spring.testing.cloudcontract.EnableEventuateTramContractVerifier;
+import net.chrisrichardson.ftgo.common.CommonConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import static io.eventuate.tram.commands.consumer.CommandHandlerReplyBuilder.withSuccess;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
+                classes = {MessagingBase.TestConfig.class})
+public abstract class MessagingBase {
+
+    private static final String SAGA_REPLY_CHANNEL = "net.chrisrichardson.ftgo.orderservice.sagas.createorder.CreateOrderSaga-reply";
+
+    @Configuration
+    @EnableAutoConfiguration
+    @EnableEventuateTramContractVerifier
+    @Import(CommonConfiguration.class)
+    public static class TestConfig { }
+
+    @Autowired
+    private MessageProducer messageProducer;
+
+    // Reply triggers - called by contract tests for saga replies
+    protected void authorizeReply() {
+        messageProducer.send(SAGA_REPLY_CHANNEL, withSuccess());
+    }
+}

ftgo-accounting-service/accounting-service-command-handlers/src/contractTest/resources/contracts/order-service/replies/authorizeReply.groovy

@@ -0,0 +1,16 @@
+package contracts.replies
+
+org.springframework.cloud.contract.spec.Contract.make {
+    label 'authorize'
+    input {
+        triggeredBy('authorizeReply()')
+    }
+    outputMessage {
+        sentTo('net.chrisrichardson.ftgo.orderservice.sagas.createorder.CreateOrderSaga-reply')
+        body('''{}''')
+        headers {
+            header('reply_type', 'io.eventuate.tram.commands.common.Success')
+            header('reply_outcome-type', 'SUCCESS')
+        }
+    }
+}

ftgo-accounting-service/accounting-service-command-handlers/src/main/java/net/chrisrichardson/ftgo/accountservice/api/AccountDisabledReply.java

@@ -0,0 +1,4 @@
+package net.chrisrichardson.ftgo.accountservice.api;
+
+public class AccountDisabledReply {
+}

ftgo-accounting-service/accounting-service-command-handlers/src/main/java/net/chrisrichardson/ftgo/accountservice/api/AccountingServiceChannels.java

@@ -0,0 +1,8 @@
+package net.chrisrichardson.ftgo.accountservice.api;
+
+
+public class AccountingServiceChannels {
+
+  public static String accountingServiceChannel = "accountingService";
+
+}