From a9c67e70d4d678cdc4854fbe71ee518d12082fe2 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Tue, 1 Nov 2016 09:46:44 +0800
Subject: [PATCH] move webhook and event serializers back (#899)

---
 app/serializers/api/v2/event_serializer.rb   | 19 -------------------
 app/serializers/api/v2/webhook_serializer.rb |  8 --------
 app/serializers/event_serializer.rb          | 15 +++++++++++++++
 app/serializers/webhook_serializer.rb        |  4 ++++
 4 files changed, 19 insertions(+), 27 deletions(-)
 delete mode 100644 app/serializers/api/v2/event_serializer.rb
 delete mode 100644 app/serializers/api/v2/webhook_serializer.rb
 create mode 100644 app/serializers/event_serializer.rb
 create mode 100644 app/serializers/webhook_serializer.rb

diff --git a/app/serializers/api/v2/event_serializer.rb b/app/serializers/api/v2/event_serializer.rb
deleted file mode 100644
index c875056a..00000000
--- a/app/serializers/api/v2/event_serializer.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-module Api
-  module V2
-    class EventSerializer < ApplicationSerializer
-      attributes :id, :sequence_id, :kind, :map_id, :created_at
-
-      has_one :actor, serializer: UserSerializer, root: 'users'
-      has_one :map, serializer: MapSerializer
-
-      def actor
-        object.user || object.eventable.try(:user)
-      end
-
-      def map
-        object.eventable.try(:map) || object.eventable.map
-      end
-    end
-  end
-end
diff --git a/app/serializers/api/v2/webhook_serializer.rb b/app/serializers/api/v2/webhook_serializer.rb
deleted file mode 100644
index 3221e450..00000000
--- a/app/serializers/api/v2/webhook_serializer.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-module Api
-  module V2
-    class WebhookSerializer < ApplicationSerializer
-      attributes :text, :username, :icon_url # , :attachments
-    end
-  end
-end
diff --git a/app/serializers/event_serializer.rb b/app/serializers/event_serializer.rb
new file mode 100644
index 00000000..4d994472
--- /dev/null
+++ b/app/serializers/event_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+class EventSerializer < ActiveModel::Serializer
+  attributes :id, :sequence_id, :kind, :map_id, :created_at
+
+  has_one :actor, serializer: Api::V2::UserSerializer, root: 'users'
+  has_one :map, serializer: Api::V2::MapSerializer
+
+  def actor
+    object.user || object.eventable.try(:user)
+  end
+
+  def map
+    object.eventable.try(:map) || object.eventable.map
+  end
+end
diff --git a/app/serializers/webhook_serializer.rb b/app/serializers/webhook_serializer.rb
new file mode 100644
index 00000000..e27ad0b9
--- /dev/null
+++ b/app/serializers/webhook_serializer.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+class WebhookSerializer < ActiveModel::Serializer
+  attributes :text, :username, :icon_url # , :attachments
+end