Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Pauline Backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
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
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
Pauline
Pauline Backend
Commits
40c71459
There was an error fetching the commit references. Please try again later.
Commit
40c71459
authored
Jul 8, 2022
by
Adrian Block
Browse files
Options
Downloads
Patches
Plain Diff
🐛
fixed multiple semesters with same name in newest
parent
e0a0529d
No related branches found
No related tags found
1 merge request
!3
Dev
Pipeline
#
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/data/brokers/database.py
+8
-6
8 additions, 6 deletions
app/data/brokers/database.py
with
8 additions
and
6 deletions
app/data/brokers/database.py
+
8
−
6
View file @
40c71459
import
datetime
from
typing
import
List
from
typing
import
List
,
Dict
from
sqlalchemy
import
func
,
and_
from
sqlalchemy.orm
import
Session
...
...
@@ -37,11 +37,13 @@ class DatabaseBroker(Broker):
return
self
.
session
.
query
(
models
.
Semester
).
all
()
def
get_newest_semesters
(
self
)
->
List
[
schemas
.
SemesterWithoutCoursesButId
]:
# query every semester, but only return the newest one
sq
=
self
.
session
.
query
(
models
.
Semester
.
name
.
label
(
"
name
"
),
func
.
max
(
models
.
Semester
.
created
).
label
(
"
created
"
))
\
.
group_by
(
models
.
Semester
.
name
).
subquery
()
return
self
.
session
.
query
(
models
.
Semester
)
\
.
join
(
sq
,
and_
(
models
.
Semester
.
name
==
sq
.
c
.
name
,
models
.
Semester
.
created
==
sq
.
c
.
created
)).
all
()
semesters
:
List
[
schemas
.
SemesterWithoutCoursesButId
]
=
self
.
session
.
query
(
models
.
Semester
).
all
()
semester_map
:
Dict
[
str
,
schemas
.
SemesterWithoutCoursesButId
]
=
{}
for
semester
in
semesters
:
if
(
semester_map
.
get
(
semester
.
name
)
and
semester
.
id
>
semester_map
[
semester
.
name
].
id
)
\
or
not
semester_map
.
get
(
semester
.
name
):
semester_map
[
semester
.
name
]
=
semester
return
list
(
semester_map
.
values
())
def
get_all_courses_of_semester
(
self
,
semester_id
:
int
)
->
List
[
schemas
.
CourseWithoutAppointments
]:
return
self
.
session
.
query
(
models
.
Course
).
join
(
models
.
Semester
).
filter
(
models
.
Semester
.
id
==
semester_id
).
all
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment