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

Merge branch 'patch-1.0.2' into development

Browse source
This commit is contained in:
anhefti 2020-08-27 14:48:52 +02:00
commit e0fd028ebf
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,14 +44,14 @@ public abstract class CourseAccess {
this.allQuizzesRequest = asyncService.createMemoizingCircuitBreaker( this.allQuizzesRequest = asyncService.createMemoizingCircuitBreaker(
allQuizzesSupplier(), allQuizzesSupplier(),
3, 3,
Constants.MINUTE_IN_MILLIS, 10 * Constants.SECOND_IN_MILLIS,
Constants.MINUTE_IN_MILLIS, Constants.MINUTE_IN_MILLIS,
true, true,
Constants.HOUR_IN_MILLIS); Constants.HOUR_IN_MILLIS);
this.chaptersRequest = asyncService.createCircuitBreaker( this.chaptersRequest = asyncService.createCircuitBreaker(
3, 3,
Constants.MINUTE_IN_MILLIS, 10 * Constants.SECOND_IN_MILLIS,
Constants.MINUTE_IN_MILLIS); Constants.MINUTE_IN_MILLIS);
this.accountDetailRequest = asyncService.createCircuitBreaker( this.accountDetailRequest = asyncService.createCircuitBreaker(

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/LmsAPIServiceImpl.java
View file

@ -161,7 +161,7 @@ public class LmsAPIServiceImpl implements LmsAPIService {
final Long institutionId = filterMap.getInstitutionId(); final Long institutionId = filterMap.getInstitutionId();
return this.lmsSetupDAO.all(institutionId, true) return this.lmsSetupDAO.all(institutionId, true)
.getOrThrow() .getOrThrow()
.stream() .parallelStream()
.map(this::getLmsAPITemplate) .map(this::getLmsAPITemplate)
.flatMap(Result::onErrorLogAndSkip) .flatMap(Result::onErrorLogAndSkip)
.map(template -> template.getQuizzes(filterMap)) .map(template -> template.getQuizzes(filterMap))