added CreateProjectSmallFilesRequest. (#64)

* added CreateProjectSmallFilesRequest. * fixed shouldCreateProjectFromBackupFile test --------- Co-authored-by: soimugeo <[email protected]>
protegeproject · Dec 23, 2024 · 15d17c1 · 15d17c1
1 parent add05ab
commit 15d17c1
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 1 deletion.
diff --git a/src/main/java/edu/stanford/protege/webprotege/ApplicationBeansConfiguration.java b/src/main/java/edu/stanford/protege/webprotege/ApplicationBeansConfiguration.java
@@ -577,6 +577,11 @@ CommandExecutor<PrepareBackupFilesForUseRequest, PrepareBackupFilesForUseRespons
         return new CommandExecutorImpl<>(PrepareBackupFilesForUseResponse.class);
     }
 
+    @Bean
+    CommandExecutor<CreateProjectSmallFilesRequest, CreateProjectSmallFilesResponse> executorForCreateProjectSmallFiles() {
+        return new CommandExecutorImpl<>(CreateProjectSmallFilesResponse.class);
+    }
+
     @Bean
     MinioClient minioClient(MinioProperties properties) {
         return MinioClient.builder()

diff --git a/src/main/java/edu/stanford/protege/webprotege/dispatch/Result.java b/src/main/java/edu/stanford/protege/webprotege/dispatch/Result.java
@@ -181,6 +181,7 @@
         @Type(SetUserProjectEntityGraphSettingsResult.class),
         @Type(UpdateEntityTagsResult.class),
         @Type(UpdateFormDescriptorResult.class),
+        @Type(CreateNewProjectFromProjectBackupResult.class),
 })
 public interface Result extends Response {
 

diff --git a/...ain/java/edu/stanford/protege/webprotege/icd/projects/CreateProjectSmallFilesRequest.java b/...ain/java/edu/stanford/protege/webprotege/icd/projects/CreateProjectSmallFilesRequest.java
@@ -0,0 +1,18 @@
+package edu.stanford.protege.webprotege.icd.projects;
+
+import com.fasterxml.jackson.annotation.*;
+import edu.stanford.protege.webprotege.common.*;
+
+import static edu.stanford.protege.webprotege.icd.projects.CreateProjectSmallFilesRequest.CHANNEL;
+
+@JsonTypeName(CHANNEL)
+public record CreateProjectSmallFilesRequest(
+        @JsonProperty("projectId") ProjectId projectId
+)implements Request<CreateProjectSmallFilesResponse> {
+    public static final String CHANNEL = "icatx.versioning.CreateProjectSmallFiles";
+
+    @Override
+    public String getChannel() {
+        return CHANNEL;
+    }
+}
diff --git a/...in/java/edu/stanford/protege/webprotege/icd/projects/CreateProjectSmallFilesResponse.java b/...in/java/edu/stanford/protege/webprotege/icd/projects/CreateProjectSmallFilesResponse.java
@@ -0,0 +1,10 @@
+package edu.stanford.protege.webprotege.icd.projects;
+
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import edu.stanford.protege.webprotege.dispatch.Result;
+
+import static edu.stanford.protege.webprotege.icd.projects.CreateProjectSmallFilesRequest.CHANNEL;
+
+@JsonTypeName(CHANNEL)
+public record CreateProjectSmallFilesResponse() implements Result {
+}
diff --git a/src/main/java/edu/stanford/protege/webprotege/project/CreateProjectSagaManager.java b/src/main/java/edu/stanford/protege/webprotege/project/CreateProjectSagaManager.java
@@ -11,7 +11,7 @@
 
 import java.nio.file.Path;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.*;
 
 /**
  * Matthew Horridge
@@ -30,6 +30,8 @@ public class CreateProjectSagaManager {
     private final CommandExecutor<CreateInitialRevisionHistoryRequest, CreateInitialRevisionHistoryResponse> createInitialRevisionHistoryExecutor;
     private final CommandExecutor<PrepareBackupFilesForUseRequest, PrepareBackupFilesForUseResponse> prepareBinaryFileBackupForUseExecutor;
 
+    private final CommandExecutor<CreateProjectSmallFilesRequest, CreateProjectSmallFilesResponse> createProjectSmallFilesExecutor;
+
     private final MinioFileDownloader fileDownloader;
 
     private final RevisionHistoryReplacer revisionHistoryReplacer;
@@ -41,13 +43,15 @@ public CreateProjectSagaManager(ProjectDetailsManager projectDetailsManager,
                                     CommandExecutor<ProcessUploadedOntologiesRequest, ProcessUploadedOntologiesResponse> processOntologiesExecutor,
                                     CommandExecutor<CreateInitialRevisionHistoryRequest, CreateInitialRevisionHistoryResponse> createInitialRevisionHistoryExecutor,
                                     CommandExecutor<PrepareBackupFilesForUseRequest, PrepareBackupFilesForUseResponse> prepareBinaryFileBackupForUseExecutor,
+                                    CommandExecutor<CreateProjectSmallFilesRequest, CreateProjectSmallFilesResponse> createProjectSmallFilesExecutor,
                                     MinioFileDownloader fileDownloader,
                                     RevisionHistoryReplacer revisionHistoryReplacer,
                                     ProjectPermissionsInitializer projectPermissionsInitializer) {
         this.projectDetailsManager = projectDetailsManager;
         this.processOntologiesExecutor = processOntologiesExecutor;
         this.createInitialRevisionHistoryExecutor = createInitialRevisionHistoryExecutor;
         this.prepareBinaryFileBackupForUseExecutor = prepareBinaryFileBackupForUseExecutor;
+        this.createProjectSmallFilesExecutor = createProjectSmallFilesExecutor;
         this.revisionHistoryReplacer = revisionHistoryReplacer;
         this.fileDownloader = fileDownloader;
         this.projectPermissionsInitializer = projectPermissionsInitializer;
@@ -113,6 +117,7 @@ private CompletableFuture<CreateNewProjectFromProjectBackupResult> createProject
         return prepareBackupFilesForRestore(sagaState)
                 .thenCompose(this::downloadRevisionHistory)
                 .thenCompose(this::copyRevisionHistoryToProject)
+                .thenCompose(this::createProjectSmallFiles)
                 .thenCompose(this::registerProject)
                 .thenCompose(this::initializeProjectPermissions)
                 .thenCompose(this::retrieveProjectDetails)
@@ -129,6 +134,12 @@ private CompletableFuture<CreateNewProjectFromProjectBackupResult> createProject
                 });
     }
 
+    private CompletableFuture<SagaStateWithSources> createProjectSmallFiles(SagaStateWithSources sagaState) {
+        var createHistoryRequest = sagaState.createProjectSmallFiles();
+        return createProjectSmallFilesExecutor.execute(createHistoryRequest, sagaState.getExecutionContext())
+                .thenApply(response -> sagaState);
+    }
+
     private CompletableFuture<SagaStateWithSources> prepareBackupFilesForRestore(SagaStateWithSources sagaState) {
         var createHistoryRequest = sagaState.createPrepareBackupFilesForUseRequest();
         return prepareBinaryFileBackupForUseExecutor.execute(createHistoryRequest, sagaState.getExecutionContext())
@@ -269,6 +280,9 @@ public PrepareBackupFilesForUseRequest createPrepareBackupFilesForUseRequest() {
             return new PrepareBackupFilesForUseRequest(getProjectId(), getNewProjectSettings().sourceDocument());
         }
 
+        public CreateProjectSmallFilesRequest createProjectSmallFiles() {
+            return new CreateProjectSmallFilesRequest(getProjectId());
+        }
     }
 
 }
diff --git a/src/test/java/edu/stanford/protege/webprotege/project/CreateProjectSagaManagerTest.java b/src/test/java/edu/stanford/protege/webprotege/project/CreateProjectSagaManagerTest.java
@@ -46,6 +46,8 @@ class CreateProjectSagaManagerTest {
 
     @Mock
     private CommandExecutor<PrepareBackupFilesForUseRequest, PrepareBackupFilesForUseResponse> prepareBinaryFileBackupForUseExecutor;
+    @Mock
+    private CommandExecutor<CreateProjectSmallFilesRequest, CreateProjectSmallFilesResponse> createProjectSmallFilesExecutor;
 
     @Mock
     private MinioFileDownloader fileDownloader;
@@ -74,6 +76,7 @@ void setUp() {
                                                processOntologiesExecutor,
                                                createInitialRevisionHistoryExecutor,
                                                prepareBinaryFileBackupForUseExecutor,
+                                               createProjectSmallFilesExecutor,
                                                fileDownloader,
                                                revisionHistoryReplacer,
                                                projectPermissionsInitializer);
@@ -238,6 +241,9 @@ void shouldCreateProjectFromBackupFile() throws ExecutionException, InterruptedE
         when(projectPermissionsInitializer.applyDefaultPermissions(any(ProjectId.class), any(UserId.class)))
                 .thenReturn(CompletableFuture.completedFuture(null));
 
+        when(createProjectSmallFilesExecutor.execute(any(), eq(executionContext)))
+                .thenReturn(CompletableFuture.completedFuture(null));
+
         when(projectDetailsManager.getProjectDetails(any(ProjectId.class)))
                 .thenReturn(projectDetails);