chore: backend domains

.github/workflows/ci-backend.yml

@@ -7,30 +7,25 @@
 # documentation.
 
 name: Backend Java CI with Maven
-
+
+defaults:
+  run:
+    working-directory: backend
+
 on:
   push:
     paths:
       - 'backend/**'
-      - 'preload/**'
     branches: [ "main" ]
   pull_request:
     paths:
       - 'backend/**'
-      - 'preload/**'
     branches: [ "main" ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        directory: ['backend', 'preload']
-
-    defaults:
-      run:
-        working-directory: ${{ matrix.directory }}
 
     steps:
     - uses: actions/checkout@v4
@@ -48,7 +43,7 @@ jobs:
     - name: Create container image
       if: github.ref == 'refs/heads/main'
       env:
-        IMAGE_ID: ghcr.io/${{ github.repository }}/${{ matrix.directory }}
+        IMAGE_ID: ghcr.io/${{ github.repository }}/backend
         VERSION: main
       run: |
         # Convert to lowercase
@@ -59,8 +54,3 @@ jobs:
           -Dspring-boot.build-image.imageName=$IMAGE_ID:$VERSION
 
         docker push $IMAGE_ID:$VERSION
-    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-    - name: Update dependency graph
-      uses: advanced-security/maven-dependency-submission-action@v4
-      with:
-        directory: ${{ matrix.directory }}

.github/workflows/ci-sfera-mock.yml

@@ -54,8 +54,3 @@ jobs:
           -Dspring-boot.build-image.imageName=$IMAGE_ID:$VERSION
 
         docker push $IMAGE_ID:$VERSION
-    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-    - name: Update dependency graph
-      uses: advanced-security/maven-dependency-submission-action@v4
-      with:
-        directory: sfera-mock

backend/pom.xml

@@ -29,6 +29,7 @@
 	<properties>
 		<java.version>21</java.version>
 		<kotlin.version>2.0.21</kotlin.version>
+		<spring-modulith.version>1.3.0</spring-modulith.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -63,6 +64,10 @@
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-stdlib</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.modulith</groupId>
+			<artifactId>spring-modulith-starter-core</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springdoc</groupId>
@@ -117,8 +122,25 @@
 			<artifactId>postgresql</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.modulith</groupId>
+			<artifactId>spring-modulith-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.modulith</groupId>
+				<artifactId>spring-modulith-bom</artifactId>
+				<version>${spring-modulith.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<build>
 		<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
 		<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>

backend/src/main/kotlin/ch/sbb/backend/infrastructure/configuration/OpenApiConfig.kt → backend/src/main/kotlin/ch/sbb/backend/common/OpenApiConfig.kt

@@ -1,4 +1,4 @@
-package ch.sbb.backend.infrastructure.configuration
+package ch.sbb.backend.common
 
 import io.swagger.v3.oas.models.Components
 import io.swagger.v3.oas.models.OpenAPI

backend/src/main/kotlin/ch/sbb/backend/application/RequestLogger.kt → backend/src/main/kotlin/ch/sbb/backend/common/RequestLogger.kt

@@ -1,4 +1,4 @@
-package ch.sbb.backend.application
+package ch.sbb.backend.common
 
 import jakarta.servlet.http.HttpServletRequest
 import org.slf4j.Logger
@@ -7,7 +7,6 @@ import org.slf4j.event.Level
 import org.springframework.http.HttpHeaders
 import org.springframework.util.StopWatch
 
-
 class RequestLogger(
     private val stopWatch: StopWatch,
     private val level: Level

backend/src/main/kotlin/ch/sbb/backend/application/RequestLoggingFilter.kt → backend/src/main/kotlin/ch/sbb/backend/common/RequestLoggingFilter.kt

@@ -1,4 +1,4 @@
-package ch.sbb.backend.application
+package ch.sbb.backend.common
 
 import jakarta.servlet.Filter
 import jakarta.servlet.FilterChain

backend/src/main/kotlin/ch/sbb/backend/infrastructure/configuration/WebSecurityConfig.kt → backend/src/main/kotlin/ch/sbb/backend/common/WebSecurityConfig.kt

@@ -1,4 +1,4 @@
-package ch.sbb.backend.infrastructure.configuration
+package ch.sbb.backend.common
 
 import com.nimbusds.jose.proc.SecurityContext
 import com.nimbusds.jwt.proc.DefaultJWTProcessor
@@ -17,7 +17,6 @@ import org.springframework.security.oauth2.server.resource.authentication.JwtAut
 import org.springframework.security.oauth2.server.resource.authentication.JwtGrantedAuthoritiesConverter
 import org.springframework.security.web.SecurityFilterChain
 
-
 @Configuration
 @EnableWebSecurity
 class WebSecurityConfig {
@@ -33,7 +32,7 @@ class WebSecurityConfig {
     @Bean
     fun filterChain(http: HttpSecurity): SecurityFilterChain {
         http {
-            authorizeRequests {
+            authorizeHttpRequests {
                 authorize("/swagger-ui/**", permitAll)
                 authorize("/v3/api-docs/**", permitAll)
                 authorize("/actuator/health/**", permitAll)

backend/src/main/kotlin/ch/sbb/backend/application/TenantContext.kt → backend/src/main/kotlin/ch/sbb/backend/logging/application/TenantContext.kt

@@ -1,6 +1,6 @@
-package ch.sbb.backend.application
+package ch.sbb.backend.logging.application
 
-import ch.sbb.backend.domain.tenancy.TenantId
+import ch.sbb.backend.logging.domain.TenantId
 import org.springframework.security.core.context.SecurityContextHolder
 import org.springframework.security.oauth2.jwt.Jwt
 

backend/src/main/kotlin/ch/sbb/backend/application/rest/LogEntryRequest.kt → backend/src/main/kotlin/ch/sbb/backend/logging/application/rest/LogEntryRequest.kt

@@ -1,5 +1,7 @@
-package ch.sbb.backend.application.rest
+package ch.sbb.backend.logging.application.rest
 
+import ch.sbb.backend.logging.domain.LogEntry
+import ch.sbb.backend.logging.domain.LogLevel
 import io.swagger.v3.oas.annotations.media.Schema
 import java.time.OffsetDateTime
 
@@ -30,4 +32,8 @@ data class LogEntryRequest(
         example = "{\"deviceId\": \"abcde123\", \"appVersion\": \"1.2.0\"}"
     )
     val metadata: Map<String, String>? = emptyMap()
-)
+) {
+    fun toLogEntry(): LogEntry {
+        return LogEntry(time, source, message, LogLevel(level.name), metadata)
+    }
+}

backend/src/main/kotlin/ch/sbb/backend/application/rest/LogLevelRequest.kt → backend/src/main/kotlin/ch/sbb/backend/logging/application/rest/LogLevelRequest.kt

@@ -1,4 +1,4 @@
-package ch.sbb.backend.application.rest
+package ch.sbb.backend.logging.application.rest
 
 enum class LogLevelRequest {
     TRACE,