CS-896 Add org published filtering to BlogPost/Event API endpoints

Author: Matt Burch

app/controllers/api/v1/blog_posts_controller.rb

@@ -6,7 +6,6 @@ class BlogPostsController < Api::V1::BaseController
       include ErrorSerializer
 
       before_action :authenticate_api_user!, except: [:index, :show, :categories]
-      before_action :set_blog_post, only: %i[show update destroy]
       after_action :set_cache_control, only: :index
 
       def index
@@ -19,7 +18,7 @@ def index
       end
 
       def show
-        render json: @blog_post,
+        render json: blog_post,
                serializer: BlogPostSerializer,
                status: 200
       end
@@ -42,25 +41,25 @@ def create
 
       def update
         if blog_post_params[:category].present?
-          @blog_post.categories.delete_all
-          @blog_post.category_list.add(blog_post_params[:category])
+          blog_post.categories.delete_all
+          blog_post.category_list.add(blog_post_params[:category])
         end
-        if @blog_post.update(blog_post_params)
-          @blog_post.reload
-          render json: @blog_post,
+        if blog_post.update(blog_post_params)
+          blog_post.reload
+          render json: blog_post,
                  serializer: BlogPostSerializer,
                  status: 200
         else
-          render json: ErrorSerializer.serialize(@blog_post.errors),
+          render json: ErrorSerializer.serialize(blog_post.errors),
                  status: :unprocessable_entity
         end
       end
 
       def destroy
-        if @blog_post.destroy
+        if blog_post.destroy
           render json: {}, status: :ok
         else
-          render json: ErrorSerializer.serialize(@blog_post.errors),
+          render json: ErrorSerializer.serialize(blog_post.errors),
                  status: :unprocessable_entity
         end
       end
@@ -74,6 +73,10 @@ def categories
 
       private
 
+      def blog_post
+        @blog_post ||= BlogPost.find(params[:id])
+      end
+
       def blog_post_params
         params.require(:blog_post).permit(
           :title,
@@ -82,7 +85,6 @@ def blog_post_params
           :category,
           :is_published,
           :organization_id,
-          { images: [] },
           blog_post_attachments_attributes: [
             :id,
             :file_type,
@@ -94,12 +96,9 @@ def blog_post_params
         )
       end
 
-      def set_blog_post
-        @blog_post = BlogPost.find(params[:id])
-      end
-
       def filter_posts
         blog_post = BlogPost.includes(:blog_post_attachments).includes(:categories).includes(:organization).includes(:user)
+        blog_post = blog_post.from_published_orgs unless params[:ignore_org_publish].present?
         if params[:filter].present?
           blog_post = blog_post.tagged_with(params[:filter][:category]) if params[:filter][:category].present?
           blog_post = blog_post.where(is_published: params[:filter][:draft].downcase == 'false' ? true : false) if params[:filter][:draft].present?

app/controllers/api/v1/events_controller.rb

@@ -63,6 +63,7 @@ def event
 
       def fetch_events
         events = Event.includes(:organization).includes(:user)
+        events = events.from_published_orgs unless params[:ignore_org_publish].present?
         events = events.events_in_month(DateTime.strptime(params[:month], '%m')) if params[:month].present?
         events = events.where(is_featured: true) if params[:featured].present?
         events = events.where('starting_at >= ?', DateTime.parse(params[:starting_after])) if params[:starting_after].present?

app/models/blog_post.rb

@@ -1,8 +1,8 @@
 class BlogPost < ActiveRecord::Base
+  include OrgRecord
   attr_accessible :title, :body, :posted_at, :user_id,
                   :is_published, :blog_post_attachments_attributes, :organization_id,
                   :category_list
-
   acts_as_taggable_on :categories
 
   belongs_to :user

app/models/concerns/org_record.rb

@@ -0,0 +1,6 @@
+module OrgRecord
+    extend ActiveSupport::Concern
+    included do
+        scope :from_published_orgs, -> { joins(:organization).where('organizations.is_published = true') }
+    end
+end

app/models/event.rb

@@ -1,9 +1,9 @@
 class Event < ActiveRecord::Base
+  include OrgRecord
   MAX_EVENTS_FEATURED_MONTH = 3
   attr_accessible :title, :posted_at, :starting_at, :ending_at, :street_1,
                   :street_2, :city, :state_abbr, :zip, :phone, :external_url,
                   :organization_id, :is_featured, :body, :user_id, :is_all_day
-
   belongs_to :user
   belongs_to :organization