improved logging

Author: anhefti

src/main/java/ch/ethz/seb/sps/server/datalayer/dao/impl/ScreenshotDAOS3.java

@@ -34,17 +34,14 @@ public ScreenshotDAOS3(final S3DAO s3DAO) {
     }
 
     @Override
-    @Transactional(readOnly = true)
     public Result<InputStream> getImage(
             final Long pk,
             final String sessionUUID) {
 
-        return this.s3DAO.getItem(sessionUUID, pk)
-                .onError(error -> log.error("Failed to retrieve screenshot from S3 service: ", error));
+        return this.s3DAO.getItem(sessionUUID, pk);
     }
 
     @Override
-    @Transactional
     public Result<List<Long>> deleteAllForSession(
             final String sessionId,
             final List<Long> screenShotPKs) {
@@ -53,11 +50,7 @@ public Result<List<Long>> deleteAllForSession(
             this.s3DAO.deleteItemBatch(createItemListForDeletion(sessionId, screenShotPKs));
             return screenShotPKs;
 
-        })
-        .onError(error -> {
-            log.error("Failed to delete items...", error);
-        })
-        .onError(TransactionHandler::rollback);
+        });
     }
 
     private List<DeleteObject> createItemListForDeletion(final String sessionId, final List<Long> screenShotPKs){

src/main/java/ch/ethz/seb/sps/server/datalayer/dao/impl/SessionDAOBatis.java

@@ -539,7 +539,9 @@ private void deleteSessionScreenshots(final SessionRecord sessionRecord) {
                 .execute();
 
         // then all screenshots
-        this.screenshotDAO.deleteAllForSession(sessionRecord.getUuid(), screenShotPKs);
+        this.screenshotDAO
+                .deleteAllForSession(sessionRecord.getUuid(), screenShotPKs)
+                .onError(error -> log.error("Failed to delete Screenshots: {}", screenShotPKs, error ));
     }
 
     @Override

src/main/java/ch/ethz/seb/sps/server/weblayer/AdminProctorController.java

@@ -365,12 +365,12 @@ public CompletableFuture<Void> getScreenshot(
                         log.error("Failed to parse timestamp: {}", timestamp);
                         response.setStatus(HttpStatus.BAD_REQUEST.value());
                     } catch (final NoResourceFoundException nre) {
-                        log.error("Failed to stream image file: {}", nre.getMessage());
+                        log.warn("Failed to stream image file: {}", nre.getMessage());
                         response.setStatus(HttpStatus.NOT_FOUND.value());
                     } catch (final ClientAbortException cae) {
                         log.info("Client aborted connection: {}", cae.getMessage());
                     } catch (final Exception e) {
-                        log.error("Failed to stream image file: {}", e.getMessage());
+                        log.warn("Failed to stream image file: {}", e.getMessage());
                         response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
                     }
                 },