Changes to storage

- Store IssuesSyncStateRecords in GitHubIssuesSyncState (rather than IssuesSyncState) collection
- Make the id for IssuesSyncStateRecords a String instead of a ProjectId object
- Only run IT_LocalIssueStoreLoader if the pem path is set
- Use the real github application id in the application.yaml

Author: matthewhorridge

src/main/java/edu/stanford/webprotege/issues/handler/LinkedGitHubRepositoryChangedEventHandler.java

@@ -50,7 +50,7 @@ public void handleEvent(LinkedGitHubRepositoryChangedEvent event) {
             store.save(linkRecord);
         }
         else {
-            store.deleteById(event.projectId());
+            store.deleteById(event.projectId().id());
         }
     }
 }

src/main/java/edu/stanford/webprotege/issues/persistence/IssuesSyncStateRecord.java

@@ -20,9 +20,9 @@
  * This record stores information about the link, including the project ID,
  * GitHub repository coordinates
  */
-@Document(collection = "IssuesSyncState")
+@Document(collection = "GitHubIssuesSyncState")
 public record IssuesSyncStateRecord(
-        @Id @JsonProperty("projectId") @Nonnull ProjectId projectId,
+        @Id @JsonProperty("projectId") @Nonnull String projectId,
         @JsonProperty("repoCoords") @Nonnull GitHubRepositoryCoordinates repoCoords,
         @JsonProperty("updatedAt") @Nullable Instant updatedAt,
         @JsonProperty("syncState") IssuesSyncState syncState) {
@@ -38,7 +38,7 @@ public record IssuesSyncStateRecord(
     @JsonCreator
     public IssuesSyncStateRecord(
             @JsonProperty("projectId")
-            @Nonnull ProjectId projectId,
+            @Nonnull String projectId,
             @JsonProperty("repoCoords")
             @Nonnull GitHubRepositoryCoordinates repoCoords,
             @JsonProperty("updatedAt")
@@ -60,7 +60,7 @@ public IssuesSyncStateRecord(
      */
     @Nonnull
     public static IssuesSyncStateRecord of(@Nonnull ProjectId projectId, @Nonnull GitHubRepositoryCoordinates repoCoords) {
-        return new IssuesSyncStateRecord(projectId, repoCoords, null, IssuesSyncState.NOT_SYNCED);
+        return new IssuesSyncStateRecord(projectId.id(), repoCoords, null, IssuesSyncState.NOT_SYNCED);
     }
 
     /**

src/main/java/edu/stanford/webprotege/issues/persistence/IssuesSyncStateRecordRepository.java

@@ -14,7 +14,7 @@
  * 2023-10-16
  */
 @Repository
-public interface IssuesSyncStateRecordRepository extends CrudRepository<IssuesSyncStateRecord, ProjectId> {
+public interface IssuesSyncStateRecordRepository extends CrudRepository<IssuesSyncStateRecord, String> {
 
     @Nonnull
     List<IssuesSyncStateRecord> findAllByRepoCoords(@Nonnull GitHubRepositoryCoordinates repoCoords);

src/main/java/edu/stanford/webprotege/issues/persistence/LocalIssueStoreManager.java

@@ -31,21 +31,21 @@ public LocalIssueStoreManager(IssuesSyncStateRecordRepository syncStateRepo,
     }
 
     public synchronized void linkProjectToGitHubRepo(@Nonnull ProjectId projectId, @Nonnull GitHubRepositoryCoordinates repoCoords) {
-        var existingLink = syncStateRepo.findById(projectId);
+        var existingLink = syncStateRepo.findById(projectId.id());
         if(existingLink.isEmpty()) {
             syncStateRepo.save(IssuesSyncStateRecord.of(projectId, repoCoords));
         }
     }
 
     public synchronized void invalidateLocalIssueStore(@Nonnull ProjectId projectId) {
-        syncStateRepo.findById(projectId)
+        syncStateRepo.findById(projectId.id())
                       .map(record -> record.withSyncState(IssuesSyncState.NOT_SYNCED))
                       .ifPresent(syncStateRepo::save);
     }
 
     public synchronized void ensureLocalStoreIsUpToDate(@Nonnull ProjectId projectId) {
         Objects.requireNonNull(projectId);
-        var record = syncStateRepo.findById(projectId);
+        var record = syncStateRepo.findById(projectId.id());
         record.ifPresentOrElse(r -> {
                                    logger.info("Found linked GitHub repo for {}.  Details {}", projectId, r);
                                },

src/main/java/edu/stanford/webprotege/issues/service/EntityIssuesService.java

@@ -71,7 +71,7 @@ public List<GitHubIssue> getIssues(@Nonnull ProjectId projectId, @Nonnull OWLEnt
         localIssueStoreManager.ensureLocalStoreIsUpToDate(projectId);
 
         // Attempt to retrieve the GitHub repository link for the given project
-        return linkRecordRepository.findById(projectId)
+        return linkRecordRepository.findById(projectId.id())
                 .map(IssuesSyncStateRecord::repoCoords)
                 .map(repoCoord -> {
                     // Retrieve issues linked directly by IRI

src/test/java/edu/stanford/webprotege/issues/IT_GitHubRepositoryLinkRecordRepository.java

@@ -34,7 +34,7 @@ void setUp() {
         projectId = ProjectId.generate();
         repoCoords = GitHubRepositoryCoordinates.of("TestOrg", "TestRepoName");
         updatedAt = Instant.now();
-        repository.save(new IssuesSyncStateRecord(projectId, repoCoords, updatedAt, IssuesSyncState.SYNCED));
+        repository.save(new IssuesSyncStateRecord(projectId.id(), repoCoords, updatedAt, IssuesSyncState.SYNCED));
     }
 
     @AfterEach
@@ -49,7 +49,7 @@ void shouldSaveRecord() {
 
     @Test
     void shouldFindByProjectId() {
-        var found = repository.findById(projectId);
+        var found = repository.findById(projectId.id());
         assertThat(found).isPresent();
     }
 

src/test/java/edu/stanford/webprotege/issues/IT_LocalIssueStoreLoader.java

@@ -6,6 +6,8 @@
 import edu.stanford.webprotege.issues.persistence.LocalIssueStoreLoader;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -21,6 +23,7 @@
  */
 @SpringBootTest(properties = "webprotege.rabbitmq.commands-subscribe=false")
 @ExtendWith(MongoTestExtension.class)
+@EnabledIfEnvironmentVariable(named = "WEBPROTEGE_GITHUB_PEM_PATH", matches = ".+", disabledReason = "No path to a PEM file containing a secret key for GitHub has been supplied.  Cannot query GitHub without a secret key.  Skipping test.  To run this test supply a value for the WEBPROTEGE_GITHUB_PEM_PATH environment variable.")
 public class IT_LocalIssueStoreLoader {
 
     @Autowired

src/test/resources/application.yaml

@@ -24,4 +24,4 @@ webprotege:
     username: admin
     password: password
   github:
-    app-id: 123456
+    app-id: 1628021