Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
84dda45d
Commit
84dda45d
authored
7 years ago
by
Matt Jankowski
Committed by
Eugen Rochko
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Improve spec coverage and clean up api/v1/domain_blocks controller (#3466)
parent
9c750548
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/controllers/api/v1/domain_blocks_controller.rb
+44
-6
44 additions, 6 deletions
app/controllers/api/v1/domain_blocks_controller.rb
spec/controllers/api/v1/domain_blocks_controller_spec.rb
+1
-1
1 addition, 1 deletion
spec/controllers/api/v1/domain_blocks_controller_spec.rb
with
45 additions
and
7 deletions
app/controllers/api/v1/domain_blocks_controller.rb
+
44
−
6
View file @
84dda45d
# frozen_string_literal: true
class
Api::V1::DomainBlocksController
<
ApiController
BLOCK_LIMIT
=
100
before_action
->
{
doorkeeper_authorize!
:follow
}
before_action
:require_user!
after_action
:insert_pagination_headers
,
only: :show
respond_to
:json
def
show
@blocks
=
AccountDomainBlock
.
where
(
account:
current_account
).
paginate_by_max_id
(
limit_param
(
100
),
params
[
:max_id
],
params
[
:since_id
])
next_path
=
api_v1_domain_blocks_url
(
pagination_params
(
max_id:
@blocks
.
last
.
id
))
if
@blocks
.
size
==
limit_param
(
100
)
prev_path
=
api_v1_domain_blocks_url
(
pagination_params
(
since_id:
@blocks
.
first
.
id
))
unless
@blocks
.
empty?
set_pagination_headers
(
next_path
,
prev_path
)
@blocks
=
load_domain_blocks
render
json:
@blocks
.
map
(
&
:domain
)
end
...
...
@@ -28,6 +26,46 @@ class Api::V1::DomainBlocksController < ApiController
private
def
load_domain_blocks
account_domain_blocks
.
paginate_by_max_id
(
limit_param
(
BLOCK_LIMIT
),
params
[
:max_id
],
params
[
:since_id
]
)
end
def
account_domain_blocks
current_account
.
domain_blocks
end
def
insert_pagination_headers
set_pagination_headers
(
next_path
,
prev_path
)
end
def
next_path
if
records_continue?
api_v1_domain_blocks_url
pagination_params
(
max_id:
pagination_max_id
)
end
end
def
prev_path
unless
@blocks
.
empty?
api_v1_domain_blocks_url
pagination_params
(
since_id:
pagination_since_id
)
end
end
def
pagination_max_id
@blocks
.
last
.
id
end
def
pagination_since_id
@blocks
.
first
.
id
end
def
records_continue?
@blocks
.
size
==
limit_param
(
BLOCK_LIMIT
)
end
def
pagination_params
(
core_params
)
params
.
permit
(
:limit
).
merge
(
core_params
)
end
...
...
This diff is collapsed.
Click to expand it.
spec/controllers/api/v1/domain_blocks_controller_spec.rb
+
1
−
1
View file @
84dda45d
...
...
@@ -13,7 +13,7 @@ RSpec.describe Api::V1::DomainBlocksController, type: :controller do
describe
'GET #show'
do
before
do
get
:show
get
:show
,
params:
{
limit:
1
}
end
it
'returns http success'
do
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment