REFACTOR: dry post_event_enabled check in controllers

discourse · Mar 27, 2020 · bfe84db · bfe84db
1 parent 2695668
commit bfe84db
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 30 deletions.
diff --git a/app/controllers/discourse_calendar/invitees_controller.rb b/app/controllers/discourse_calendar/invitees_controller.rb
@@ -1,16 +1,7 @@
 # frozen_string_literal: true
 
 module DiscourseCalendar
-  class InviteesController < ::ApplicationController
-    before_action :ensure_logged_in
-
-    before_action :ensure_post_event_enabled
-    def ensure_post_event_enabled
-      if !SiteSetting.post_event_enabled
-        raise Discourse::NotFound
-      end
-    end
-
+  class InviteesController < DiscourseCalendarController
     def index
       post_event = PostEvent.find(params['post-event-id'])
 

diff --git a/app/controllers/discourse_calendar/post_events_controller.rb b/app/controllers/discourse_calendar/post_events_controller.rb
@@ -1,16 +1,7 @@
 # frozen_string_literal: true
 
 module DiscourseCalendar
-  class PostEventsController < ::ApplicationController
-    before_action :ensure_logged_in
-
-    before_action :ensure_post_event_enabled
-    def ensure_post_event_enabled
-      if !SiteSetting.post_event_enabled
-        raise Discourse::NotFound
-      end
-    end
-
+  class PostEventsController < DiscourseCalendarController
     def index
       # TODO: optimize this
       post_events_topics_ids = PostEvent

diff --git a/app/controllers/discourse_calendar/upcoming_events_controller.rb b/app/controllers/discourse_calendar/upcoming_events_controller.rb
@@ -1,16 +1,7 @@
 # frozen_string_literal: true
 
 module DiscourseCalendar
-  class UpcomingEventsController < ::ApplicationController
-    before_action :ensure_logged_in
-
-    before_action :ensure_post_event_enabled
-    def ensure_post_event_enabled
-      if !SiteSetting.post_event_enabled
-        raise Discourse::NotFound
-      end
-    end
-
+  class UpcomingEventsController < DiscourseCalendarController
     def index; end
   end
 end
diff --git a/app/controllers/discourse_calendar_controller.rb b/app/controllers/discourse_calendar_controller.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module DiscourseCalendar
+  class DiscourseCalendarController < ::ApplicationController
+    before_action :ensure_logged_in
+
+    before_action :ensure_post_event_enabled
+    def ensure_post_event_enabled
+      if !SiteSetting.post_event_enabled
+        raise Discourse::NotFound
+      end
+    end
+  end
+end
diff --git a/plugin.rb b/plugin.rb
@@ -59,6 +59,7 @@ class Engine < ::Rails::Engine
     "../app/models/calendar_event.rb",
     "../app/models/guardian.rb",
     "../app/serializers/user_timezone_serializer.rb",
+    "../app/controllers/discourse_calendar_controller.rb",
     "../app/controllers/discourse_calendar/invitees_controller.rb",
     "../app/controllers/discourse_calendar/post_events_controller.rb",
     "../app/controllers/discourse_calendar/upcoming_events_controller.rb",