2 files changed, 9 insertions, 7 deletions
diff --git a/app/controllers/api/agents/events_controller.rb b/app/controllers/api/agents/events_controller.rb
index 255a5bc..ca9b829 100644
--- a/app/controllers/api/agents/events_controller.rb
+++ b/app/controllers/api/agents/events_controller.rb
@@ -3,9 +3,12 @@ module Api
     class EventsController < ApplicationController
       def create
         @agent = Agent.find(params[:agent_id])
-        message = event_params.merge({agent_id: @agent.id})
-        routing_key = "events.#{event_params[:type]}.#{@agent.id}"
-        Publisher.publish(routing_key, message)
+        publish(EventMessage.new(
+          agent_id: @agent.id,
+          event_type: event_params[:event_type],
+          data: event_params[:data]
+        ))
+
         render nothing: true
       end
 
diff --git a/app/controllers/api/agents/files_controller.rb b/app/controllers/api/agents/files_controller.rb
index 1329d04..b111048 100644
--- a/app/controllers/api/agents/files_controller.rb
+++ b/app/controllers/api/agents/files_controller.rb
@@ -9,12 +9,11 @@ module Api
         @agent = Agent.find(params[:agent_id])
         @fingerprint = params[:id]
         @file = Disposition.find_by(fingerprint: params[:id])
-        message = {
+        publish(EventMessage.new(
           agent_id: @agent.id,
-          type: :lookup,
+          event_type: :scanned,
           data: params[:data]
-        }
-        Publisher.publish("events.scanned.#{@agent.id}", message)
+        ))
       end
     end
   end