AoU-Admin/src/main/java/ch/unige/aou/business/NotificationService.java

@@ -31,10 +31,11 @@ import java.util.NoSuchElementException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.event.TransactionalEventListener;
 
 import ch.unige.solidify.config.SolidifyEventPublisher;
 import ch.unige.solidify.util.StringTool;
@@ -101,8 +102,8 @@ public class NotificationService extends AouResourceService<Notification> {
    *
    * @param eventMessage
    */
-  @EventListener
-  @Transactional
+  @TransactionalEventListener(fallbackExecution = true)
+  @Transactional(propagation = Propagation.REQUIRES_NEW)
   @Async
   public void listenToNewEventCreation(EventMessage eventMessage) {
 

AoU-Admin/src/main/java/ch/unige/aou/controller/admin/PublicationCommentController.java

@@ -109,8 +109,9 @@ public class PublicationCommentController extends CompositionController<Publicat
   public HttpEntity<Comment> update(@PathVariable final String parentid, @PathVariable final String id,
           @RequestBody final Map<String, Object> updateMap) {
     String authenticatedPersonId = this.personService.getLinkedPersonId(SecurityContextHolder.getContext().getAuthentication());
-    Person person = this.subResourceService.findOne(id).getPerson();
-    if (authenticatedPersonId.equals(person.getResId())) {
+    Comment comment = this.subResourceService.findOne(id);
+    Person person = comment.getPerson();
+    if (!comment.isSystem() && authenticatedPersonId.equals(person.getResId())) {
       return super.update(parentid, id, updateMap);
     } else {
       return new ResponseEntity<>(HttpStatus.FORBIDDEN);
@@ -122,8 +123,9 @@ public class PublicationCommentController extends CompositionController<Publicat
   @PreAuthorize("@publicationPermissionService.isAllowed(#parentid, 'DELETE_DEPOSIT_COMMENT')")
   public ResponseEntity<Void> delete(@PathVariable final String parentid, @PathVariable final String id) {
     String authenticatedPersonId = this.personService.getLinkedPersonId(SecurityContextHolder.getContext().getAuthentication());
-    Person person = this.subResourceService.findOne(id).getPerson();
-    if (authenticatedPersonId.equals(person.getResId()) || this.personService.authenticatedUserHasPriviledgedRole()) {
+    Comment comment = this.subResourceService.findOne(id);
+    Person person = comment.getPerson();
+    if (!comment.isSystem() && (authenticatedPersonId.equals(person.getResId()) || this.personService.authenticatedUserHasPriviledgedRole())) {
       return super.delete(parentid, id);
     } else {
       return new ResponseEntity<>(HttpStatus.FORBIDDEN);