Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
303504df
Commit
303504df
authored
Apr 29, 2017
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'tc-no-todo-service-select' into 'master'"
This reverts merge request !10845
parent
3717d21d
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
48 deletions
+30
-48
app/controllers/dashboard/todos_controller.rb
app/controllers/dashboard/todos_controller.rb
+2
-2
app/services/issuable_base_service.rb
app/services/issuable_base_service.rb
+1
-1
app/services/todo_service.rb
app/services/todo_service.rb
+6
-10
lib/api/todos.rb
lib/api/todos.rb
+2
-2
lib/api/v3/todos.rb
lib/api/v3/todos.rb
+2
-2
spec/services/todo_service_spec.rb
spec/services/todo_service_spec.rb
+17
-31
No files found.
app/controllers/dashboard/todos_controller.rb
View file @
303504df
...
...
@@ -12,7 +12,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
end
def
destroy
TodoService
.
new
.
mark_todos_as_done_by_ids
(
params
[
:id
],
current_user
)
TodoService
.
new
.
mark_todos_as_done_by_ids
(
[
params
[
:id
]
],
current_user
)
respond_to
do
|
format
|
format
.
html
{
redirect_to
dashboard_todos_path
,
notice:
'Todo was successfully marked as done.'
}
...
...
@@ -32,7 +32,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
end
def
restore
TodoService
.
new
.
mark_todos_as_pending_by_ids
(
params
[
:id
],
current_user
)
TodoService
.
new
.
mark_todos_as_pending_by_ids
(
[
params
[
:id
]
],
current_user
)
render
json:
todos_counts
end
...
...
app/services/issuable_base_service.rb
View file @
303504df
...
...
@@ -260,7 +260,7 @@ class IssuableBaseService < BaseService
todo_service
.
mark_todo
(
issuable
,
current_user
)
when
'done'
todo
=
TodosFinder
.
new
(
current_user
).
execute
.
find_by
(
target:
issuable
)
todo_service
.
mark_todos_as_done
_by_ids
(
todo
,
current_user
)
if
todo
todo_service
.
mark_todos_as_done
([
todo
]
,
current_user
)
if
todo
end
end
...
...
app/services/todo_service.rb
View file @
303504df
...
...
@@ -170,22 +170,20 @@ class TodoService
# When user marks some todos as done
def
mark_todos_as_done
(
todos
,
current_user
)
update_todos_state
(
todos
,
current_user
,
:done
)
update_todos_state
_by_ids
(
todos
.
select
(
&
:id
)
,
current_user
,
:done
)
end
def
mark_todos_as_done_by_ids
(
ids
,
current_user
)
todos
=
todos_by_ids
(
ids
,
current_user
)
mark_todos_as_done
(
todos
,
current_user
)
update_todos_state_by_ids
(
ids
,
current_user
,
:done
)
end
# When user marks some todos as pending
def
mark_todos_as_pending
(
todos
,
current_user
)
update_todos_state
(
todos
,
current_user
,
:pending
)
update_todos_state
_by_ids
(
todos
.
select
(
&
:id
)
,
current_user
,
:pending
)
end
def
mark_todos_as_pending_by_ids
(
ids
,
current_user
)
todos
=
todos_by_ids
(
ids
,
current_user
)
mark_todos_as_pending
(
todos
,
current_user
)
update_todos_state_by_ids
(
ids
,
current_user
,
:pending
)
end
# When user marks an issue as todo
...
...
@@ -200,11 +198,9 @@ class TodoService
private
def
todos_by_ids
(
ids
,
current_user
)
current_user
.
todos
.
where
(
id:
Array
(
ids
))
end
def
update_todos_state_by_ids
(
ids
,
current_user
,
state
)
todos
=
current_user
.
todos
.
where
(
id:
ids
)
def
update_todos_state
(
todos
,
current_user
,
state
)
# Only update those that are not really on that state
todos
=
todos
.
where
.
not
(
state:
state
)
todos_ids
=
todos
.
pluck
(
:id
)
...
...
lib/api/todos.rb
View file @
303504df
...
...
@@ -59,10 +59,10 @@ module API
requires
:id
,
type:
Integer
,
desc:
'The ID of the todo being marked as done'
end
post
':id/mark_as_done'
do
TodoService
.
new
.
mark_todos_as_done_by_ids
(
params
[
:id
],
current_user
)
todo
=
current_user
.
todos
.
find
(
params
[
:id
])
TodoService
.
new
.
mark_todos_as_done
([
todo
],
current_user
)
present
todo
,
with:
::
API
::
Entities
::
Todo
,
current_user:
current_user
present
todo
.
reload
,
with:
Entities
::
Todo
,
current_user:
current_user
end
desc
'Mark all todos as done'
...
...
lib/api/v3/todos.rb
View file @
303504df
...
...
@@ -11,10 +11,10 @@ module API
requires
:id
,
type:
Integer
,
desc:
'The ID of the todo being marked as done'
end
delete
':id'
do
TodoService
.
new
.
mark_todos_as_done_by_ids
(
params
[
:id
],
current_user
)
todo
=
current_user
.
todos
.
find
(
params
[
:id
])
TodoService
.
new
.
mark_todos_as_done
([
todo
],
current_user
)
present
todo
,
with:
::
API
::
Entities
::
Todo
,
current_user:
current_user
present
todo
.
reload
,
with:
::
API
::
Entities
::
Todo
,
current_user:
current_user
end
desc
'Mark all todos as done'
...
...
spec/services/todo_service_spec.rb
View file @
303504df
...
...
@@ -336,7 +336,7 @@ describe TodoService, services: true do
describe
'#mark_todos_as_done'
do
it_behaves_like
'updating todos state'
,
:mark_todos_as_done
,
:pending
,
:done
do
let
(
:collection
)
{
Todo
.
all
}
let
(
:collection
)
{
[
first_todo
,
second_todo
]
}
end
end
...
...
@@ -348,7 +348,7 @@ describe TodoService, services: true do
describe
'#mark_todos_as_pending'
do
it_behaves_like
'updating todos state'
,
:mark_todos_as_pending
,
:done
,
:pending
do
let
(
:collection
)
{
Todo
.
all
}
let
(
:collection
)
{
[
first_todo
,
second_todo
]
}
end
end
...
...
@@ -873,15 +873,21 @@ describe TodoService, services: true do
create
(
:todo
,
:mentioned
,
user:
john_doe
,
target:
issue
,
project:
project
)
todos
=
TodosFinder
.
new
(
john_doe
,
{}).
execute
expect
{
service
.
mark_todos_as_done
(
todos
,
john_doe
)
}
expect
{
TodoService
.
new
.
mark_todos_as_done
(
todos
,
john_doe
)
}
.
to
change
{
john_doe
.
todos
.
done
.
count
}.
from
(
0
).
to
(
1
)
end
it
'marks an array of todos as done'
do
todo
=
create
(
:todo
,
:mentioned
,
user:
john_doe
,
target:
issue
,
project:
project
)
expect
{
TodoService
.
new
.
mark_todos_as_done
([
todo
],
john_doe
)
}
.
to
change
{
todo
.
reload
.
state
}.
from
(
'pending'
).
to
(
'done'
)
end
it
'returns the ids of updated todos'
do
# Needed on API
todo
=
create
(
:todo
,
:mentioned
,
user:
john_doe
,
target:
issue
,
project:
project
)
todos
=
TodosFinder
.
new
(
john_doe
,
{}).
execute
expect
(
service
.
mark_todos_as_done
(
todos
,
john_doe
)).
to
eq
([
todo
.
id
])
expect
(
TodoService
.
new
.
mark_todos_as_done
([
todo
],
john_doe
)).
to
eq
([
todo
.
id
])
end
context
'when some of the todos are done already'
do
...
...
@@ -889,43 +895,23 @@ describe TodoService, services: true do
let!
(
:second_todo
)
{
create
(
:todo
,
:mentioned
,
user:
john_doe
,
target:
another_issue
,
project:
project
)
}
it
'returns the ids of those still pending'
do
service
.
mark_pending_todos_as_done
(
issue
,
john_doe
)
TodoService
.
new
.
mark_pending_todos_as_done
(
issue
,
john_doe
)
expect
(
service
.
mark_todos_as_done
(
Todo
.
all
,
john_doe
)).
to
eq
([
second_todo
.
id
])
expect
(
TodoService
.
new
.
mark_todos_as_done
(
Todo
.
all
,
john_doe
)).
to
eq
([
second_todo
.
id
])
end
it
'returns an empty array if all are done'
do
service
.
mark_pending_todos_as_done
(
issue
,
john_doe
)
service
.
mark_pending_todos_as_done
(
another_issue
,
john_doe
)
TodoService
.
new
.
mark_pending_todos_as_done
(
issue
,
john_doe
)
TodoService
.
new
.
mark_pending_todos_as_done
(
another_issue
,
john_doe
)
expect
(
service
.
mark_todos_as_done
(
Todo
.
all
,
john_doe
)).
to
eq
([])
expect
(
TodoService
.
new
.
mark_todos_as_done
(
Todo
.
all
,
john_doe
)).
to
eq
([])
end
end
end
describe
'#mark_todos_as_done_by_ids'
do
let
(
:issue
)
{
create
(
:issue
,
project:
project
,
author:
author
,
assignee:
john_doe
)
}
let
(
:another_issue
)
{
create
(
:issue
,
project:
project
,
author:
author
,
assignee:
john_doe
)
}
it
'marks an array of todo ids as done'
do
todo
=
create
(
:todo
,
:mentioned
,
user:
john_doe
,
target:
issue
,
project:
project
)
another_todo
=
create
(
:todo
,
:mentioned
,
user:
john_doe
,
target:
another_issue
,
project:
project
)
expect
{
service
.
mark_todos_as_done_by_ids
([
todo
.
id
,
another_todo
.
id
],
john_doe
)
}
.
to
change
{
john_doe
.
todos
.
done
.
count
}.
from
(
0
).
to
(
2
)
end
it
'marks a single todo id as done'
do
todo
=
create
(
:todo
,
:mentioned
,
user:
john_doe
,
target:
issue
,
project:
project
)
expect
{
service
.
mark_todos_as_done_by_ids
(
todo
.
id
,
john_doe
)
}
.
to
change
{
todo
.
reload
.
state
}.
from
(
'pending'
).
to
(
'done'
)
end
it
'caches the number of todos of a user'
,
:caching
do
create
(
:todo
,
:mentioned
,
user:
john_doe
,
target:
issue
,
project:
project
)
todo
=
create
(
:todo
,
:mentioned
,
user:
john_doe
,
target:
issue
,
project:
project
)
service
.
mark_todos_as_done_by_ids
(
todo
,
john_doe
)
TodoService
.
new
.
mark_todos_as_done
([
todo
]
,
john_doe
)
expect_any_instance_of
(
TodosFinder
).
not_to
receive
(
:execute
)
...
...
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