add clamAV to local env; make delete attachment idempotent

NUM-Forschungsdatenplattform · Sep 16, 2024 · 7872603 · 7872603
1 parent 40bc1c1
commit 7872603
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/local-env/docker-compose.yaml b/local-env/docker-compose.yaml
@@ -14,7 +14,7 @@ services:
     volumes:
       - ./keycloak.conf:/opt/keycloak/conf/keycloak.conf
     ports:
-      - 8180:8080
+      - "8180:8080"
     networks:
       - num-portal
     depends_on:
@@ -23,7 +23,7 @@ services:
     image: postgres:16.2
     restart: always
     ports:
-      - 5432:5432
+      - "5432:5432"
     networks:
       - num-portal
     environment:
@@ -35,7 +35,7 @@ services:
     image: dpage/pgadmin4:8.9
     restart: always
     ports:
-      - 8888:80
+      - "8888:80"
     networks:
       - num-portal
     environment:
@@ -48,7 +48,7 @@ services:
   ehrbase:
     image: ehrbase/ehrbase:2.5.0
     ports:
-      - 8080:8080
+      - "8080:8080"
     networks:
       - num-portal
     env_file:
@@ -62,10 +62,21 @@ services:
       DB_PASS: ${DB_PASS}
     depends_on:
       - postgres
+  clamav:
+    image: clamav/clamav:1.3.2
+    container_name: clamav
+    ports:
+      - "3310:3310"
+    volumes:
+      - clamav-db:/var/lib/clamav
+    environment:
+      - CLAMD_CONF_FILE=/etc/clamav/clamd.conf
+      - FRESHCLAM_CONF_FILE=/etc/clamav/freshclam.conf
 
 volumes:
   pgdata:
   pgadmin-data:
+  clamav-db:
 networks:
   num-portal:
     driver: bridge
diff --git a/src/main/java/org/highmed/numportal/attachment/service/AttachmentService.java b/src/main/java/org/highmed/numportal/attachment/service/AttachmentService.java
@@ -141,7 +141,8 @@ public void deleteAttachments(Set<Long> attachmentsId, Long projectId, String lo
         for(Long attachmentId : attachmentsId) {
             Optional<Attachment> attachment = attachmentRepository.findByIdAndProjectId(attachmentId, projectId);
             if(attachment.isEmpty()) {
-                throw new ResourceNotFound(AttachmentService.class, "Attachment not found", String.format("Attachment not found: %s", attachmentId));
+                log.info("Attachment is already deleted, attachment: {}, project: {}", attachmentId, projectId);
+                return;
             }
             Attachment currentAttachment = attachment.get();
             if  (Boolean.FALSE.equals(userIsApprover) && currentAttachment.getReviewCounter() > 1) {

diff --git a/src/test/java/org/highmed/numportal/attachment/service/AttachmentServiceTest.java b/src/test/java/org/highmed/numportal/attachment/service/AttachmentServiceTest.java
@@ -153,11 +153,6 @@ public void deleteAttachmentsTest() {
         Mockito.verify(attachmentRepository, Mockito.times(2)).deleteAttachment(Mockito.anyLong());
     }
 
-    @Test(expected = ResourceNotFound.class)
-    public void deleteAttachmentsAndExpectResourceNotFoundTest() {
-        attachmentService.deleteAttachments(Set.of(3L), 9L, "loggedInUser", true);
-    }
-
     @Test(expected = ForbiddenException.class)
     public void deleteAttachmentsHandleReviewCounterExceededTest() {
         Attachment one = Attachment.builder()