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

fixed tests and test new laptopinstall

Browse source
This commit is contained in:
anhefti 2023-11-10 10:54:09 +01:00
parent 8b452a97a4
commit 1498fa4150
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamDAO.java
View file

@ -79,7 +79,7 @@ public interface ExamDAO extends ActivatableEntityDAO<Exam, Exam>, BulkActionSup
@CacheEvict(
cacheNames = ExamSessionCacheService.CACHE_NAME_RUNNING_EXAM,
key = "#examId")
String getAppSigantureKeySalt(Long examId);
String getAppSignatureKeySalt(Long examId);
/** Saves the Exam and updates the running exam cache. */
@Override
@ -171,7 +171,6 @@ public interface ExamDAO extends ActivatableEntityDAO<Exam, Exam>, BulkActionSup
/** Use this to check if the exam is up to date
*
* @param examId the exam identifier
* @param exam the exam to check if it is in sync with the persistent or if there is a newer version
* @return Result refer to the up-to-date result or to an error if happened */
Result<Boolean> upToDate(Exam exam);

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/AdditionalAttributesDAOImpl.java
View file

@ -154,6 +154,7 @@ public class AdditionalAttributesDAOImpl implements AdditionalAttributesDAO {
return this.additionalAttributeRecordMapper
.selectByPrimaryKey(rec.getId());
} else {
final AdditionalAttributeRecord rec = new AdditionalAttributeRecord(
null,
type.name(),
@ -170,6 +171,7 @@ public class AdditionalAttributesDAOImpl implements AdditionalAttributesDAO {
}
@Override
@Transactional
public boolean initAdditionalAttribute(
final EntityType type,
final Long entityId,

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

@ -497,7 +497,7 @@ public class ExamDAOImpl implements ExamDAO {
}
@Override
public String getAppSigantureKeySalt(final Long examId) {
public synchronized String getAppSignatureKeySalt(final Long examId) {
final CharSequence salt = KeyGenerators.string().generateKey();
this.additionalAttributesDAO.initAdditionalAttribute(
EntityType.EXAM,

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java
View file

@ -143,7 +143,7 @@ public class ExamSessionServiceImpl implements ExamSessionService {
return salt;
}
return this.examDAO.getAppSigantureKeySalt(examId);
return this.examDAO.getAppSignatureKeySalt(examId);
});
}

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientPingBlockingService.java
View file

@ -59,7 +59,7 @@ public class SEBClientPingBlockingService implements SEBClientPingService {
log.error("Failed to get ClientConnectionDataInternal for: {}", connectionToken);
}
if (instructionConfirm != StringUtils.EMPTY) {
if (StringUtils.isNotBlank(instructionConfirm)) {
this.sebClientInstructionService.confirmInstructionDone(connectionToken, instructionConfirm);
}