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

SEBSERV-317 archived state filter and LMS activation handling

Browse source
This commit is contained in:
anhefti 2022-06-13 16:46:23 +02:00
parent b44c5f4eb2
commit 6a4c0ff89c
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java
View file

@ -228,6 +228,7 @@ public class ExamDAOImpl implements ExamDAO {
this.examRecordMapper.updateByExampleSelective(examRecord) this.examRecordMapper.updateByExampleSelective(examRecord)
.where(ExamRecordDynamicSqlSupport.id, isIn(ids)) .where(ExamRecordDynamicSqlSupport.id, isIn(ids))
.and(ExamRecordDynamicSqlSupport.status, isNotEqualTo(ExamStatus.ARCHIVED.name()))
.build() .build()
.execute(); .execute();

5
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamRecordDAO.java
View file

@ -193,6 +193,11 @@ public class ExamRecordDAO {
.and( .and(
ExamRecordDynamicSqlSupport.status, ExamRecordDynamicSqlSupport.status,
isInWhenPresent(stateNames)); isInWhenPresent(stateNames));
} else {
whereClause = whereClause
.and(
ExamRecordDynamicSqlSupport.status,
isNotEqualTo(ExamStatus.ARCHIVED.name()));
} }
final List<ExamRecord> records = whereClause final List<ExamRecord> records = whereClause