63 setup exploration module

boot/build.gradle

@@ -8,6 +8,7 @@ repositories {
 
 dependencies {
     implementation project(":trade-module")
+    implementation project(":exploration-module")
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter'
@@ -19,7 +20,6 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok'
 
 
-
     testCompileOnly 'org.projectlombok:lombok'
     testAnnotationProcessor 'org.projectlombok:lombok'
 }

boot/src/main/java/io/edpn/backend/application/controller/BootExplorationModuleController.java

@@ -0,0 +1,14 @@
+package io.edpn.backend.application.controller;
+
+import io.edpn.backend.exploration.adapter.web.SystemController;
+import io.edpn.backend.exploration.application.port.incomming.FindSystemsFromSearchbarUseCase;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+public class BootExplorationModuleController extends SystemController {
+
+    public BootExplorationModuleController(FindSystemsFromSearchbarUseCase findSystemsFromSearchbarUseCase) {
+        super(findSystemsFromSearchbarUseCase);
+    }
+}

boot/src/main/java/io/edpn/backend/application/controller/BootTradeModuleController.java

@@ -1,16 +1,27 @@
 package io.edpn.backend.application.controller;
 
 import io.edpn.backend.trade.application.controller.v1.DefaultTradeModuleController;
-import io.edpn.backend.trade.domain.service.v1.FindCommodityMarketInfoService;
-import io.edpn.backend.trade.domain.service.v1.FindCommodityService;
-import io.edpn.backend.trade.domain.service.v1.LocateCommodityService;
+import io.edpn.backend.trade.application.mappers.v1.CommodityMarketInfoResponseMapper;
+import io.edpn.backend.trade.application.mappers.v1.FindCommodityDTOMapper;
+import io.edpn.backend.trade.application.mappers.v1.LocateCommodityDTOMapper;
+import io.edpn.backend.trade.domain.usecase.FindCommodityMarketInfoUseCase;
+import io.edpn.backend.trade.domain.usecase.FindCommodityUseCase;
+import io.edpn.backend.trade.domain.usecase.LocateCommodityUseCase;
 import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
 public class BootTradeModuleController extends DefaultTradeModuleController {
 
-    public BootTradeModuleController(FindCommodityMarketInfoService findCommodityMarketInfoService, LocateCommodityService locateCommodityService, FindCommodityService findCommodityService) {
-        super(findCommodityMarketInfoService, locateCommodityService, findCommodityService);
+    public BootTradeModuleController(
+            FindCommodityMarketInfoUseCase findCommodityMarketInfoUseCase,
+            LocateCommodityUseCase locateCommodityUseCase,
+            FindCommodityUseCase findCommodityUseCase,
+
+            CommodityMarketInfoResponseMapper commodityMarketInfoResponseMapper,
+            LocateCommodityDTOMapper locateCommodityDTOMapper,
+            FindCommodityDTOMapper findCommodityDTOMapper
+    ) {
+        super(findCommodityMarketInfoUseCase, locateCommodityUseCase, findCommodityUseCase, commodityMarketInfoResponseMapper, locateCommodityDTOMapper, findCommodityDTOMapper);
     }
 }

boot/src/main/java/module-info.java

@@ -7,6 +7,7 @@
     requires edpn.backend.trade;
     requires spring.web;
     requires spring.beans;
+    requires edpn.backend.exploration;
 
     opens io.edpn.backend.application.controller to spring.core;
 }

boot/src/main/resources/application.yaml

@@ -8,3 +8,4 @@ spring:
   config:
     import:
       - trademodule.yaml
+      - explorationmodule.yaml

build.gradle

@@ -112,7 +112,7 @@ subprojects {
             runtimeOnly "io.micrometer:micrometer-registry-prometheus:${prometheusVersion}"
             compileOnly "org.projectlombok:lombok:${lombokVersion}"
             annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
-            testImplementation "org.springframework.boot:spring-boot-starter-test${springBootVersion}"
+            testImplementation "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
             testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
             testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"
             testImplementation "org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}"

docker-compose-localdev.yml

@@ -38,19 +38,36 @@ services:
       zookeeper:
         condition: service_healthy
 
-  trademodule_postgres:
-    image: "postgres:15-alpine"
+  trademodule_postgis:
+    image: "postgis/postgis:15-3.3-alpine"
     restart: on-failure
     environment:
       - POSTGRES_USER=edpn_trademodule
       - POSTGRES_PASSWORD=MSDVq372rNk3AwRq
       - POSTGRES_DB=trademodule
     volumes:
-      - "trademodule_postgres:/var/lib/postgresql/data"
+      - "trademodule_postgis:/var/lib/postgresql/data"
     ports:
       - "54321:5432"
     healthcheck:
-      test: pg_isready
+      test: ["CMD-SHELL", "pg_isready -d trademodule -U edpn_trademodule"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  explorationmodule_postgis:
+    image: "postgis/postgis:15-3.3-alpine"
+    restart: on-failure
+    environment:
+      - POSTGRES_USER=edpn_explorationmodule
+      - POSTGRES_PASSWORD=TvhRZP7b6Hrw64Ct
+      - POSTGRES_DB=explorationmodule
+    volumes:
+      - "explorationmodule_postgis:/var/lib/postgresql/data"
+    ports:
+      - "54322:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -d explorationmodule -U edpn_explorationmodule"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -60,5 +77,7 @@ volumes:
     driver: local
   kafka:
     driver: local
-  trademodule_postgres:
+  trademodule_postgis:
+    driver: local
+  explorationmodule_postgis:
     driver: local

docker-compose.yml

@@ -35,20 +35,34 @@ services:
       zookeeper:
         condition: service_healthy
 
-  trademodule-postgres:
-  ## TODO: Tag this image locally
-    image: "postgres:15-alpine"
+  trademodule-postgis:
+    ## TODO: Tag this image locally
+    image: "postgis/postgis:15-3.3-alpine"
     restart: on-failure
     env_file:
       - env/${ENVIRONMENT}/.env_trademodule
     volumes:
-      - "trademodule_postgres:/var/lib/postgresql/data"
+      - "trademodule_postgis:/var/lib/postgresql/data"
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -d trademodule -U edpn_trademodule"]
       interval: 10s
       timeout: 5s
       retries: 5
 
+  explorationmodule_postgis:
+    ## TODO: Tag this image locally
+    image: "postgis/postgis:15-3.3-alpine"
+    restart: on-failure
+    env_file:
+      - env/${ENVIRONMENT}/.env_explorationmodule
+    volumes:
+      - "explorationmodule_postgis:/var/lib/postgresql/data"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -d explorationmodule -U edpn_explorationmodule"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
   eddn-message-listener:
     image: nexus.edpn.io/edpn/backend/eddn-message-listener:latest-snapshot
     restart: on-failure
@@ -80,11 +94,17 @@ services:
     depends_on:
       kafka:
         condition: service_healthy
+      trademodule_postgis:
+        condition: service_healthy
+      explorationmodule_postgis:
+        condition: service_healthy
 
 volumes:
   zookeeper:
     driver: local
   kafka:
     driver: local
-  trademodule_postgres:
+  trademodule_postgis:
+    driver: local
+  explorationmodule_postgis:
     driver: local

documentation/modules.txt

@@ -0,0 +1,47 @@
+Roles
+    Trader(Black Market)
+        entities:
+            commodity
+        eddn:
+            commodity
+            fcmaterials
+
+    Builder
+        entities:
+            shipyard/outfitting
+            (engineering)
+        eddn:
+            shipyard
+            outfitting
+
+    BGSer
+        entities:
+            factions/powerplay/superpowers/thargoidwar
+            stations/settlement(services)
+        eddn:
+            docked
+            approachsettlement
+            location
+            fsdjump
+            carrierjump (like fsd, but with carrier station data)
+
+    Explorer
+        Navigation
+        entities:
+            System/bodies(composition)
+            station/settlement(lat/long/dist)
+            POI
+        eddn:
+            approachsettlement
+            fsdjump
+            carrierjump (like fsd, but with carrier station data)
+            location (at startup, or when being resurrected at a station)
+            codexentry
+            fssallbodiesfound (after having identified all bodies in the system)
+            fssbodysignals (when completing a “Full Spectrum Scan” of a starsystem)
+            fsssignaldiscovered (when zooming in on a signal using the FSS scanner)
+            navbeaconscan (number of bodies in the system)
+            navroute (plotted route [system name,address,pos,starclass])
+            saasignalfound (after using the “Surface Area Analysis” scanner)
+            scanbarycentre (When scanning one body of a binary pair, you will now get an event detailing the orbital parameters of their BaryCentre)
+            scan (basic or detailed discovery scan of a star, planet or moon)

env/dev/.env_explorationmodule

@@ -0,0 +1,6 @@
+# .env_explorationmodule file
+
+# PostgreSQL
+POSTGRES_USER=edpn_explorationmodule
+POSTGRES_PASSWORD=TvhRZP7b6Hrw64Ct
+POSTGRES_DB=explorationmodule

env/dev/.env_modulith

@@ -4,6 +4,11 @@
 KAFKA_URL=edpn-backend-kafka-1:9092
 
 # tradeModule
-TRADEMODULE_DB_URL=jdbc:postgresql://edpn-backend-trademodule-postgres-1:5432/trademodule
+TRADEMODULE_DB_URL=jdbc:postgresql://edpn-backend-trademodule-postgis-1:5432/trademodule
 TRADEMODULE_DB_USERNAME=edpn_trademodule
 TRADEMODULE_DB_PASSWORD=MSDVq372rNk3AwRq
+
+# exploartionModule
+EXPLORATIONMODULE_DB_URL=jdbc:postgresql://edpn-backend-explorationmodule-postgis-1:5432/explorationmodule
+EXPLORATIONMODULE_DB_USERNAME=edpn_explorationmodule
+EXPLORATIONMODULE_DB_PASSWORD=TvhRZP7b6Hrw64Ct

env/local/.env_explorationmodule

@@ -0,0 +1,6 @@
+# .env_explorationmodule file
+
+# PostgreSQL
+POSTGRES_USER=edpn_explorationmodule
+POSTGRES_PASSWORD=TvhRZP7b6Hrw64Ct
+POSTGRES_DB=explorationmodule

exploration-module/build.gradle

@@ -0,0 +1,40 @@
+dependencies {
+    implementation 'io.edpn.backend:backend-util'
+    implementation 'io.edpn.backend:backend-mybatis-util'
+    implementation 'io.edpn.backend:backend-messageprocessor-lib'
+    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    implementation 'org.springframework.boot:spring-boot-starter-integration'
+    implementation 'org.springframework.integration:spring-integration-http'
+    implementation 'org.springframework.kafka:spring-kafka'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter'
+    implementation 'org.liquibase:liquibase-core'
+    implementation 'com.fasterxml.jackson.core:jackson-core'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations'
+    implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta'
+
+    runtimeOnly 'org.postgresql:postgresql'
+
+    compileOnly 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter-api'
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params'
+    testImplementation 'org.mockito:mockito-junit-jupiter'
+    testImplementation 'org.hamcrest:hamcrest'
+
+    testCompileOnly 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
+}
+
+extraJavaModuleInfo {
+    automaticModule("kafka-clients-3.3.2.jar", "kafka.clients")
+    automaticModule("spring-retry-2.0.2.jar","spring.retry")
+    automaticModule("dependency-management-plugin-1.1.0.jar","dependency.management.plugin")
+    automaticModule("tomlj-1.0.0.jar","tomlj")
+    automaticModule("jsr305-3.0.2.jar","jsr305")
+    automaticModule("snappy-java-1.1.8.4.jar","snappy.java")
+    automaticModule("liquibase-core-4.17.2.jar","liquibase.core")
+}

exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/AsyncConfig.java

@@ -0,0 +1,30 @@
+package io.edpn.backend.exploration.adapter.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+
+@Configuration("ExplorationAsyncConfig")
+@EnableScheduling
+public class AsyncConfig {
+
+    @Bean(name = "explorationTaskScheduler")
+    public TaskScheduler taskScheduler() {
+        ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
+        taskScheduler.setPoolSize(10); // todo Set from config
+        return taskScheduler;
+    }
+
+    @Bean(name = "explorationThreadPoolTaskExecutor")
+    public ThreadPoolTaskExecutor taskExecutor() {
+        ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
+        taskExecutor.setCorePoolSize(5);// todo Set from config
+        taskExecutor.setMaxPoolSize(10);// todo Set from config
+        taskExecutor.setQueueCapacity(50);// todo Set from config
+        taskExecutor.initialize();
+        return taskExecutor;
+    }
+}

exploration-module/src/main/java/io/edpn/backend/exploration/adapter/config/BeanConfig.java

@@ -0,0 +1,40 @@
+package io.edpn.backend.exploration.adapter.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.edpn.backend.util.IdGenerator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.retry.backoff.ExponentialBackOffPolicy;
+import org.springframework.retry.policy.SimpleRetryPolicy;
+import org.springframework.retry.support.RetryTemplate;
+
+@Configuration("ExplorationModuleBeanConfig")
+public class BeanConfig {
+
+    @Bean(name = "explorationIdGenerator")
+    public IdGenerator idGenerator() {
+        return new IdGenerator();
+    }
+
+    @Bean(name = "explorationObjectMapper")
+    public ObjectMapper objectMapper() {
+        return new ObjectMapper();
+    }
+
+    @Bean(name = "explorationRetryTemplate")
+    public RetryTemplate retryTemplate() {
+        RetryTemplate retryTemplate = new RetryTemplate();
+
+        SimpleRetryPolicy retryPolicy = new SimpleRetryPolicy();
+        retryPolicy.setMaxAttempts(5);
+        retryTemplate.setRetryPolicy(retryPolicy);
+
+        ExponentialBackOffPolicy backOffPolicy = new ExponentialBackOffPolicy();
+        backOffPolicy.setInitialInterval(1000);
+        backOffPolicy.setMultiplier(2.0);
+        backOffPolicy.setMaxInterval(30000);
+        retryTemplate.setBackOffPolicy(backOffPolicy);
+
+        return retryTemplate;
+    }
+}