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

refactor name check

Browse source
This commit is contained in:
anhefti 2021-04-20 16:19:05 +02:00
parent ed8d98a40b
commit 3e80bd0195
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/InstitutionDAOImpl.java
View file

@ -124,15 +124,7 @@ public class InstitutionDAOImpl implements InstitutionDAO {
public Result<Institution> save(final Institution institution) { public Result<Institution> save(final Institution institution) {
return Result.tryCatch(() -> { return Result.tryCatch(() -> {
final Long count = this.institutionRecordMapper.countByExample() checkUniqueName(institution);
.where(InstitutionRecordDynamicSqlSupport.name, isEqualTo(institution.name))
.and(InstitutionRecordDynamicSqlSupport.id, isNotEqualTo(institution.id))
.build()
.execute();
if (count != null && count > 0) {
throw new FieldValidationException("name", "institution:name:exists");
}
final InstitutionRecord newRecord = new InstitutionRecord( final InstitutionRecord newRecord = new InstitutionRecord(
institution.id, institution.id,
@ -154,14 +146,7 @@ public class InstitutionDAOImpl implements InstitutionDAO {
public Result<Institution> createNew(final Institution institution) { public Result<Institution> createNew(final Institution institution) {
return Result.tryCatch(() -> { return Result.tryCatch(() -> {
final Long count = this.institutionRecordMapper.countByExample() checkUniqueName(institution);
.where(InstitutionRecordDynamicSqlSupport.name, isEqualTo(institution.name))
.build()
.execute();
if (count != null && count > 0) {
throw new FieldValidationException("name", "institution:name:exists");
}
final InstitutionRecord newRecord = new InstitutionRecord( final InstitutionRecord newRecord = new InstitutionRecord(
null, null,
@ -271,4 +256,16 @@ public class InstitutionDAOImpl implements InstitutionDAO {
record.getThemeName(), record.getThemeName(),
BooleanUtils.toBooleanObject(record.getActive()))); BooleanUtils.toBooleanObject(record.getActive())));
} }
private void checkUniqueName(final Institution institution) {
final Long count = this.institutionRecordMapper.countByExample()
.where(InstitutionRecordDynamicSqlSupport.name, isEqualTo(institution.name))
.and(InstitutionRecordDynamicSqlSupport.id, isNotEqualToWhenPresent(institution.id))
.build()
.execute();
if (count != null && count > 0) {
throw new FieldValidationException("name", "institution:name:exists");
}
}
} }