Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tdt4242-base-APU
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
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Tor Martin Frøberg Wang
tdt4242-base-APU
Commits
0c0ae8a9
Commit
0c0ae8a9
authored
4 years ago
by
Tor Martin Frøberg Wang
Browse files
Options
Downloads
Patches
Plain Diff
Cleanup of leaderboard code
parent
a5779509
No related branches found
No related tags found
3 merge requests
!5
Ad ci/cs setup
,
!4
Dev
,
!1
Leaderboards
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
backend/secfit/workouts/views.py
+8
-11
8 additions, 11 deletions
backend/secfit/workouts/views.py
with
8 additions
and
11 deletions
backend/secfit/workouts/views.py
+
8
−
11
View file @
0c0ae8a9
...
...
@@ -36,6 +36,8 @@ import base64, pickle
from
django.core.signing
import
Signer
from
users.models
import
User
from
rest_framework.views
import
APIView
@api_view
([
"
GET
"
])
def
api_root
(
request
,
format
=
None
):
...
...
@@ -222,21 +224,16 @@ class ExerciseDetail(
def
delete
(
self
,
request
,
*
args
,
**
kwargs
):
return
self
.
destroy
(
request
,
*
args
,
**
kwargs
)
class
Leaderboards
(
mixins
.
RetrieveModelMixin
,
mixins
.
UpdateModelMixin
,
mixins
.
DestroyModelMixin
,
generics
.
GenericAPIView
,
):
class
Leaderboards
(
APIView
):
permission_classes
=
[
permissions
.
IsAuthenticated
]
def
get
(
self
,
request
,
*
args
,
**
kwargs
):
e_id
=
self
.
kwargs
.
get
(
"
pk
"
)
def
get
(
self
,
request
,
pk
):
# User must be logged in
if
self
.
request
.
user
:
leaderboardNumbers
=
ExerciseInstance
.
objects
.
filter
(
Q
(
exercise__pk
=
e_id
)
&
Q
(
workout__visibility
=
'
PU
'
)).
values
(
'
workout__owner__pk
'
).
annotate
(
amount
=
Sum
(
F
(
"
sets
"
)
*
F
(
"
number
"
),
output_field
=
IntegerField
())).
order_by
(
'
-amount
'
)
leaderboardNumbers
=
ExerciseInstance
.
objects
.
filter
(
Q
(
exercise__pk
=
pk
)
&
Q
(
workout__visibility
=
'
PU
'
)).
values
(
'
workout__owner__pk
'
).
annotate
(
amount
=
Sum
(
F
(
"
sets
"
)
*
F
(
"
number
"
),
output_field
=
IntegerField
())).
order_by
(
'
-amount
'
)
leaderboardResult
=
[]
...
...
@@ -261,8 +258,8 @@ class Leaderboards(
break
else
:
leaderboardResult
.
append
({
"
name
"
:
currentLoggedInUser
.
username
,
"
value
"
:
0
,
"
rank
"
:
len
(
leaderboardNumbers
)
+
1
})
return
Response
(
json
.
dumps
(
leaderboardResult
)
)
return
Response
(
leaderboardResult
)
class
ExerciseInstanceList
(
...
...
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