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
0c22698b
Commit
0c22698b
authored
May 12, 2016
by
Ahmad Sherif
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add API endpoints for un/subscribing from/to a label
Closes #15638
parent
74c69709
Changes
13
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
261 additions
and
77 deletions
+261
-77
CHANGELOG
CHANGELOG
+1
-0
app/models/concerns/subscribable.rb
app/models/concerns/subscribable.rb
+6
-0
doc/api/labels.md
doc/api/labels.md
+70
-0
lib/api/api.rb
lib/api/api.rb
+1
-0
lib/api/entities.rb
lib/api/entities.rb
+4
-0
lib/api/helpers.rb
lib/api/helpers.rb
+11
-0
lib/api/issues.rb
lib/api/issues.rb
+1
-38
lib/api/labels.rb
lib/api/labels.rb
+3
-3
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+0
-36
lib/api/subscriptions.rb
lib/api/subscriptions.rb
+60
-0
spec/models/concerns/subscribable_spec.rb
spec/models/concerns/subscribable_spec.rb
+10
-0
spec/requests/api/issues_spec.rb
spec/requests/api/issues_spec.rb
+12
-0
spec/requests/api/labels_spec.rb
spec/requests/api/labels_spec.rb
+82
-0
No files found.
CHANGELOG
View file @
0c22698b
...
@@ -47,6 +47,7 @@ v 8.8.0 (unreleased)
...
@@ -47,6 +47,7 @@ v 8.8.0 (unreleased)
- Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
- Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
- Total method execution timings are no longer tracked
- Total method execution timings are no longer tracked
- Allow Admins to remove the Login with buttons for OAuth services and still be able to import !4034. (Andrei Gliga)
- Allow Admins to remove the Login with buttons for OAuth services and still be able to import !4034. (Andrei Gliga)
- Add API endpoints for un/subscribing from/to a label. !4051 (Ahmad Sherif)
v 8.7.5
v 8.7.5
- Fix relative links in wiki pages. !4050
- Fix relative links in wiki pages. !4050
...
...
app/models/concerns/subscribable.rb
View file @
0c22698b
...
@@ -36,6 +36,12 @@ module Subscribable
...
@@ -36,6 +36,12 @@ module Subscribable
update
(
subscribed:
!
subscribed?
(
user
))
update
(
subscribed:
!
subscribed?
(
user
))
end
end
def
subscribe
(
user
)
subscriptions
.
find_or_initialize_by
(
user_id:
user
.
id
).
update
(
subscribed:
true
)
end
def
unsubscribe
(
user
)
def
unsubscribe
(
user
)
subscriptions
.
subscriptions
.
find_or_initialize_by
(
user_id:
user
.
id
).
find_or_initialize_by
(
user_id:
user
.
id
).
...
...
doc/api/labels.md
View file @
0c22698b
...
@@ -165,3 +165,73 @@ Example response:
...
@@ -165,3 +165,73 @@ Example response:
"description"
:
"Documentation"
"description"
:
"Documentation"
}
}
```
```
## Subscribe to a label
Subscribes the authenticated user to a label to receive notifications. If the
operation is successful, status code
`201`
together with the updated label is
returned. If the user is already subscribed to the label, the status code
`304`
is returned. If the project or label is not found, status code
`404`
is
returned.
```
POST /projects/:id/labels/:label_id/subscription
```
| Attribute | Type | Required | Description |
| ---------- | ----------------- | -------- | ------------------------------------ |
|
`id`
| integer | yes | The ID of a project |
|
`label_id`
| integer or string | yes | The ID or title of a project's label |
```
bash
curl
-X
POST
-H
"PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK"
https://gitlab.example.com/api/v3/projects/5/labels/1/subscription
```
Example response:
```
json
{
"name"
:
"Docs"
,
"color"
:
"#cc0033"
,
"description"
:
""
,
"open_issues_count"
:
0
,
"closed_issues_count"
:
0
,
"open_merge_requests_count"
:
0
,
"subscribed"
:
true
}
```
## Unsubscribe from a label
Unsubscribes the authenticated user from a label to not receive notifications
from it. If the operation is successful, status code
`200`
together with the
updated label is returned. If the user is not subscribed to the label, the
status code
`304`
is returned. If the project or label is not found, status code
`404`
is returned.
```
DELETE /projects/:id/labels/:label_id/subscription
```
| Attribute | Type | Required | Description |
| ---------- | ----------------- | -------- | ------------------------------------ |
|
`id`
| integer | yes | The ID of a project |
|
`label_id`
| integer or string | yes | The ID or title of a project's label |
```
bash
curl
-X
DELETE
-H
"PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK"
https://gitlab.example.com/api/v3/projects/5/labels/1/subscription
```
Example response:
```
json
{
"name"
:
"Docs"
,
"color"
:
"#cc0033"
,
"description"
:
""
,
"open_issues_count"
:
0
,
"closed_issues_count"
:
0
,
"open_merge_requests_count"
:
0
,
"subscribed"
:
false
}
```
lib/api/api.rb
View file @
0c22698b
...
@@ -57,5 +57,6 @@ module API
...
@@ -57,5 +57,6 @@ module API
mount
::
API
::
Variables
mount
::
API
::
Variables
mount
::
API
::
Runners
mount
::
API
::
Runners
mount
::
API
::
Licenses
mount
::
API
::
Licenses
mount
::
API
::
Subscriptions
end
end
end
end
lib/api/entities.rb
View file @
0c22698b
...
@@ -307,6 +307,10 @@ module API
...
@@ -307,6 +307,10 @@ module API
class
Label
<
Grape
::
Entity
class
Label
<
Grape
::
Entity
expose
:name
,
:color
,
:description
expose
:name
,
:color
,
:description
expose
:open_issues_count
,
:closed_issues_count
,
:open_merge_requests_count
expose
:open_issues_count
,
:closed_issues_count
,
:open_merge_requests_count
expose
:subscribed
do
|
label
,
options
|
label
.
subscribed?
(
options
[
:current_user
])
end
end
end
class
Compare
<
Grape
::
Entity
class
Compare
<
Grape
::
Entity
...
...
lib/api/helpers.rb
View file @
0c22698b
...
@@ -95,6 +95,17 @@ module API
...
@@ -95,6 +95,17 @@ module API
end
end
end
end
def
find_project_label
(
id
)
label
=
user_project
.
labels
.
find_by_id
(
id
)
||
user_project
.
labels
.
find_by_title
(
id
)
label
||
not_found!
(
'Label'
)
end
def
find_project_issue
(
id
)
issue
=
user_project
.
issues
.
find
(
id
)
not_found!
unless
can?
(
current_user
,
:read_issue
,
issue
)
issue
end
def
paginate
(
relation
)
def
paginate
(
relation
)
relation
.
page
(
params
[
:page
]).
per
(
params
[
:per_page
].
to_i
).
tap
do
|
data
|
relation
.
page
(
params
[
:page
]).
per
(
params
[
:per_page
].
to_i
).
tap
do
|
data
|
add_pagination_headers
(
data
)
add_pagination_headers
(
data
)
...
...
lib/api/issues.rb
View file @
0c22698b
...
@@ -103,8 +103,7 @@ module API
...
@@ -103,8 +103,7 @@ module API
# Example Request:
# Example Request:
# GET /projects/:id/issues/:issue_id
# GET /projects/:id/issues/:issue_id
get
":id/issues/:issue_id"
do
get
":id/issues/:issue_id"
do
@issue
=
user_project
.
issues
.
find
(
params
[
:issue_id
])
@issue
=
find_project_issue
(
params
[
:issue_id
])
not_found!
unless
can?
(
current_user
,
:read_issue
,
@issue
)
present
@issue
,
with:
Entities
::
Issue
,
current_user:
current_user
present
@issue
,
with:
Entities
::
Issue
,
current_user:
current_user
end
end
...
@@ -234,42 +233,6 @@ module API
...
@@ -234,42 +233,6 @@ module API
authorize!
(
:destroy_issue
,
issue
)
authorize!
(
:destroy_issue
,
issue
)
issue
.
destroy
issue
.
destroy
end
end
# Subscribes to a project issue
#
# Parameters:
# id (required) - The ID of a project
# issue_id (required) - The ID of a project issue
# Example Request:
# POST /projects/:id/issues/:issue_id/subscription
post
':id/issues/:issue_id/subscription'
do
issue
=
user_project
.
issues
.
find
(
params
[
:issue_id
])
if
issue
.
subscribed?
(
current_user
)
not_modified!
else
issue
.
toggle_subscription
(
current_user
)
present
issue
,
with:
Entities
::
Issue
,
current_user:
current_user
end
end
# Unsubscribes from a project issue
#
# Parameters:
# id (required) - The ID of a project
# issue_id (required) - The ID of a project issue
# Example Request:
# DELETE /projects/:id/issues/:issue_id/subscription
delete
':id/issues/:issue_id/subscription'
do
issue
=
user_project
.
issues
.
find
(
params
[
:issue_id
])
if
issue
.
subscribed?
(
current_user
)
issue
.
unsubscribe
(
current_user
)
present
issue
,
with:
Entities
::
Issue
,
current_user:
current_user
else
not_modified!
end
end
end
end
end
end
end
end
lib/api/labels.rb
View file @
0c22698b
...
@@ -11,7 +11,7 @@ module API
...
@@ -11,7 +11,7 @@ module API
# Example Request:
# Example Request:
# GET /projects/:id/labels
# GET /projects/:id/labels
get
':id/labels'
do
get
':id/labels'
do
present
user_project
.
labels
,
with:
Entities
::
Label
present
user_project
.
labels
,
with:
Entities
::
Label
,
current_user:
current_user
end
end
# Creates a new label
# Creates a new label
...
@@ -36,7 +36,7 @@ module API
...
@@ -36,7 +36,7 @@ module API
label
=
user_project
.
labels
.
create
(
attrs
)
label
=
user_project
.
labels
.
create
(
attrs
)
if
label
.
valid?
if
label
.
valid?
present
label
,
with:
Entities
::
Label
present
label
,
with:
Entities
::
Label
,
current_user:
current_user
else
else
render_validation_error!
(
label
)
render_validation_error!
(
label
)
end
end
...
@@ -90,7 +90,7 @@ module API
...
@@ -90,7 +90,7 @@ module API
attrs
[
:name
]
=
attrs
.
delete
(
:new_name
)
if
attrs
.
key?
(
:new_name
)
attrs
[
:name
]
=
attrs
.
delete
(
:new_name
)
if
attrs
.
key?
(
:new_name
)
if
label
.
update
(
attrs
)
if
label
.
update
(
attrs
)
present
label
,
with:
Entities
::
Label
present
label
,
with:
Entities
::
Label
,
current_user:
current_user
else
else
render_validation_error!
(
label
)
render_validation_error!
(
label
)
end
end
...
...
lib/api/merge_requests.rb
View file @
0c22698b
...
@@ -327,42 +327,6 @@ module API
...
@@ -327,42 +327,6 @@ module API
issues
=
::
Kaminari
.
paginate_array
(
merge_request
.
closes_issues
(
current_user
))
issues
=
::
Kaminari
.
paginate_array
(
merge_request
.
closes_issues
(
current_user
))
present
paginate
(
issues
),
with:
Entities
::
Issue
,
current_user:
current_user
present
paginate
(
issues
),
with:
Entities
::
Issue
,
current_user:
current_user
end
end
# Subscribes to a merge request
#
# Parameters:
# id (required) - The ID of a project
# merge_request_id (required) - The ID of a merge request
# Example Request:
# POST /projects/:id/issues/:merge_request_id/subscription
post
"
#{
path
}
/subscription"
do
merge_request
=
user_project
.
merge_requests
.
find
(
params
[
:merge_request_id
])
if
merge_request
.
subscribed?
(
current_user
)
not_modified!
else
merge_request
.
toggle_subscription
(
current_user
)
present
merge_request
,
with:
Entities
::
MergeRequest
,
current_user:
current_user
end
end
# Unsubscribes from a merge request
#
# Parameters:
# id (required) - The ID of a project
# merge_request_id (required) - The ID of a merge request
# Example Request:
# DELETE /projects/:id/merge_requests/:merge_request_id/subscription
delete
"
#{
path
}
/subscription"
do
merge_request
=
user_project
.
merge_requests
.
find
(
params
[
:merge_request_id
])
if
merge_request
.
subscribed?
(
current_user
)
merge_request
.
unsubscribe
(
current_user
)
present
merge_request
,
with:
Entities
::
MergeRequest
,
current_user:
current_user
else
not_modified!
end
end
end
end
end
end
end
end
...
...
lib/api/subscriptions.rb
0 → 100644
View file @
0c22698b
module
API
class
Subscriptions
<
Grape
::
API
before
{
authenticate!
}
subscribable_types
=
{
'merge_request'
=>
proc
{
|
id
|
user_project
.
merge_requests
.
find
(
id
)
},
'merge_requests'
=>
proc
{
|
id
|
user_project
.
merge_requests
.
find
(
id
)
},
'issues'
=>
proc
{
|
id
|
find_project_issue
(
id
)
},
'labels'
=>
proc
{
|
id
|
find_project_label
(
id
)
},
}
resource
:projects
do
subscribable_types
.
each
do
|
type
,
finder
|
type_singularized
=
type
.
singularize
type_id_str
=
:"
#{
type_singularized
}
_id"
entity_class
=
Entities
.
const_get
(
type_singularized
.
camelcase
)
# Subscribe to a resource
#
# Parameters:
# id (required) - The ID of a project
# subscribable_id (required) - The ID of a resource
# Example Request:
# POST /projects/:id/labels/:subscribable_id/subscription
# POST /projects/:id/issues/:subscribable_id/subscription
# POST /projects/:id/merge_requests/:subscribable_id/subscription
post
":id/
#{
type
}
/:
#{
type_id_str
}
/subscription"
do
resource
=
instance_exec
(
params
[
type_id_str
],
&
finder
)
if
resource
.
subscribed?
(
current_user
)
not_modified!
else
resource
.
subscribe
(
current_user
)
present
resource
,
with:
entity_class
,
current_user:
current_user
end
end
# Unsubscribe from a resource
#
# Parameters:
# id (required) - The ID of a project
# subscribable_id (required) - The ID of a resource
# Example Request:
# DELETE /projects/:id/labels/:subscribable_id/subscription
# DELETE /projects/:id/issues/:subscribable_id/subscription
# DELETE /projects/:id/merge_requests/:subscribable_id/subscription
delete
":id/
#{
type
}
/:
#{
type_id_str
}
/subscription"
do
resource
=
instance_exec
(
params
[
type_id_str
],
&
finder
)
if
!
resource
.
subscribed?
(
current_user
)
not_modified!
else
resource
.
unsubscribe
(
current_user
)
present
resource
,
with:
entity_class
,
current_user:
current_user
end
end
end
end
end
end
spec/models/concerns/subscribable_spec.rb
View file @
0c22698b
...
@@ -44,6 +44,16 @@ describe Subscribable, 'Subscribable' do
...
@@ -44,6 +44,16 @@ describe Subscribable, 'Subscribable' do
end
end
end
end
describe
'#subscribe'
do
it
'subscribes the given user'
do
expect
(
resource
.
subscribed?
(
user
)).
to
be_falsey
resource
.
subscribe
(
user
)
expect
(
resource
.
subscribed?
(
user
)).
to
be_truthy
end
end
describe
'#unsubscribe'
do
describe
'#unsubscribe'
do
it
'unsubscribes the given current user'
do
it
'unsubscribes the given current user'
do
resource
.
subscriptions
.
create
(
user:
user
,
subscribed:
true
)
resource
.
subscriptions
.
create
(
user:
user
,
subscribed:
true
)
...
...
spec/requests/api/issues_spec.rb
View file @
0c22698b
...
@@ -623,6 +623,12 @@ describe API::API, api: true do
...
@@ -623,6 +623,12 @@ describe API::API, api: true do
expect
(
response
.
status
).
to
eq
(
404
)
expect
(
response
.
status
).
to
eq
(
404
)
end
end
it
'returns 404 if the issue is confidential'
do
post
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
confidential_issue
.
id
}
/subscription"
,
non_member
)
expect
(
response
.
status
).
to
eq
(
404
)
end
end
end
describe
'DELETE :id/issues/:issue_id/subscription'
do
describe
'DELETE :id/issues/:issue_id/subscription'
do
...
@@ -644,5 +650,11 @@ describe API::API, api: true do
...
@@ -644,5 +650,11 @@ describe API::API, api: true do
expect
(
response
.
status
).
to
eq
(
404
)
expect
(
response
.
status
).
to
eq
(
404
)
end
end
it
'returns 404 if the issue is confidential'
do
delete
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
confidential_issue
.
id
}
/subscription"
,
non_member
)
expect
(
response
.
status
).
to
eq
(
404
)
end
end
end
end
end
spec/requests/api/labels_spec.rb
View file @
0c22698b
...
@@ -190,4 +190,86 @@ describe API::API, api: true do
...
@@ -190,4 +190,86 @@ describe API::API, api: true do
expect
(
json_response
[
'message'
][
'color'
]).
to
eq
([
'must be a valid color code'
])
expect
(
json_response
[
'message'
][
'color'
]).
to
eq
([
'must be a valid color code'
])
end
end
end
end
describe
"POST /projects/:id/labels/:label_id/subscription"
do
context
"when label_id is a label title"
do
it
"should subscribe to the label"
do
post
api
(
"/projects/
#{
project
.
id
}
/labels/
#{
label1
.
title
}
/subscription"
,
user
)
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
json_response
[
"name"
]).
to
eq
(
label1
.
title
)
expect
(
json_response
[
"subscribed"
]).
to
be_truthy
end
end
context
"when label_id is a label ID"
do
it
"should subscribe to the label"
do
post
api
(
"/projects/
#{
project
.
id
}
/labels/
#{
label1
.
id
}
/subscription"
,
user
)
expect
(
response
.
status
).
to
eq
(
201
)
expect
(
json_response
[
"name"
]).
to
eq
(
label1
.
title
)
expect
(
json_response
[
"subscribed"
]).
to
be_truthy
end
end
context
"when user is already subscribed to label"
do
before
{
label1
.
subscribe
(
user
)
}
it
"should return 304"
do
post
api
(
"/projects/
#{
project
.
id
}
/labels/
#{
label1
.
id
}
/subscription"
,
user
)
expect
(
response
.
status
).
to
eq
(
304
)
end
end
context
"when label ID is not found"
do
it
"should a return 404 error"
do
post
api
(
"/projects/
#{
project
.
id
}
/labels/1234/subscription"
,
user
)
expect
(
response
.
status
).
to
eq
(
404
)
end
end
end
describe
"DELETE /projects/:id/labels/:label_id/subscription"
do
before
{
label1
.
subscribe
(
user
)
}
context
"when label_id is a label title"
do
it
"should unsubscribe from the label"
do
delete
api
(
"/projects/
#{
project
.
id
}
/labels/
#{
label1
.
title
}
/subscription"
,
user
)
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
json_response
[
"name"
]).
to
eq
(
label1
.
title
)
expect
(
json_response
[
"subscribed"
]).
to
be_falsey
end
end
context
"when label_id is a label ID"
do
it
"should unsubscribe from the label"
do
delete
api
(
"/projects/
#{
project
.
id
}
/labels/
#{
label1
.
id
}
/subscription"
,
user
)
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
json_response
[
"name"
]).
to
eq
(
label1
.
title
)
expect
(
json_response
[
"subscribed"
]).
to
be_falsey
end
end
context
"when user is already unsubscribed from label"
do
before
{
label1
.
unsubscribe
(
user
)
}
it
"should return 304"
do
delete
api
(
"/projects/
#{
project
.
id
}
/labels/
#{
label1
.
id
}
/subscription"
,
user
)
expect
(
response
.
status
).
to
eq
(
304
)
end
end
context
"when label ID is not found"
do
it
"should a return 404 error"
do
delete
api
(
"/projects/
#{
project
.
id
}
/labels/1234/subscription"
,
user
)
expect
(
response
.
status
).
to
eq
(
404
)
end
end
end
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