Merge branch 'main' into filtered-hierarchies

protegeproject · Dec 2, 2024 · 15620db · 15620db
2 parents cc82c29 + c910578
commit 15620db
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>edu.stanford.protege</groupId>
     <artifactId>webprotege-backend-service</artifactId>
-    <version>1.3.12</version>
+    <version>1.3.14</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/edu/stanford/protege/webprotege/forms/EntityFormRepositoryImpl.java b/src/main/java/edu/stanford/protege/webprotege/forms/EntityFormRepositoryImpl.java
@@ -10,6 +10,8 @@
 import edu.stanford.protege.webprotege.common.ProjectId;
 import org.bson.Document;
 import org.bson.conversions.Bson;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 
 import javax.annotation.*;
@@ -54,6 +56,8 @@ public class EntityFormRepositoryImpl implements EntityFormRepository {
 
     private final Lock writeLock = readWriteLock.writeLock();
 
+    private final static Logger LOGGER = LoggerFactory.getLogger(EntityFormRepositoryImpl.class);
+
     @Inject
     public EntityFormRepositoryImpl(ObjectMapper objectMapper, MongoTemplate database) {
         this.objectMapper = checkNotNull(objectMapper);
@@ -131,17 +135,22 @@ public void setProjectFormDescriptors(@Nonnull ProjectId projectId, @Nonnull Lis
         try {
             writeLock.lock();
             var collection = getCollection();
-            collection.deleteMany(new Document(PROJECT_ID, projectId.id()));
+            var docs = new ArrayList<Document>();
+
             if (!formDescriptors.isEmpty()) {
-                var docs = new ArrayList<Document>();
                 for (int ordinal = 0; ordinal < formDescriptors.size(); ordinal++) {
                     var formDescriptor = formDescriptors.get(ordinal);
                     var record = FormDescriptorRecord.get(projectId, formDescriptor, ordinal);
                     var recordDocument = objectMapper.convertValue(record, Document.class);
                     docs.add(recordDocument);
                 }
+            }
+            collection.deleteMany(new Document(PROJECT_ID, projectId.id()));
+            if (!docs.isEmpty()) {
                 collection.insertMany(docs);
             }
+        }catch (Exception e) {
+            LOGGER.error("Error saving forms for project " + projectId.id(), e);
         } finally {
             writeLock.unlock();
         }

diff --git a/src/test/java/edu/stanford/protege/webprotege/project/CreateProjectSagaManagerTest.java b/src/test/java/edu/stanford/protege/webprotege/project/CreateProjectSagaManagerTest.java
@@ -103,7 +103,7 @@ void shouldCreateAndInitPermissionsOnNewEmptyProject() throws InterruptedExcepti
                                                         "en",
                                                         "TheProjectDescription");
         manager.execute(newProjectSettings, executionContext);
-        Thread.sleep(300);
+        Thread.sleep(600);
         verify(projectPermissionsInitializer, times(1)).applyDefaultPermissions(any(ProjectId.class),
                                                                                 eq(janeDoe));
     }