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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
57d91211
Commit
57d91211
authored
Nov 29, 2017
by
haseeb
Committed by
Sean McGivern
Nov 29, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support ordering of project notes in notes api
parent
7bdcd6f3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
156 additions
and
13 deletions
+156
-13
changelogs/unreleased/32057_support_ordering_project_notes_in_notes_api.yml
...sed/32057_support_ordering_project_notes_in_notes_api.yml
+5
-0
doc/api/notes.md
doc/api/notes.md
+21
-12
lib/api/notes.rb
lib/api/notes.rb
+6
-1
spec/requests/api/notes_spec.rb
spec/requests/api/notes_spec.rb
+124
-0
No files found.
changelogs/unreleased/32057_support_ordering_project_notes_in_notes_api.yml
0 → 100644
View file @
57d91211
---
title
:
added support for ordering and sorting in notes api
merge_request
:
15342
author
:
haseebeqx
type
:
added
doc/api/notes.md
View file @
57d91211
...
@@ -10,12 +10,15 @@ Gets a list of all notes for a single issue.
...
@@ -10,12 +10,15 @@ Gets a list of all notes for a single issue.
```
```
GET /projects/:id/issues/:issue_iid/notes
GET /projects/:id/issues/:issue_iid/notes
GET /projects/:id/issues/:issue_iid/notes?sort=asc&order_by=updated_at
```
```
Parameters:
| Attribute | Type | Required | Description |
| ------------------- | ---------------- | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
-
`id`
(required) - The ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
|
`id`
| integer/string | yes | The ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
-
`issue_iid`
(required) - The IID of an issue
|
`issue_iid`
| integer | yes | The IID of an issue
|
`sort`
| string | no | Return issue notes sorted in
`asc`
or
`desc`
order. Default is
`desc`
|
`order_by`
| string | no | Return issue notes ordered by
`created_at`
or
`updated_at`
fields. Default is
`created_at`
```
json
```
json
[
[
...
@@ -133,12 +136,15 @@ Gets a list of all notes for a single snippet. Snippet notes are comments users
...
@@ -133,12 +136,15 @@ Gets a list of all notes for a single snippet. Snippet notes are comments users
```
```
GET /projects/:id/snippets/:snippet_id/notes
GET /projects/:id/snippets/:snippet_id/notes
GET /projects/:id/snippets/:snippet_id/notes?sort=asc&order_by=updated_at
```
```
Parameters:
| Attribute | Type | Required | Description |
| ------------------- | ---------------- | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
-
`id`
(required) - The ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
|
`id`
| integer/string | yes | The ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
-
`snippet_id`
(required) - The ID of a project snippet
|
`snippet_id`
| integer | yes | The ID of a project snippet
|
`sort`
| string | no | Return snippet notes sorted in
`asc`
or
`desc`
order. Default is
`desc`
|
`order_by`
| string | no | Return snippet notes ordered by
`created_at`
or
`updated_at`
fields. Default is
`created_at`
### Get single snippet note
### Get single snippet note
...
@@ -231,12 +237,15 @@ Gets a list of all notes for a single merge request.
...
@@ -231,12 +237,15 @@ Gets a list of all notes for a single merge request.
```
```
GET /projects/:id/merge_requests/:merge_request_iid/notes
GET /projects/:id/merge_requests/:merge_request_iid/notes
GET /projects/:id/merge_requests/:merge_request_iid/notes?sort=asc&order_by=updated_at
```
```
Parameters:
| Attribute | Type | Required | Description |
| ------------------- | ---------------- | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
-
`id`
(required) - The ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
|
`id`
| integer/string | yes | The ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
-
`merge_request_iid`
(required) - The IID of a project merge request
|
`merge_request_iid`
| integer | yes | The IID of a project merge request
|
`sort`
| string | no | Return merge request notes sorted in
`asc`
or
`desc`
order. Default is
`desc`
|
`order_by`
| string | no | Return merge request notes ordered by
`created_at`
or
`updated_at`
fields. Default is
`created_at`
### Get single merge request note
### Get single merge request note
...
...
lib/api/notes.rb
View file @
57d91211
...
@@ -18,6 +18,10 @@ module API
...
@@ -18,6 +18,10 @@ module API
end
end
params
do
params
do
requires
:noteable_id
,
type:
Integer
,
desc:
'The ID of the noteable'
requires
:noteable_id
,
type:
Integer
,
desc:
'The ID of the noteable'
optional
:order_by
,
type:
String
,
values:
%w[created_at updated_at]
,
default:
'created_at'
,
desc:
'Return notes ordered by `created_at` or `updated_at` fields.'
optional
:sort
,
type:
String
,
values:
%w[asc desc]
,
default:
'desc'
,
desc:
'Return notes sorted in `asc` or `desc` order.'
use
:pagination
use
:pagination
end
end
get
":id/
#{
noteables_str
}
/:noteable_id/notes"
do
get
":id/
#{
noteables_str
}
/:noteable_id/notes"
do
...
@@ -29,11 +33,12 @@ module API
...
@@ -29,11 +33,12 @@ module API
# at the DB query level (which we cannot in that case), the current
# at the DB query level (which we cannot in that case), the current
# page can have less elements than :per_page even if
# page can have less elements than :per_page even if
# there's more than one page.
# there's more than one page.
raw_notes
=
noteable
.
notes
.
with_metadata
.
reorder
(
params
[
:order_by
]
=>
params
[
:sort
])
notes
=
notes
=
# paginate() only works with a relation. This could lead to a
# paginate() only works with a relation. This could lead to a
# mismatch between the pagination headers info and the actual notes
# mismatch between the pagination headers info and the actual notes
# array returned, but this is really a edge-case.
# array returned, but this is really a edge-case.
paginate
(
noteable
.
notes
.
with_metadata
)
paginate
(
raw_notes
)
.
reject
{
|
n
|
n
.
cross_reference_not_visible_for?
(
current_user
)
}
.
reject
{
|
n
|
n
.
cross_reference_not_visible_for?
(
current_user
)
}
present
notes
,
with:
Entities
::
Note
present
notes
,
with:
Entities
::
Note
else
else
...
...
spec/requests/api/notes_spec.rb
View file @
57d91211
...
@@ -34,6 +34,48 @@ describe API::Notes do
...
@@ -34,6 +34,48 @@ describe API::Notes do
describe
"GET /projects/:id/noteable/:noteable_id/notes"
do
describe
"GET /projects/:id/noteable/:noteable_id/notes"
do
context
"when noteable is an Issue"
do
context
"when noteable is an Issue"
do
context
'sorting'
do
before
do
create_list
(
:note
,
3
,
noteable:
issue
,
project:
project
,
author:
user
)
end
it
'sorts by created_at in descending order by default'
do
get
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/notes"
,
user
)
response_dates
=
json_response
.
map
{
|
noteable
|
noteable
[
'created_at'
]
}
expect
(
json_response
.
length
).
to
eq
(
4
)
expect
(
response_dates
).
to
eq
(
response_dates
.
sort
.
reverse
)
end
it
'sorts by ascending order when requested'
do
get
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/notes?sort=asc"
,
user
)
response_dates
=
json_response
.
map
{
|
noteable
|
noteable
[
'created_at'
]
}
expect
(
json_response
.
length
).
to
eq
(
4
)
expect
(
response_dates
).
to
eq
(
response_dates
.
sort
)
end
it
'sorts by updated_at in descending order when requested'
do
get
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/notes?order_by=updated_at"
,
user
)
response_dates
=
json_response
.
map
{
|
noteable
|
noteable
[
'updated_at'
]
}
expect
(
json_response
.
length
).
to
eq
(
4
)
expect
(
response_dates
).
to
eq
(
response_dates
.
sort
.
reverse
)
end
it
'sorts by updated_at in ascending order when requested'
do
get
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/notes??order_by=updated_at&sort=asc"
,
user
)
response_dates
=
json_response
.
map
{
|
noteable
|
noteable
[
'updated_at'
]
}
expect
(
json_response
.
length
).
to
eq
(
4
)
expect
(
response_dates
).
to
eq
(
response_dates
.
sort
)
end
end
it
"returns an array of issue notes"
do
it
"returns an array of issue notes"
do
get
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/notes"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/notes"
,
user
)
...
@@ -85,6 +127,47 @@ describe API::Notes do
...
@@ -85,6 +127,47 @@ describe API::Notes do
end
end
context
"when noteable is a Snippet"
do
context
"when noteable is a Snippet"
do
context
'sorting'
do
before
do
create_list
(
:note
,
3
,
noteable:
snippet
,
project:
project
,
author:
user
)
end
it
'sorts by created_at in descending order by default'
do
get
api
(
"/projects/
#{
project
.
id
}
/snippets/
#{
snippet
.
id
}
/notes"
,
user
)
response_dates
=
json_response
.
map
{
|
noteable
|
noteable
[
'created_at'
]
}
expect
(
json_response
.
length
).
to
eq
(
4
)
expect
(
response_dates
).
to
eq
(
response_dates
.
sort
.
reverse
)
end
it
'sorts by ascending order when requested'
do
get
api
(
"/projects/
#{
project
.
id
}
/snippets/
#{
snippet
.
id
}
/notes?sort=asc"
,
user
)
response_dates
=
json_response
.
map
{
|
noteable
|
noteable
[
'created_at'
]
}
expect
(
json_response
.
length
).
to
eq
(
4
)
expect
(
response_dates
).
to
eq
(
response_dates
.
sort
)
end
it
'sorts by updated_at in descending order when requested'
do
get
api
(
"/projects/
#{
project
.
id
}
/snippets/
#{
snippet
.
id
}
/notes?order_by=updated_at"
,
user
)
response_dates
=
json_response
.
map
{
|
noteable
|
noteable
[
'updated_at'
]
}
expect
(
json_response
.
length
).
to
eq
(
4
)
expect
(
response_dates
).
to
eq
(
response_dates
.
sort
.
reverse
)
end
it
'sorts by updated_at in ascending order when requested'
do
get
api
(
"/projects/
#{
project
.
id
}
/snippets/
#{
snippet
.
id
}
/notes??order_by=updated_at&sort=asc"
,
user
)
response_dates
=
json_response
.
map
{
|
noteable
|
noteable
[
'updated_at'
]
}
expect
(
json_response
.
length
).
to
eq
(
4
)
expect
(
response_dates
).
to
eq
(
response_dates
.
sort
)
end
end
it
"returns an array of snippet notes"
do
it
"returns an array of snippet notes"
do
get
api
(
"/projects/
#{
project
.
id
}
/snippets/
#{
snippet
.
id
}
/notes"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/snippets/
#{
snippet
.
id
}
/notes"
,
user
)
...
@@ -108,6 +191,47 @@ describe API::Notes do
...
@@ -108,6 +191,47 @@ describe API::Notes do
end
end
context
"when noteable is a Merge Request"
do
context
"when noteable is a Merge Request"
do
context
'sorting'
do
before
do
create_list
(
:note
,
3
,
noteable:
merge_request
,
project:
project
,
author:
user
)
end
it
'sorts by created_at in descending order by default'
do
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
/notes"
,
user
)
response_dates
=
json_response
.
map
{
|
noteable
|
noteable
[
'created_at'
]
}
expect
(
json_response
.
length
).
to
eq
(
4
)
expect
(
response_dates
).
to
eq
(
response_dates
.
sort
.
reverse
)
end
it
'sorts by ascending order when requested'
do
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
/notes?sort=asc"
,
user
)
response_dates
=
json_response
.
map
{
|
noteable
|
noteable
[
'created_at'
]
}
expect
(
json_response
.
length
).
to
eq
(
4
)
expect
(
response_dates
).
to
eq
(
response_dates
.
sort
)
end
it
'sorts by updated_at in descending order when requested'
do
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
/notes?order_by=updated_at"
,
user
)
response_dates
=
json_response
.
map
{
|
noteable
|
noteable
[
'updated_at'
]
}
expect
(
json_response
.
length
).
to
eq
(
4
)
expect
(
response_dates
).
to
eq
(
response_dates
.
sort
.
reverse
)
end
it
'sorts by updated_at in ascending order when requested'
do
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
/notes??order_by=updated_at&sort=asc"
,
user
)
response_dates
=
json_response
.
map
{
|
noteable
|
noteable
[
'updated_at'
]
}
expect
(
json_response
.
length
).
to
eq
(
4
)
expect
(
response_dates
).
to
eq
(
response_dates
.
sort
)
end
end
it
"returns an array of merge_requests notes"
do
it
"returns an array of merge_requests notes"
do
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
/notes"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
/notes"
,
user
)
...
...
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