Skip to content
Snippets Groups Projects
Commit 45f98efc authored by Igor Ignác's avatar Igor Ignác
Browse files

Merge branch '99-trim-instance-access-codes' into 'develop'

Resolve "Trim access codes on instance creation"

See merge request !107
parents 2dcd35bc 9849ea77
No related branches found
No related tags found
3 merge requests!119Develop,!111Develop,!107Resolve "Trim access codes on instance creation"
Pipeline #181397 passed with stages
in 5 minutes and 17 seconds
...@@ -115,7 +115,7 @@ public class TrainingInstanceService { ...@@ -115,7 +115,7 @@ public class TrainingInstanceService {
* @return created {@link TrainingInstance} * @return created {@link TrainingInstance}
*/ */
public TrainingInstance create(TrainingInstance trainingInstance) { public TrainingInstance create(TrainingInstance trainingInstance) {
trainingInstance.setAccessToken(generateAccessToken(trainingInstance.getAccessToken())); trainingInstance.setAccessToken(generateAccessToken(trainingInstance.getAccessToken().trim()));
if (trainingInstance.getStartTime().isAfter(trainingInstance.getEndTime())) { if (trainingInstance.getStartTime().isAfter(trainingInstance.getEndTime())) {
throw new EntityConflictException(new EntityErrorDetail(TrainingInstance.class, "id", trainingInstance.getId().getClass(), trainingInstance.getId(), throw new EntityConflictException(new EntityErrorDetail(TrainingInstance.class, "id", trainingInstance.getId().getClass(), trainingInstance.getId(),
"End time must be later than start time.")); "End time must be later than start time."));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment