Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cs_comments_service
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
cs_comments_service
Commits
346c65ee
Commit
346c65ee
authored
Mar 17, 2017
by
Joel Barciauskas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove trace_execution_scoped blocks
parent
1258b84c
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
10 deletions
+0
-10
api/search.rb
+0
-2
api/users.rb
+0
-2
lib/helpers.rb
+0
-4
models/user.rb
+0
-2
No files found.
api/search.rb
View file @
346c65ee
...
@@ -20,7 +20,6 @@ def get_thread_ids(context, group_ids, local_params, search_text)
...
@@ -20,7 +20,6 @@ def get_thread_ids(context, group_ids, local_params, search_text)
)
)
end
end
self
.
class
.
trace_execution_scoped
([
'Custom/get_search_threads/es_search'
])
do
body
=
{
body
=
{
size:
CommentService
.
config
[
'max_deep_search_comment_count'
].
to_i
,
size:
CommentService
.
config
[
'max_deep_search_comment_count'
].
to_i
,
sort:
[
sort:
[
...
@@ -55,7 +54,6 @@ def get_thread_ids(context, group_ids, local_params, search_text)
...
@@ -55,7 +54,6 @@ def get_thread_ids(context, group_ids, local_params, search_text)
end
end
end
end
thread_ids
thread_ids
end
end
end
def
get_suggested_text
(
search_text
)
def
get_suggested_text
(
search_text
)
...
...
api/users.rb
View file @
346c65ee
...
@@ -54,13 +54,11 @@ get "#{APIPREFIX}/users/:user_id/active_threads" do |user_id|
...
@@ -54,13 +54,11 @@ get "#{APIPREFIX}/users/:user_id/active_threads" do |user_id|
collection
=
presenter
.
to_hash
collection
=
presenter
.
to_hash
json_output
=
nil
json_output
=
nil
self
.
class
.
trace_execution_scoped
([
'Custom/get_user_active_threads/json_serialize'
])
do
json_output
=
{
json_output
=
{
collection:
collection
,
collection:
collection
,
num_pages:
num_pages
,
num_pages:
num_pages
,
page:
page
,
page:
page
,
}.
to_json
}.
to_json
end
json_output
json_output
end
end
...
...
lib/helpers.rb
View file @
346c65ee
...
@@ -150,7 +150,6 @@ helpers do
...
@@ -150,7 +150,6 @@ helpers do
end
end
if
filter_flagged
if
filter_flagged
self
.
class
.
trace_execution_scoped
([
'Custom/handle_threads_query/find_flagged'
])
do
# TODO replace with aggregate query?
# TODO replace with aggregate query?
comment_ids
=
Comment
.
where
(
:course_id
=>
course_id
).
comment_ids
=
Comment
.
where
(
:course_id
=>
course_id
).
where
(
:abuse_flaggers
.
ne
=>
[],
:abuse_flaggers
.
exists
=>
true
).
where
(
:abuse_flaggers
.
ne
=>
[],
:abuse_flaggers
.
exists
=>
true
).
...
@@ -161,17 +160,14 @@ helpers do
...
@@ -161,17 +160,14 @@ helpers do
comment_threads
=
comment_threads
.
in
({
"_id"
=>
(
comment_ids
+
thread_ids
).
uniq
})
comment_threads
=
comment_threads
.
in
({
"_id"
=>
(
comment_ids
+
thread_ids
).
uniq
})
end
end
end
if
filter_unanswered
if
filter_unanswered
self
.
class
.
trace_execution_scoped
([
'Custom/handle_threads_query/find_unanswered'
])
do
endorsed_thread_ids
=
Comment
.
where
(
:course_id
=>
course_id
).
endorsed_thread_ids
=
Comment
.
where
(
:course_id
=>
course_id
).
where
(
:parent_id
.
exists
=>
false
,
:endorsed
=>
true
).
where
(
:parent_id
.
exists
=>
false
,
:endorsed
=>
true
).
collect
{
|
c
|
c
.
comment_thread_id
}.
uniq
collect
{
|
c
|
c
.
comment_thread_id
}.
uniq
comment_threads
=
comment_threads
.
where
({
"thread_type"
=>
:question
}).
nin
({
"_id"
=>
endorsed_thread_ids
})
comment_threads
=
comment_threads
.
where
({
"thread_type"
=>
:question
}).
nin
({
"_id"
=>
endorsed_thread_ids
})
end
end
end
sort_criteria
=
get_sort_criteria
(
sort_key
)
sort_criteria
=
get_sort_criteria
(
sort_key
)
if
not
sort_criteria
if
not
sort_criteria
...
...
models/user.rb
View file @
346c65ee
...
@@ -50,7 +50,6 @@ class User
...
@@ -50,7 +50,6 @@ class User
end
end
if
params
[
:course_id
]
if
params
[
:course_id
]
self
.
class
.
trace_execution_scoped
([
'Custom/User.to_hash/count_comments_and_threads'
])
do
if
not
params
[
:group_ids
].
empty?
if
not
params
[
:group_ids
].
empty?
# Get threads in either the specified group(s) or posted to all groups (nil).
# Get threads in either the specified group(s) or posted to all groups (nil).
specified_groups_or_global
=
params
[
:group_ids
]
<<
nil
specified_groups_or_global
=
params
[
:group_ids
]
<<
nil
...
@@ -105,7 +104,6 @@ class User
...
@@ -105,7 +104,6 @@ class User
end
end
hash
=
hash
.
merge!
(
"threads_count"
=>
threads_count
,
"comments_count"
=>
comments_count
)
hash
=
hash
.
merge!
(
"threads_count"
=>
threads_count
,
"comments_count"
=>
comments_count
)
end
end
end
hash
hash
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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