Merge remote-tracking branch 'origin/dev-1.2' into development

Author: anhefti

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

@@ -161,11 +161,11 @@ private Long getLastScreenshotEntryId(String sessionUUID) {
                     .build()
                     .execute();
 
-            if (all != null) {
+            if (all != null && !all.isEmpty()) {
                 return all.get(all.size() - 1);
             }
 
-            log.warn("No screenshot entry found for session: {}", sessionUUID);
+            log.info("No screenshot entry found for session: {}", sessionUUID);
             return null;
         } catch (Exception e) {
             log.error("Failed to get last screenshot entry for session: {} error: {}", sessionUUID, e.getMessage());

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

@@ -554,6 +554,7 @@ private void deleteSessionScreenshots(final SessionRecord sessionRecord) {
                 .build()
                 .execute();
 
+
         // then all screenshots
         this.screenshotDAO
                 .deleteAllForSession(sessionRecord.getUuid(), screenShotPKs)
@@ -734,17 +735,15 @@ public Result<Boolean> hasAnySessionData(Collection<Long> groupIds) {
                     .build()
                     .execute();
 
-            if (sessionIds == null  || sessionIds.isEmpty()) {
-                return false;
-            }
-
-            Long dataNum = this.screenshotDataRecordMapper
-                    .countByExample()
-                    .where(ScreenshotDataRecordDynamicSqlSupport.id, isIn(sessionIds))
-                    .build()
-                    .execute();
+            return sessionIds != null && !sessionIds.isEmpty();
 
-            return dataNum != null && dataNum.intValue() != 0;
+//            Long dataNum = this.screenshotDataRecordMapper
+//                    .countByExample()
+//                    .where(ScreenshotDataRecordDynamicSqlSupport.id, isIn(sessionIds))
+//                    .build()
+//                    .execute();
+//
+//            return dataNum != null && dataNum.intValue() != 0;
         });
     }
 

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

@@ -101,6 +101,7 @@ public Exam create(
             produces = MediaType.APPLICATION_JSON_VALUE)
 
     public Collection<EntityKey> requestDelete(@PathVariable final String modelId) {
+        // TODO this should never block here do this in background with balk action
         if (!this.sessionService.hasAnySessionDataForExam(modelId)) {
             return super.hardDelete(modelId);
         } else {

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

@@ -125,7 +125,7 @@ public Group create(
             consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
             produces = MediaType.APPLICATION_JSON_VALUE)
     public Collection<EntityKey> requestDelete(@PathVariable(name = API.PARAM_MODEL_ID) final String groupUUID) {
-
+        // TODO this should never block here do this in background with balk action
         if (!this.sessionService.hasAnySessionDataForGroup(groupUUID)) {
             return super.hardDelete(groupUUID);
         } else {