Finalize web hook service functionality

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3 files changed, 11 insertions, 9 deletions

diff --git a/app/services/test_hook_service.rb b/app/services/test_hook_service.rb
new file mode 100644
index 0000000..e85a016
--- /dev/null
+++ b/app/services/test_hook_service.rb
@@ -0,0 +1,5 @@
+class TestHookService
+  def execute(hook, current_user)
+    WebHookService.new.build_end(hook.project.last_build)
+  end
+end
diff --git a/app/services/web_hook_service.rb b/app/services/web_hook_service.rb
index 2e42350..3e61a99 100644
--- a/app/services/web_hook_service.rb
+++ b/app/services/web_hook_service.rb
@@ -4,8 +4,8 @@ class WebHookService
   end
 
   def execute_hooks(project, data)
-    project.web_hooks.each do |wh|
-      async_execute_hook wh, data
+    project.web_hooks.each do |web_hook|
+      async_execute_hook(web_hook, data)
     end
   end
 
@@ -17,18 +17,17 @@ class WebHookService
     project = build.project
     data = {}
     data.merge!({
-      id: build.id,
+      build_id: build.id,
+      build_status: build.status,
+      build_started_at: build.started_at,
+      build_finished_at: build.finished_at,
       project_id: project.id,
       project_name: project.name,
       gitlab_url: project.gitlab_url,
       ref: build.ref,
-      status: build.status,
-      started_at: build.started_at,
-      finished_at: build.finished_at,
       sha: build.sha,
       before_sha: build.before_sha,
       push_data: build.push_data
-
     })
   end
 end
diff --git a/app/workers/web_hook_worker.rb b/app/workers/web_hook_worker.rb
index f51b975..7b041c0 100644
--- a/app/workers/web_hook_worker.rb
+++ b/app/workers/web_hook_worker.rb
@@ -1,8 +1,6 @@
 class WebHookWorker
   include Sidekiq::Worker
 
-  sidekiq_options queue: :web_hook
-
   def perform(hook_id, data)
     WebHook.find(hook_id).execute data
   end