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

SEBSERV-399 fixed

Browse source
This commit is contained in:
anhefti 2023-03-13 13:39:09 +01:00
parent bd7cec2f66
commit 9032549f59
2 changed files with 8 additions and 2 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/dao/impl/ConfigurationNodeDAOImpl.java
View file

@ -402,13 +402,13 @@ public class ConfigurationNodeDAOImpl implements ConfigurationNodeDAO {
isEqualTo(data.name)) isEqualTo(data.name))
.and( .and(
ConfigurationNodeRecordDynamicSqlSupport.type, ConfigurationNodeRecordDynamicSqlSupport.type,
isNotEqualTo(data.type.name())) isEqualTo(data.type.name()))
.and( .and(
ConfigurationNodeRecordDynamicSqlSupport.id, ConfigurationNodeRecordDynamicSqlSupport.id,
isNotEqualTo(data.id)) isNotEqualTo(data.id))
.and( .and(
ConfigurationNodeRecordDynamicSqlSupport.institutionId, ConfigurationNodeRecordDynamicSqlSupport.institutionId,
isNotEqualTo(data.institutionId)) isEqualTo(data.institutionId))
.build() .build()
.execute(); .execute();

6
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/ExamConfigServiceImpl.java
View file

@ -36,6 +36,7 @@ import ch.ethz.seb.sebserver.gbl.model.sebconfig.Configuration;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationAttribute; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationAttribute;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationStatus; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationStatus;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationType;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationTableValues; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationTableValues;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationValue; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationValue;
import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
@ -426,6 +427,11 @@ public class ExamConfigServiceImpl implements ExamConfigService {
"The Type of ConfigurationNode cannot change after creation"); "The Type of ConfigurationNode cannot change after creation");
} }
if (configurationNode.type == ConfigurationType.TEMPLATE) {
// No configuration template specific checks for now
return configurationNode;
}
// if configuration is in use, "Ready to Use" is not possible // if configuration is in use, "Ready to Use" is not possible
if (configurationNode.status == ConfigurationStatus.READY_TO_USE) { if (configurationNode.status == ConfigurationStatus.READY_TO_USE) {
if (!this.examConfigurationMapDAO if (!this.examConfigurationMapDAO