Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LabraCORE
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
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
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
LabraCORE
Merge requests
!104
Resolve "getAllEditionsActiveDuringPeriod returns incorrect list of editions"
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Resolve "getAllEditionsActiveDuringPeriod returns incorrect list of editions"
116-getalleditionsactiveduringperiod-returns-incorrect-list-of-editions
into
development
Overview
2
Commits
1
Pipelines
10
Changes
2
Merged
Resolve "getAllEditionsActiveDuringPeriod returns incorrect list of editions"
Chris Lemaire
requested to merge
116-getalleditionsactiveduringperiod-returns-incorrect-list-of-editions
into
development
Jun 25, 2020
Overview
2
Commits
1
Pipelines
10
Changes
2
Closes
#116 (closed)
Edited
Jun 26, 2020
by
Otto Visser
0
0
Merge request reports
Compare
development
version 3
2dc71de4
Jun 25, 2020
version 2
45e1ee90
Jun 25, 2020
version 1
eb9ce581
Jun 25, 2020
development (base)
and
latest version
latest version
8ddedda0
1 commit,
Jun 26, 2020
version 3
2dc71de4
1 commit,
Jun 25, 2020
version 2
45e1ee90
1 commit,
Jun 25, 2020
version 1
eb9ce581
1 commit,
Jun 25, 2020
2 files
+
10
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
src/main/java/nl/tudelft/labracore/repository/EditionRepository.java
+
3
−
3
View file @ 8ddedda0
Edit in single-file editor
Open in Web IDE
Show full file
@@ -84,9 +84,9 @@ public interface EditionRepository extends JpaRepository<Edition, Long>, Queryds
* @return The list of Editions active at the given time.
*/
default
List
<
Edition
>
findAllActiveDuring
(
Period
period
)
{
return
findAll
((
q
.
startDate
.
before
(
period
.
getStart
()).
and
(
q
.
endDate
.
after
(
period
.
get
Start
())))
.
or
(
q
.
start
Date
.
after
(
period
.
getStart
()).
and
(
q
.
start
Date
.
before
(
period
.
get
Start
())))
.
or
(
q
.
startDate
.
after
(
period
.
get
End
()).
and
(
q
.
start
Date
.
before
(
period
.
getEnd
()))));
return
findAll
((
q
.
startDate
.
after
(
period
.
getStart
()).
and
(
q
.
startDate
.
before
(
period
.
get
End
())))
.
or
(
q
.
end
Date
.
after
(
period
.
getStart
()).
and
(
q
.
end
Date
.
before
(
period
.
get
End
())))
.
or
(
q
.
startDate
.
after
(
period
.
get
Start
()).
and
(
q
.
end
Date
.
before
(
period
.
getEnd
()))));
}
}
Loading