Feature/363

.github/workflows/backend-fast.yml

@@ -87,15 +87,15 @@ jobs:
 
       - name: Install dependencies
         run: |
-          mvn clean install -DskipTests --pl ${{ matrix.module }} --am -Psql
+          mvn clean install -DskipTests --pl ${{ matrix.module }} --am
 
       - name: Run tests for module ${{ matrix.module }}
         run: |
-          mvn $MAVEN_CLI_OPTS test --pl ${{ matrix.module }} -Dspring.profiles.active=test,gix,sql,postgres -Psql
+          mvn $MAVEN_CLI_OPTS test --pl ${{ matrix.module }}
 
       - name: Surefire report for module ${{ matrix.module }}
         if: always()
-        run: mvn $MAVEN_CLI_OPTS surefire-report:report-only --pl ${{ matrix.module }} -am -Dspring.profiles.active=test,gix,sql,postgres -Psql
+        run: mvn $MAVEN_CLI_OPTS surefire-report:report-only --pl ${{ matrix.module }} -am
 
       - name: Upload surefire report
         if: always()
@@ -146,18 +146,18 @@ jobs:
 
       - name: Install dependencies
         run: |
-          mvn clean install -DskipTests --pl ${{ matrix.module }} --am -Parangodb
+          mvn clean install -DskipTests --pl ${{ matrix.module }} --am
 
       - name: Run tests for module ${{ matrix.module }}
         run: |
           ARANGODB_HOST=localhost \
-          mvn $MAVEN_CLI_OPTS test --pl ${{ matrix.module }} -Dspring.profiles.active=test,nosql,arangodb -Parangodb
+          mvn $MAVEN_CLI_OPTS test --pl ${{ matrix.module }}
 
       - name: Surefire report for module ${{ matrix.module }}
         if: always()
         run: |
           ARANGODB_HOST=localhost \
-          mvn $MAVEN_CLI_OPTS surefire-report:report-only --pl ${{ matrix.module }} -am -Dspring.profiles.active=test,nosql,arangodb -Parangodb
+          mvn $MAVEN_CLI_OPTS surefire-report:report-only --pl ${{ matrix.module }} -am
 
       - name: Upload surefire report
         if: always()

binocular-backend-new/README.md

@@ -0,0 +1,6 @@
+# Binocular Backend
+
+## Requirements
+- Docker running in the background, otherwise tests will fail (tests in `infrastructure-sql/arangodb/tests` use TestContainers internally)
+
+© INSO/BUSY 09/2025

binocular-backend-new/cli/pom.xml

@@ -62,6 +62,13 @@
             <artifactId>domain</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.inso-world.binocular</groupId>
+            <artifactId>domain</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
         <dependency>
             <groupId>com.inso-world.binocular</groupId>
             <artifactId>ffi</artifactId>
@@ -80,6 +87,11 @@
             <scope>test</scope>
         </dependency>
         <!--Non binocular below -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.springframework.shell</groupId>
             <artifactId>spring-shell-starter</artifactId>
@@ -123,7 +135,8 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
+            <artifactId>testcontainers-postgresql</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <!-- this one is required for testcontainers! -->
@@ -163,6 +176,25 @@
                         <plugin>all-open</plugin>
                     </compilerPlugins>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>kapt</id>
+                        <goals>
+                            <goal>kapt</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
+                            </sourceDirs>
+                            <annotationProcessorPaths>
+                                <annotationProcessorPath>
+                                    <groupId>org.springframework.boot</groupId>
+                                    <artifactId>spring-boot-configuration-processor</artifactId>
+                                </annotationProcessorPath>
+                            </annotationProcessorPaths>
+                        </configuration>
+                    </execution>
+                </executions>
                 <dependencies>
                     <dependency>
                         <groupId>org.jetbrains.kotlin</groupId>

binocular-backend-new/cli/src/main/kotlin/com/inso_world/binocular/cli/commands/Index.kt

@@ -3,6 +3,8 @@ package com.inso_world.binocular.cli.commands
 import com.inso_world.binocular.cli.service.ProjectService
 import com.inso_world.binocular.cli.service.RepositoryService
 import com.inso_world.binocular.cli.service.VcsService
+import jakarta.validation.constraints.NotEmpty
+import jakarta.validation.constraints.NotNull
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
@@ -24,27 +26,23 @@ open class Index(
         private var logger: Logger = LoggerFactory.getLogger(Index::class.java)
     }
 
-    @Command(command = ["hello"], description = "Hello World")
-    fun helloWorld() {
-//        BinocularFfi().hello()
-    }
 
     @Command(command = ["commits"])
     open fun commits(
-        @Option(longNames = ["repo_path"], required = false) repoPath: String?,
+        repoPath: String,
         @Option(
             longNames = ["branch"],
             shortNames = ['b'],
             required = true,
-        ) branchName: String,
+        ) @NotNull @NotEmpty branchName: String,
         @Option(
             longNames = ["project_name"],
             shortNames = ['n'],
             required = true,
             description = "Custom name of the project.",
-        ) projectName: String,
+        ) @NotNull @NotEmpty projectName: String,
     ) {
-        val path = repoPath?.let { Paths.get(it).toRealPath() }
+        val path = repoPath.let { Paths.get(it).toRealPath() }
         logger.trace(">>> index($path, $branchName)")
         logger.debug("Project '$projectName'")
         val project = this.projectService.getOrCreateProject(projectName)

binocular-backend-new/cli/src/main/kotlin/com/inso_world/binocular/cli/config/AppConfig.kt

@@ -1,19 +1,21 @@
 package com.inso_world.binocular.cli.config
 
-import org.springframework.boot.context.properties.ConfigurationProperties
+import com.inso_world.binocular.core.BinocularConfig
 import org.springframework.context.annotation.Configuration
 
 @Configuration
-@ConfigurationProperties(prefix = "binocular")
-class BinocularCliConfiguration {
-    lateinit var index: IndexConfig
-    lateinit var archive: ArchiveConfig
+internal class BinocularConfiguration : BinocularConfig() {
+    lateinit var cli: CliConfig
 }
 
-class IndexConfig(
-    val path: String,
+class CliConfig(
+    val index: IndexConfig
+)
+
+class ScmConfig(
+    val path: String
 )
 
-class ArchiveConfig(
-    val path: String? = null,
+class IndexConfig(
+    val scm: ScmConfig
 )