Add some fixes after review

2 files changed, 6 insertions, 13 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 37c483b45ec..1108277aabf 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -367,13 +367,7 @@ module API
     end
 
     class Trigger < Grape::Entity
-      expose :token, :created_at, :updated_at, :deleted_at
-      expose :last_used do |repo_obj, _options|
-        if repo_obj.respond_to?(:last_trigger_request)
-          request = repo_obj.last_trigger_request
-          request.created_at if request
-        end
-      end
+      expose :token, :created_at, :updated_at, :deleted_at, :last_used
     end
   end
 end
diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb
index 25bb8aef20b..5e4964f446c 100644
--- a/lib/api/triggers.rb
+++ b/lib/api/triggers.rb
@@ -73,10 +73,10 @@ module API
         authenticate!
         authorize_admin_project
 
-        triggers = user_project.triggers.where(token: params[:token])
-        return not_found!('Trigger') if triggers.empty?
+        trigger = user_project.triggers.find_by(token: params[:token].to_s)
+        return not_found!('Trigger') unless trigger
 
-        present triggers.first, with: Entities::Trigger
+        present trigger, with: Entities::Trigger
       end
 
       # Create trigger
@@ -89,8 +89,7 @@ module API
         authenticate!
         authorize_admin_project
 
-        trigger = user_project.triggers.new
-        trigger.save
+        trigger = user_project.triggers.create
 
         present trigger, with: Entities::Trigger
       end
@@ -106,7 +105,7 @@ module API
         authenticate!
         authorize_admin_project
 
-        trigger = user_project.triggers.where(token: params[:token]).first
+        trigger = user_project.triggers.find_by(token: params[:token].to_s)
         return not_found!('Trigger') unless trigger
 
         trigger.destroy