Merge branch '66037-deployment-user' into 'master'

Return correct user for manual deployments

See merge request gitlab-org/gitlab-ce!32004

5 files changed, 42 insertions, 3 deletions

diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 68586e7a1fd..bff5d348ca0 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -162,6 +162,14 @@ class Deployment < ApplicationRecord
     deployed_at&.to_time&.in_time_zone&.to_s(:medium)
   end
 
+  def deployed_by
+    # We use deployable's user if available because Ci::PlayBuildService
+    # does not update the deployment's user, just the one for the deployable.
+    # TODO: use deployment's user once https://gitlab.com/gitlab-org/gitlab-ce/issues/66442
+    # is completed.
+    deployable&.user || user
+  end
+
   private
 
   def ref_path
diff --git a/app/serializers/deployment_entity.rb b/app/serializers/deployment_entity.rb
index d6466ad1cdd..8b967459173 100644
--- a/app/serializers/deployment_entity.rb
+++ b/app/serializers/deployment_entity.rb
@@ -21,7 +21,7 @@ class DeploymentEntity < Grape::Entity
   expose :deployed_at
   expose :tag
   expose :last?
-  expose :user, using: UserEntity
+  expose :deployed_by, as: :user, using: UserEntity
 
   expose :deployable do |deployment, opts|
     deployment.deployable.yield_self do |deployable|
diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml
index a11e23b6daa..752be02443c 100644
--- a/app/views/projects/deployments/_deployment.html.haml
+++ b/app/views/projects/deployments/_deployment.html.haml
@@ -15,10 +15,10 @@
           .flex-truncate-child
             = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link' do
               #{deployment.deployable.name} (##{deployment.deployable.id})
-        - if deployment.user
+        - if deployment.deployed_by
           %div
             by
-            = user_avatar(user: deployment.user, size: 20, css_class: "mr-0 float-none")
+            = user_avatar(user: deployment.deployed_by, size: 20, css_class: "mr-0 float-none")
 
   .table-section.section-15{ role: 'gridcell' }
     .table-mobile-header{ role: 'rowheader' }= _("Created")
diff --git a/changelogs/unreleased/66037-deployment-user.yml b/changelogs/unreleased/66037-deployment-user.yml
new file mode 100644
index 00000000000..8a61b8145af
--- /dev/null
+++ b/changelogs/unreleased/66037-deployment-user.yml
@@ -0,0 +1,5 @@
+---
+title: Return correct user for manual deployments
+merge_request: 32004
+author:
+type: fixed
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index d4e631f109b..51ed8e9421b 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -322,4 +322,30 @@ describe Deployment do
       end
     end
   end
+
+  describe '#deployed_by' do
+    it 'returns the deployment user if there is no deployable' do
+      deployment_user = create(:user)
+      deployment = create(:deployment, deployable: nil, user: deployment_user)
+
+      expect(deployment.deployed_by).to eq(deployment_user)
+    end
+
+    it 'returns the deployment user if the deployable have no user' do
+      deployment_user = create(:user)
+      build = create(:ci_build, user: nil)
+      deployment = create(:deployment, deployable: build, user: deployment_user)
+
+      expect(deployment.deployed_by).to eq(deployment_user)
+    end
+
+    it 'returns the deployable user if there is one' do
+      build_user = create(:user)
+      deployment_user = create(:user)
+      build = create(:ci_build, user: build_user)
+      deployment = create(:deployment, deployable: build, user: deployment_user)
+
+      expect(deployment.deployed_by).to eq(build_user)
+    end
+  end
 end