Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Kontr 2.0
Portal API Backend
Commits
21476bc2
Verified
Commit
21476bc2
authored
Oct 15, 2018
by
Peter Stanko
Browse files
Extensive logging for service layer
parent
08ae94a4
Pipeline
#17458
passed with stage
in 9 minutes and 3 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
portal/service/courses.py
View file @
21476bc2
...
@@ -35,7 +35,7 @@ class CourseService(GeneralService):
...
@@ -35,7 +35,7 @@ class CourseService(GeneralService):
course
=
Course
()
course
=
Course
()
self
.
_entity
=
course
self
.
_entity
=
course
self
.
_set_data
(
entity
=
course
,
**
data
)
self
.
_set_data
(
entity
=
course
,
**
data
)
log
.
debug
(
f
"[CREATE] Course
{
course
.
log_name
}
by
{
self
.
client_name
}
:
{
course
}
"
)
log
.
info
(
f
"[CREATE] Course
{
course
.
log_name
}
by
{
self
.
client_name
}
:
{
course
.
log_name
}
"
)
return
course
return
course
def
copy_course
(
self
,
target
:
Course
,
config
:
dict
)
->
Course
:
def
copy_course
(
self
,
target
:
Course
,
config
:
dict
)
->
Course
:
...
@@ -48,6 +48,7 @@ class CourseService(GeneralService):
...
@@ -48,6 +48,7 @@ class CourseService(GeneralService):
Returns(Course): Copied course instance (target)
Returns(Course): Copied course instance (target)
"""
"""
log
.
info
(
f
"[COPY] Copy course from
{
self
.
course
.
log_name
}
->
{
target
.
log_name
}
:
{
config
}
"
)
if
config
.
get
(
'roles'
):
if
config
.
get
(
'roles'
):
for
role
in
self
.
course
.
roles
:
for
role
in
self
.
course
.
roles
:
self
.
_rest_service
.
roles
(
role
).
copy_role
(
target
,
with_clients
=
config
[
'roles'
])
self
.
_rest_service
.
roles
(
role
).
copy_role
(
target
,
with_clients
=
config
[
'roles'
])
...
@@ -75,7 +76,7 @@ class CourseService(GeneralService):
...
@@ -75,7 +76,7 @@ class CourseService(GeneralService):
self
.
course
.
notes_access_token
=
token
self
.
course
.
notes_access_token
=
token
self
.
write_entity
(
self
.
course
)
self
.
write_entity
(
self
.
course
)
log
.
info
(
f
"[UPDATE] Notes access token
{
self
.
course
.
log_name
}
"
log
.
info
(
f
"[UPDATE] Notes access token
{
self
.
course
.
log_name
}
"
f
"by
{
self
.
client_name
}
:
{
token
}
"
)
f
"by
{
self
.
client_name
}
"
)
return
self
.
course
return
self
.
course
def
get_clients_filtered
(
self
,
groups
:
List
[
str
],
roles
:
List
[
str
],
client_type
=
None
)
->
List
[
User
]:
def
get_clients_filtered
(
self
,
groups
:
List
[
str
],
roles
:
List
[
str
],
client_type
=
None
)
->
List
[
User
]:
...
...
portal/service/projects.py
View file @
21476bc2
...
@@ -45,11 +45,14 @@ class ProjectService(GeneralService):
...
@@ -45,11 +45,14 @@ class ProjectService(GeneralService):
Returns(Project): Copied project
Returns(Project): Copied project
"""
"""
new_name
=
get_new_name
(
self
.
project
,
target
)
new_name
=
get_new_name
(
self
.
project
,
target
)
new_project
=
Project
(
target
,
codename
=
new_name
)
new_project
=
Project
(
target
,
codename
=
new_name
)
new_project
.
description
=
self
.
project
.
description
new_project
.
description
=
self
.
project
.
description
new_project
.
name
=
self
.
project
.
name
new_project
.
name
=
self
.
project
.
name
new_project
.
set_config
(
**
vars
(
self
.
project
.
config
))
new_project
.
set_config
(
**
vars
(
self
.
project
.
config
))
log
.
info
(
f
"[COPY] Project from
{
self
.
project
.
log_name
}
by"
f
"
{
self
.
client_name
}
:
{
new_project
.
log_name
}
"
)
return
new_project
return
new_project
def
can_create_submission
(
self
,
user
:
User
)
->
bool
:
def
can_create_submission
(
self
,
user
:
User
)
->
bool
:
...
@@ -189,6 +192,7 @@ class ProjectService(GeneralService):
...
@@ -189,6 +192,7 @@ class ProjectService(GeneralService):
def
update_project_test_files
(
self
):
def
update_project_test_files
(
self
):
""" Sends a request to Storage to update the project's test_files to the newest version.
""" Sends a request to Storage to update the project's test_files to the newest version.
"""
"""
log
.
info
(
f
"[SERVICE] Updating project files for
{
self
.
project
.
log_name
}
"
)
tasks
.
update_project_test_files
.
delay
(
self
.
project
.
course
.
id
,
self
.
project
.
id
)
tasks
.
update_project_test_files
.
delay
(
self
.
project
.
course
.
id
,
self
.
project
.
id
)
def
calculate_wait_time
(
self
,
user
:
User
)
->
datetime
.
datetime
:
def
calculate_wait_time
(
self
,
user
:
User
)
->
datetime
.
datetime
:
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment