Fix state request for multiple applications in same repo

Author: malte-hansen

src/main/java/net/explorviz/persistence/grpc/StateDataServiceImpl.java

@@ -4,6 +4,7 @@
 import io.smallrye.common.annotation.Blocking;
 import io.smallrye.mutiny.Uni;
 import jakarta.inject.Inject;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import net.explorviz.persistence.ogm.Application;
@@ -59,7 +60,8 @@ public Uni<StateData> getStateData(final StateDataRequest request) {
                   session,
                   request.getRepositoryName(),
                   request.getLandscapeToken(),
-                  request.getBranchName())
+                  request.getBranchName(),
+                  new ArrayList<>(request.getApplicationPathsMap().keySet()))
               .map(Commit::getHash)
               .orElse("");
       stateDataBuilder.setCommitId(commitId);

src/main/java/net/explorviz/persistence/repository/CommitRepository.java

@@ -22,15 +22,22 @@ public class CommitRepository {
    * every file included in the commit.
    */
   public Optional<Commit> findLatestFullyPersistedCommit(
-      final Session session, final String repoName, final String tokenId, final String branchName) {
+      final Session session,
+      final String repoName,
+      final String tokenId,
+      final String branchName,
+      final List<String> applicationNames) {
     return Optional.ofNullable(
         session.queryForObject(
             Commit.class,
             """
-            MATCH (:Landscape {tokenId: $tokenId})
-              -[:CONTAINS]->(:Repository {name: $repoName})
-              -[:CONTAINS]->(c:Commit)
-              -[:BELONGS_TO]->(:Branch {name: $branchName})
+            MATCH (l:Landscape {tokenId: $tokenId})
+            MATCH (repo:Repository {name: $repoName})<-[:CONTAINS]-(l)
+            MATCH (repo)-[:CONTAINS]->(c:Commit)-[:BELONGS_TO]->(:Branch {name: $branchName})
+            WHERE all(appName IN $applicationNames WHERE EXISTS {
+              MATCH (l)-[:CONTAINS]->(a:Application {name: appName})-[:HAS_ROOT]->(root:Directory)
+              MATCH (root)-[:CONTAINS*1..]->(f:FileRevision)<-[:CONTAINS]-(c)
+            })
             WITH c, [(c)-[:CONTAINS]->(f:FileRevision) | f] AS filesInCommit
             WHERE
               all(file IN filesInCommit WHERE file.hasFileData) AND
@@ -39,7 +46,15 @@ NOT isEmpty(filesInCommit)
             ORDER BY c.commitDate DESC
             LIMIT 1;
             """,
-            Map.of("tokenId", tokenId, "repoName", repoName, "branchName", branchName)));
+            Map.of(
+                "tokenId",
+                tokenId,
+                "repoName",
+                repoName,
+                "branchName",
+                branchName,
+                "applicationNames",
+                applicationNames)));
   }
 
   public Optional<Commit> findCommitByHashAndLandscapeToken(

src/test/java/net/explorviz/persistence/CommitRepositoryTest.java

@@ -6,6 +6,7 @@
 import io.quarkus.test.junit.QuarkusTest;
 import jakarta.inject.Inject;
 import java.time.Instant;
+import java.util.List;
 import java.util.Optional;
 import net.explorviz.persistence.ogm.Branch;
 import net.explorviz.persistence.ogm.Commit;
@@ -77,7 +78,8 @@ void testFindLatestCommit() {
     session.save(landscape);
 
     Optional<Commit> latestCommit =
-        commitRepository.findLatestFullyPersistedCommit(session, "myrepo", "mytokenvalue", "main");
+        commitRepository.findLatestFullyPersistedCommit(
+            session, "myrepo", "mytokenvalue", "main", List.of());
 
     assertTrue(latestCommit.isPresent());
     assertEquals("commit2", latestCommit.get().getHash());

src/test/java/net/explorviz/persistence/StateDataServiceTest.java

@@ -437,4 +437,69 @@ void testGetStateDataForTwoDifferentReposInOneLandscape() {
             .directories(2)
             .build());
   }
+
+  @Test
+  void testGetStateDataForNewApplicationInExistingRepo() {
+    String appNameOne = "app1";
+    String appNameTwo = "app2";
+    String commitHash = "commit1";
+
+    // 1. Setup app1 and a commit with a file
+    StateDataRequest prepRequest =
+        StateDataRequest.newBuilder()
+            .setLandscapeToken(landscapeToken)
+            .setRepositoryName(repoName)
+            .setBranchName(branchName)
+            .putAllApplicationPaths(Map.of(appNameOne, "app1"))
+            .build();
+    stateDataService
+        .getStateData(prepRequest)
+        .await()
+        .atMost(Duration.ofSeconds(GRPC_AWAIT_SECONDS));
+
+    CommitData commitData =
+        CommitData.newBuilder()
+            .setCommitId(commitHash)
+            .setRepositoryName(repoName)
+            .setBranchName(branchName)
+            .setLandscapeToken(landscapeToken)
+            .setAuthorDate(Timestamp.newBuilder().setSeconds(1).build())
+            .setCommitDate(Timestamp.newBuilder().setSeconds(1).build())
+            .build();
+    commitService.persistCommit(commitData).await().atMost(Duration.ofSeconds(GRPC_AWAIT_SECONDS));
+
+    FileData fileData =
+        FileData.newBuilder()
+            .setLandscapeToken(landscapeToken)
+            .setRepositoryName(repoName)
+            .setCommitId(commitHash)
+            .setFileHash("hash1")
+            .setFilePath("app1/File1.java")
+            .setLanguage(Language.JAVA)
+            .build();
+    fileDataService.persistFile(fileData).await().atMost(Duration.ofSeconds(GRPC_AWAIT_SECONDS));
+
+    // 2. Request state for app1 - should return commit1
+    StateData state1 =
+        stateDataService
+            .getStateData(prepRequest)
+            .await()
+            .atMost(Duration.ofSeconds(GRPC_AWAIT_SECONDS));
+    assertEquals(commitHash, state1.getCommitId());
+
+    // 3. Request state for app1 AND app2 - should return ""
+    StateDataRequest bothRequest =
+        StateDataRequest.newBuilder()
+            .setLandscapeToken(landscapeToken)
+            .setRepositoryName(repoName)
+            .setBranchName(branchName)
+            .putAllApplicationPaths(Map.of(appNameOne, "app1", appNameTwo, "app2"))
+            .build();
+    StateData stateBoth =
+        stateDataService
+            .getStateData(bothRequest)
+            .await()
+            .atMost(Duration.ofSeconds(GRPC_AWAIT_SECONDS));
+    assertEquals("", stateBoth.getCommitId());
+  }
 }