Skip to content

Commit

Permalink
SEBSP-176
Browse files Browse the repository at this point in the history
  • Loading branch information
@anhefti
anhefti committed Dec 19, 2024
1 parent fcaef1e commit 5c1a4f7
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 19 deletions.
4 changes: 2 additions & 2 deletions src/main/java/ch/ethz/seb/sps/server/datalayer/dao/ExamDAO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ public interface ExamDAO extends ActivatableEntityDAO<Exam, Exam> {

boolean existsByUUID(String examUUID);

Result<Collection<Exam>> pksByExamName(final FilterMap filterMap);
Result<Collection<Exam>> pksByExamName(FilterMap filterMap);

boolean isExamRunning(Long examId);

Result<Collection<Exam>> getExamsStarted(final FilterMap filterMap);
Result<Collection<Exam>> getExamsWithin(FilterMap filterMap, Collection<Long> prePredicated);

Result<Collection<Long>> getAllForDeletion();

Expand Down
7 changes: 6 additions & 1 deletion src/main/java/ch/ethz/seb/sps/server/datalayer/dao/impl/ExamDAOBatis.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,15 @@ public Result<Collection<Exam>> allMatching(

@Override
@Transactional(readOnly = true)
public Result<Collection<Exam>> getExamsStarted(final FilterMap filterMap) {
public Result<Collection<Exam>> getExamsWithin(final FilterMap filterMap, Collection<Long> prePredicated) {

return Result.tryCatch(() -> {

final Long fromTime = filterMap.getLong(API.PARAM_FROM_TIME);
final Long toTime = filterMap.getLong(API.PARAM_TO_TIME);
final Collection<Long> pre = prePredicated != null && !prePredicated.isEmpty()
? prePredicated
: null;

return this.examRecordMapper
.selectByExample()
Expand All @@ -193,6 +196,8 @@ public Result<Collection<Exam>> getExamsStarted(final FilterMap filterMap) {
.and(
ExamRecordDynamicSqlSupport.startTime,
SqlBuilder.isLessThanOrEqualToWhenPresent(toTime))
.and( ExamRecordDynamicSqlSupport.id,
SqlBuilder.isInWhenPresent(pre))
.build()
.execute()
.stream()
Expand Down
58 changes: 42 additions & 16 deletions src/main/java/ch/ethz/seb/sps/server/weblayer/AdminProctorController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
import java.util.concurrent.Executor;
import java.util.stream.Collectors;

import ch.ethz.seb.sps.domain.model.EntityType;
import ch.ethz.seb.sps.domain.model.service.DistinctMetadataWindowForExam;
import ch.ethz.seb.sps.domain.model.service.UserListForApplicationSearch;
import ch.ethz.seb.sps.server.datalayer.dao.ExamDAO;
import ch.ethz.seb.sps.server.servicelayer.*;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

Expand Down Expand Up @@ -46,10 +48,6 @@
import ch.ethz.seb.sps.server.datalayer.batis.mapper.SessionRecordDynamicSqlSupport;
import ch.ethz.seb.sps.server.datalayer.dao.GroupDAO;
import ch.ethz.seb.sps.server.datalayer.dao.NoResourceFoundException;
import ch.ethz.seb.sps.server.servicelayer.GroupService;
import ch.ethz.seb.sps.server.servicelayer.GroupingService;
import ch.ethz.seb.sps.server.servicelayer.PaginationService;
import ch.ethz.seb.sps.server.servicelayer.ProctoringService;
import ch.ethz.seb.sps.utils.Constants;
import ch.ethz.seb.sps.utils.Result;
import io.swagger.v3.oas.annotations.Operation;
Expand All @@ -75,6 +73,7 @@ public class AdminProctorController {
private final ProctoringService proctoringService;
private final PaginationService paginationService;
private final GroupingService groupingService;
private final UserService userService;

public AdminProctorController(
final GroupDAO groupDAO,
Expand All @@ -84,6 +83,7 @@ public AdminProctorController(
final ProctoringService proctoringService,
final PaginationService paginationService,
final GroupingService groupingService,
final UserService userService,
@Qualifier(value = ServiceConfig.SCREENSHOT_DOWNLOAD_API_EXECUTOR) final Executor downloadExecutor) {

this.downloadExecutor = downloadExecutor;
Expand All @@ -94,6 +94,7 @@ public AdminProctorController(
this.paginationService = paginationService;
this.proctoringService = proctoringService;
this.groupingService = groupingService;
this.userService = userService;
}

@RequestMapping(
Expand Down Expand Up @@ -838,8 +839,8 @@ public List<Long> getScreenshotTimestamps(


@Operation(
summary = "Get a list of all running exams in the given time frame",
description = "Get a list of all exams which don't have a termination time and their start time is in the given time frame",
summary = "Get a list of all exams in the given time frame",
description = "Get a list of all exams which start time is in the given time frame",
requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
content = { @Content(mediaType = MediaType.APPLICATION_FORM_URLENCODED_VALUE) }),
parameters = {
Expand All @@ -863,10 +864,13 @@ public List<Exam> getExamsStarted(
@RequestParam(name = API.PARAM_FROM_TIME, required = false) final Long fromTime,
@RequestParam(name = API.PARAM_TO_TIME, required = false) final Long toTime,
final HttpServletRequest request){

final FilterMap filterMap = new FilterMap(request);

return this.examDAO.getExamsStarted(filterMap)
final Set<Long> granted = this.userService
.getIdsWithReadEntityPrivilege(EntityType.EXAM)
.getOrThrow();
return this.examDAO
.getExamsWithin(filterMap, granted)
.getOrThrow()
.stream()
.toList();
Expand All @@ -890,8 +894,17 @@ public List<Exam> getExamsStarted(
produces = MediaType.APPLICATION_JSON_VALUE)
public List<Long> getGroupIdsForExam(
@PathVariable(name = API.PARAM_EXAM_ID) final Long examId){

return this.groupDAO.getGroupIdsForExam(examId)

Exam exam = examDAO
.byPK(examId)
.getOrThrow();

if (!userService.hasGrant(API.PrivilegeType.READ, exam)) {
return Collections.emptyList();
}

return this.groupDAO
.getGroupIdsForExam(examId)
.getOrThrow()
.stream()
.toList();
Expand All @@ -915,14 +928,14 @@ public List<Long> getGroupIdsForExam(
produces = MediaType.APPLICATION_JSON_VALUE)
public List<String> getDistinctMetadataAppForExam(
@RequestParam(name = API.PARAM_GROUP_IDS, required = false) final String groupIds){

return this.screenshotDataDAO.getDistinctMetadataAppForExam(getIdListFromParameter(groupIds))

return this.screenshotDataDAO
.getDistinctMetadataAppForExam(getIdListFromParameter(groupIds))
.getOrThrow()
.stream()
.toList();
}



@Operation(
summary = "Get a list of metadata window titles for a given exam",
description = "Returns a list of distinct window titles for a given exam (via groupIds) & metadata application",
Expand All @@ -945,6 +958,7 @@ public DistinctMetadataWindowForExam getDistinctMetadataWindowForExam(
@RequestParam(name = API.SCREENSHOT_META_DATA_APPLICATION, required = true) final String metadataApplication,
@RequestParam(name = API.PARAM_GROUP_IDS, required = true) final String groupIds){

// TODO Apply user rights
return this.proctoringService.getDistinctMetadataWindowForExam(metadataApplication, getIdListFromParameter(groupIds));
}

Expand Down Expand Up @@ -974,6 +988,7 @@ public List<UserListForApplicationSearch> getUserListForApplicationSearch(
@RequestParam(name = API.SCREENSHOT_META_DATA_ACTIVE_WINDOW_TITLE, required = true) final String metadataWindowTitle,
@RequestParam(name = API.PARAM_GROUP_IDS, required = true) final String groupIds){

// TODO Apply user rights?
return this.screenshotDataDAO
.getUserListForApplicationSearch(metadataApplication, metadataWindowTitle, getIdListFromParameter(groupIds))
.getOrThrow();
Expand Down Expand Up @@ -1005,6 +1020,7 @@ public List<Long> getTimestampListForApplicationSearch(
@RequestParam(name = API.SCREENSHOT_META_DATA_APPLICATION, required = true) final String metadataApplication,
@RequestParam(name = API.SCREENSHOT_META_DATA_ACTIVE_WINDOW_TITLE, required = true) final String metadataWindowTitle){

// TODO Apply user rights?
return this.screenshotDataDAO
.getTimestampListForApplicationSearch(sessionUuid, metadataApplication, metadataWindowTitle)
.getOrThrow();
Expand Down Expand Up @@ -1054,11 +1070,21 @@ private Result<List<Date>> queryMatchingDaysForSessionSearch(final FilterMap fil
}

private List<Long> getIdListFromParameter(final String ids){
// check if user at least has read right for a group
final Collection<Long> readPrivilegedPredication = this.groupService.getReadPrivilegedPredication();

String[] idsString = StringUtils.split(ids, Constants.LIST_SEPARATOR_CHAR);
List<Long> idsList = new ArrayList<>();

for (String s : idsString) {
idsList.add(Long.parseLong(s));
try {
Long id = Long.parseLong(s);
if (readPrivilegedPredication.contains(id)) {
idsList.add(id);
}
} catch (Exception e) {
log.error("Failed to parse group id (pk): {} error: {}",s, e.getMessage());
}
}

return idsList;
Expand Down

0 comments on commit 5c1a4f7

Please sign in to comment.