Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
kypo-adaptive-training
Manage
Activity
Members
Labels
Plan
Issues
3
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MUNI-KYPO-CRP
backend-java
kypo-adaptive-training
Merge requests
!136
Resolve "An instance is able to be revived by updating end time"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "An instance is able to be revived by updating end time"
115-an-instance-is-able-to-be-revived-by-updating-end-time
into
develop
Overview
0
Commits
8
Pipelines
2
Changes
4
Merged
Mário Murín
requested to merge
115-an-instance-is-able-to-be-revived-by-updating-end-time
into
develop
8 months ago
Overview
0
Commits
8
Pipelines
2
Changes
1
Expand
Closes
#115 (closed)
👍
0
👎
0
Merge request reports
Viewing commit
fee6dd21
Prev
Next
Show latest version
1 file
+
9
−
0
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
fee6dd21
Add validation for reviving an instance
· fee6dd21
Mário Murín
authored
8 months ago
src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingInstanceService.java
+
9
−
0
Options
@@ -135,6 +135,7 @@ public class TrainingInstanceService {
public
String
update
(
TrainingInstance
trainingInstanceToUpdate
)
{
validateStartAndEndTime
(
trainingInstanceToUpdate
);
TrainingInstance
trainingInstance
=
findById
(
trainingInstanceToUpdate
.
getId
());
checkNotRevivingAnExpiredInstance
(
trainingInstanceToUpdate
,
trainingInstance
);
//add original organizers to update
trainingInstanceToUpdate
.
setOrganizers
(
new
HashSet
<>(
trainingInstance
.
getOrganizers
()));
addLoggedInUserAsOrganizerToTrainingInstance
(
trainingInstanceToUpdate
);
@@ -176,6 +177,14 @@ public class TrainingInstanceService {
}
}
private
void
checkNotRevivingAnExpiredInstance
(
TrainingInstance
trainingInstanceToUpdate
,
TrainingInstance
currentTrainingInstance
)
{
if
(
currentTrainingInstance
.
finished
()
&&
!
trainingInstanceToUpdate
.
finished
())
{
throw
new
EntityConflictException
(
new
EntityErrorDetail
(
TrainingInstance
.
class
,
"id"
,
trainingInstanceToUpdate
.
getId
().
getClass
(),
trainingInstanceToUpdate
.
getId
(),
"End time of an expired instance cannot be set to the future."
));
}
}
private
void
checkChangedFieldsOfTrainingInstance
(
TrainingInstance
trainingInstanceToUpdate
,
TrainingInstance
currentTrainingInstance
)
{
if
(!
currentTrainingInstance
.
getStartTime
().
equals
(
trainingInstanceToUpdate
.
getStartTime
()))
{
throw
new
EntityConflictException
(
new
EntityErrorDetail
(
TrainingInstance
.
class
,
"id"
,
Long
.
class
,
trainingInstanceToUpdate
.
getId
(),
Loading