kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Optionally filter by deployment time

This commit is contained in:
Pawel Chojnacki 2017-03-28 14:56:30 +02:00
parent 7320387343
commit d3e794e26f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/projects/deployments_controller.rb
View File

@ -2,9 +2,11 @@ class Projects::DeploymentsController < Projects::ApplicationController
before_action :authorize_read_deployment!
def index
serializer = DeploymentSerializer.new(user: @current_user)
deployments = environment.deployments.where('created_at > ?', 8.hours.ago)
.map { |d| serializer.represent(d) }
serializer = DeploymentSerializer.new(user: @current_user, project: project)
deployments = environment.deployments.reorder(created_at: :desc)
deployments = deployments.where('created_at > ?', params[:after].to_time) if params[:after]&.to_time
deployments = deployments.map { |deployment| serializer.represent(deployment) }
render json: { deployments: deployments }
end

2
spec/controllers/projects/deployments_controller_spec.rb
View File

@ -20,7 +20,7 @@ describe Projects::DeploymentsController do
create(:deployment, environment: environment, created_at: 7.hours.ago)
create(:deployment, environment: environment)
get :index, environment_params
get :index, environment_params(:after => 8.hours.ago)
expect(response).to be_ok