zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

filter quizzes now

Browse source
This commit is contained in:
anhefti 2020-12-15 21:15:18 +01:00
parent 2b5047343c
commit 868420108d
3 changed files with 41 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/CourseAccess.java
View file

@ -43,7 +43,7 @@ public abstract class CourseAccess {
protected CourseAccess(final AsyncService asyncService) { protected CourseAccess(final AsyncService asyncService) {
this.allQuizzesRequest = asyncService.createMemoizingCircuitBreaker( this.allQuizzesRequest = asyncService.createMemoizingCircuitBreaker(
allQuizzesSupplier(null), allQuizzesSupplier(),
3, 3,
Constants.MINUTE_IN_MILLIS, Constants.MINUTE_IN_MILLIS,
Constants.MINUTE_IN_MILLIS, Constants.MINUTE_IN_MILLIS,
@ -101,7 +101,6 @@ public abstract class CourseAccess {
} }
public Result<List<QuizData>> getQuizzes(final FilterMap filterMap) { public Result<List<QuizData>> getQuizzes(final FilterMap filterMap) {
this.allQuizzesRequest.setSupplier(allQuizzesSupplier(filterMap));
return this.allQuizzesRequest.get() return this.allQuizzesRequest.get()
.map(LmsAPIService.quizzesFilterFunction(filterMap)); .map(LmsAPIService.quizzesFilterFunction(filterMap));
} }
@ -137,7 +136,7 @@ public abstract class CourseAccess {
protected abstract Supplier<List<QuizData>> quizzesSupplier(final Set<String> ids); protected abstract Supplier<List<QuizData>> quizzesSupplier(final Set<String> ids);
protected abstract Supplier<List<QuizData>> allQuizzesSupplier(final FilterMap filterMap); protected abstract Supplier<List<QuizData>> allQuizzesSupplier();
protected abstract Supplier<Chapters> getCourseChaptersSupplier(final String courseId); protected abstract Supplier<Chapters> getCourseChaptersSupplier(final String courseId);

3
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/edx/OpenEdxCourseAccess.java
View file

@ -49,7 +49,6 @@ import ch.ethz.seb.sebserver.gbl.model.user.ExamineeAccountDetails;
import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.gbl.util.Utils; import ch.ethz.seb.sebserver.gbl.util.Utils;
import ch.ethz.seb.sebserver.webservice.WebserviceInfo; import ch.ethz.seb.sebserver.webservice.WebserviceInfo;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap;
import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.CourseAccess; import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.CourseAccess;
/** Implements the LmsAPITemplate for Open edX LMS Course API access. /** Implements the LmsAPITemplate for Open edX LMS Course API access.
@ -174,7 +173,7 @@ final class OpenEdxCourseAccess extends CourseAccess {
} }
@Override @Override
protected Supplier<List<QuizData>> allQuizzesSupplier(final FilterMap filterMap) { protected Supplier<List<QuizData>> allQuizzesSupplier() {
return () -> getRestTemplate() return () -> getRestTemplate()
.map(this::collectAllQuizzes) .map(this::collectAllQuizzes)
.getOrThrow(); .getOrThrow();

79
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/MoodleCourseAccess.java
View file

@ -47,7 +47,6 @@ import ch.ethz.seb.sebserver.gbl.model.user.ExamineeAccountDetails;
import ch.ethz.seb.sebserver.gbl.util.Pair; import ch.ethz.seb.sebserver.gbl.util.Pair;
import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.gbl.util.Utils; import ch.ethz.seb.sebserver.gbl.util.Utils;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap;
import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.CourseAccess; import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.CourseAccess;
import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.moodle.MoodleRestTemplateFactory.MoodleAPIRestTemplate; import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.moodle.MoodleRestTemplateFactory.MoodleAPIRestTemplate;
@ -74,8 +73,6 @@ public class MoodleCourseAccess extends CourseAccess {
private static final String MOODLE_COURSE_API_SEARCH_PAGE = "page"; private static final String MOODLE_COURSE_API_SEARCH_PAGE = "page";
private static final String MOODLE_COURSE_API_SEARCH_PAGE_SIZE = "perpage"; private static final String MOODLE_COURSE_API_SEARCH_PAGE_SIZE = "perpage";
private static final int DEFAULT_FROM_YEARS = 3;
private final JSONMapper jsonMapper; private final JSONMapper jsonMapper;
private final LmsSetup lmsSetup; private final LmsSetup lmsSetup;
private final MoodleRestTemplateFactory moodleRestTemplateFactory; private final MoodleRestTemplateFactory moodleRestTemplateFactory;
@ -179,9 +176,9 @@ public class MoodleCourseAccess extends CourseAccess {
} }
@Override @Override
protected Supplier<List<QuizData>> allQuizzesSupplier(final FilterMap filterMap) { protected Supplier<List<QuizData>> allQuizzesSupplier() {
return () -> getRestTemplate() return () -> getRestTemplate()
.map(template -> collectAllQuizzes(template, filterMap)) .map(template -> collectAllQuizzes(template))
.getOrThrow(); .getOrThrow();
} }
@ -190,14 +187,12 @@ public class MoodleCourseAccess extends CourseAccess {
throw new UnsupportedOperationException("not available yet"); throw new UnsupportedOperationException("not available yet");
} }
private ArrayList<QuizData> collectAllQuizzes( private ArrayList<QuizData> collectAllQuizzes(final MoodleAPIRestTemplate restTemplate) {
final MoodleAPIRestTemplate restTemplate,
final FilterMap filterMap) {
final String urlPrefix = (this.lmsSetup.lmsApiUrl.endsWith(Constants.URL_PATH_SEPARATOR)) final String urlPrefix = (this.lmsSetup.lmsApiUrl.endsWith(Constants.URL_PATH_SEPARATOR))
? this.lmsSetup.lmsApiUrl + MOODLE_QUIZ_START_URL_PATH ? this.lmsSetup.lmsApiUrl + MOODLE_QUIZ_START_URL_PATH
: this.lmsSetup.lmsApiUrl + Constants.URL_PATH_SEPARATOR + MOODLE_QUIZ_START_URL_PATH; : this.lmsSetup.lmsApiUrl + Constants.URL_PATH_SEPARATOR + MOODLE_QUIZ_START_URL_PATH;
return getAllQuizzes(restTemplate, filterMap) return getAllQuizzes(restTemplate)
.stream() .stream()
.reduce( .reduce(
new ArrayList<>(), new ArrayList<>(),
@ -214,14 +209,12 @@ public class MoodleCourseAccess extends CourseAccess {
}); });
} }
private List<CourseData> getAllQuizzes( private List<CourseData> getAllQuizzes(final MoodleAPIRestTemplate restTemplate) {
final MoodleAPIRestTemplate restTemplate,
final FilterMap filterMap) {
final List<CourseData> result = new ArrayList<>(); final List<CourseData> result = new ArrayList<>();
int page = 0; int page = 0;
Pair<List<CourseData>, Integer> quizzesBatch = getQuizzesBatch(restTemplate, filterMap, page); Pair<List<CourseData>, Integer> quizzesBatch = getQuizzesBatch(restTemplate, page);
result.addAll(quizzesBatch.a); result.addAll(quizzesBatch.a);
log.info("Got quiz page batch for page {} of size {} with {} items", log.info("Got quiz page batch for page {} of size {} with {} items",
@ -229,9 +222,9 @@ public class MoodleCourseAccess extends CourseAccess {
quizzesBatch.b, quizzesBatch.b,
quizzesBatch.a.size()); quizzesBatch.a.size());
while (quizzesBatch.b == null || quizzesBatch.b == 0) { while (quizzesBatch.b != null && quizzesBatch.b > 0) {
page++; page++;
quizzesBatch = getQuizzesBatch(restTemplate, filterMap, page); quizzesBatch = getQuizzesBatch(restTemplate, page);
result.addAll(quizzesBatch.a); result.addAll(quizzesBatch.a);
log.info("Got quiz page batch for page {} of size {} with {} items", log.info("Got quiz page batch for page {} of size {} with {} items",
@ -244,18 +237,13 @@ public class MoodleCourseAccess extends CourseAccess {
private Pair<List<CourseData>, Integer> getQuizzesBatch( private Pair<List<CourseData>, Integer> getQuizzesBatch(
final MoodleAPIRestTemplate restTemplate, final MoodleAPIRestTemplate restTemplate,
final FilterMap filterMap,
final int page) { final int page) {
try { try {
final long fromTime = (filterMap != null && filterMap.getQuizFromTime() != null)
? Utils.toUnixTimeInSeconds(filterMap.getQuizFromTime())
: Utils.toUnixTimeInSeconds(DateTime.now(DateTimeZone.UTC).minusYears(DEFAULT_FROM_YEARS));
// first get courses from Moodle for page // first get courses from Moodle for page
final Map<String, CourseData> courseData = new HashMap<>(); final Map<String, CourseData> courseData = new HashMap<>();
final Collection<CourseData> coursesPage = getCoursesPage(restTemplate, fromTime, page, 100); final Collection<CourseData> coursesPage = getCoursesPage(restTemplate, page, 100);
if (coursesPage.isEmpty()) { if (coursesPage.isEmpty()) {
return new Pair<>(Collections.emptyList(), 0); return new Pair<>(Collections.emptyList(), 0);
@ -280,6 +268,8 @@ public class MoodleCourseAccess extends CourseAccess {
final Map<String, CourseData> finalCourseDataRef = courseData; final Map<String, CourseData> finalCourseDataRef = courseData;
if (courseQuizData.quizzes != null) { if (courseQuizData.quizzes != null) {
courseQuizData.quizzes courseQuizData.quizzes
.stream()
.filter(getQuizFilter())
.forEach(quiz -> { .forEach(quiz -> {
final CourseData course = finalCourseDataRef.get(quiz.course); final CourseData course = finalCourseDataRef.get(quiz.course);
if (course != null) { if (course != null) {
@ -299,27 +289,32 @@ public class MoodleCourseAccess extends CourseAccess {
} }
} }
private Predicate<CourseData> getCourseFilter(final long from) { private Predicate<CourseQuiz> getQuizFilter() {
final long now = DateTime.now(DateTimeZone.UTC).getMillis() / 1000; final long now = DateTime.now(DateTimeZone.UTC).getMillis() / 1000;
return course -> { return quiz -> {
if (course.end_date != null && course.end_date > now) { if (quiz.time_close == null || quiz.time_close == 0 || quiz.time_close > now) {
log.info("(end)removed course: {} start {} end {}, from {}", course.short_name, course.start_date, return true;
course.end_date, from);
return false;
}
if (course.start_date != null && course.start_date.longValue() < from) {
log.info("(start)removed course: {} start {} end {}, from {}", course.short_name, course.start_date,
course.end_date, from);
return false;
} }
return true; log.info("remove quiz {} end_time {} now {}", quiz.name, quiz.time_close, now);
return false;
};
}
private Predicate<CourseData> getCourseFilter() {
final long now = DateTime.now(DateTimeZone.UTC).getMillis() / 1000;
return course -> {
if (course.end_date == null || course.end_date == 0 || course.end_date > now) {
return true;
}
log.info("remove course {} end_time {} now {}", course.short_name, course.end_date, now);
return false;
}; };
} }
private Collection<CourseData> getCoursesPage( private Collection<CourseData> getCoursesPage(
final MoodleAPIRestTemplate restTemplate, final MoodleAPIRestTemplate restTemplate,
final long startDate,
final int page, final int page,
final int size) throws JsonParseException, JsonMappingException, IOException { final int size) throws JsonParseException, JsonMappingException, IOException {
@ -350,14 +345,16 @@ public class MoodleCourseAccess extends CourseAccess {
.map(key -> key.id) .map(key -> key.id)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
final Collection<CourseData> result = getCoursesForIds(restTemplate, ids) return getCoursesForIds(restTemplate, ids);
.stream()
.filter(getCourseFilter(startDate))
.collect(Collectors.toList());
log.info("course page with {} courses, after filtering {} left", keysPage.courseKeys, result.size()); // final Collection<CourseData> result = getCoursesForIds(restTemplate, ids)
// .stream()
return result; // .filter(getCourseFilter())
// .collect(Collectors.toList());
//
// log.info("course page with {} courses, after filtering {} left", keysPage.courseKeys, result.size());
//
// return result;
} catch (final Exception e) { } catch (final Exception e) {
log.error("Unexpected error while trying to get courses page: ", e); log.error("Unexpected error while trying to get courses page: ", e);
return Collections.emptyList(); return Collections.emptyList();