Remove references to aggregation attribute on Workflows

app/controllers/api/v1/aggregations_controller.rb

@@ -1,19 +1,12 @@
 class Api::V1::AggregationsController < Api::ApiController
-  include JsonApiController::PunditPolicy
+  # include JsonApiController::PunditPolicy
 
-  require_authentication :create, :update, scopes: [:project]
-  resource_actions :create, :update, :show, :index
-  schema_type :json_schema
-  before_action :filter_by_subject_set, only: :index
+  # THIS FUNCTIONALITY IS BEING DEPRECATED EFFECTIVE IMMEDIATELY
+  # A REPLACEMENT IS FORTHCOMING.
 
-  private
+  # require_authentication :create, :update, scopes: [:project]
+  # resource_actions :create, :update, :show, :index
+  # schema_type :json_schema
+  # before_action :filter_by_subject_set, only: :index
 
-  def filter_by_subject_set
-    subject_set_ids = params.delete(:subject_set_id).try(:split, ',')
-    unless subject_set_ids.blank?
-      @controlled_resources = controlled_resources
-        .joins(workflow: :subject_sets)
-        .where(workflows: { subject_set_id: subject_set_ids } )
-    end
-  end
 end

app/models/workflow.rb

@@ -8,6 +8,8 @@ class Workflow < ApplicationRecord
   include Translatable
   include Versioning
 
+  self.ignored_columns = ['aggregation']
+
   versioned association: :workflow_versions, attributes: %w(tasks first_task strings major_version minor_version)
 
   belongs_to :project
@@ -44,7 +46,7 @@ class Workflow < ApplicationRecord
     'options' => {'count' => 15}
   }.freeze
 
-  JSON_ATTRIBUTES = %w(tasks retirement aggregation strings steps).freeze
+  JSON_ATTRIBUTES = %w[tasks retirement strings steps].freeze
 
   SELECTOR_PAGE_SIZE_KEY = 'subject_queue_page_size'.freeze
 

app/policies/aggregation_policy.rb

@@ -1,12 +1,9 @@
 class AggregationPolicy < ApplicationPolicy
   class ReadScope < Scope
-    # Allow access to public aggregations
+    # Short circuiting scopes for private aggrevations before they get removed next PR
     def resolve(action)
-      updatable_parents = policy_for(Workflow).scope_for(:update)
-      updatable_scope = scope.joins(:workflow).merge(updatable_parents)
-
-      public_aggregations = scope.joins(:workflow).where("workflows.aggregation ->> 'public' = 'true'")
-      Aggregation.union(updatable_scope, public_aggregations)
+      parent_scope = policy_for(Workflow).scope_for(action)
+      scope.where(workflow_id: parent_scope.select(:id))
     end
   end
 

app/schemas/workflow_create_schema.rb

@@ -67,10 +67,6 @@ class WorkflowCreateSchema < JsonSchema
       type "array"
     end
 
-    property "aggregation" do
-      type "object"
-    end
-
     property "configuration" do
       type "object"
     end

app/schemas/workflow_update_schema.rb

@@ -62,10 +62,6 @@ class WorkflowUpdateSchema < JsonSchema
       type "array"
     end
 
-    property "aggregation" do
-      type "object"
-    end
-
     property "configuration" do
       type "object"
     end

app/serializers/workflow_serializer.rb

@@ -10,7 +10,7 @@ class WorkflowSerializer
              :created_at, :updated_at, :finished_at, :first_task, :primary_language,
              :version, :content_language, :prioritized, :grouped, :pairwise,
              :retirement, :retired_set_member_subjects_count, :href, :active, :mobile_friendly,
-             :aggregation, :configuration, :public_gold_standard, :completeness
+             :configuration, :public_gold_standard, :completeness
 
   can_include :project, :subject_sets, :tutorial_subject, :published_version
 

lib/formatter/csv/workflow.rb

@@ -3,12 +3,12 @@ module Csv
     class Workflow
       attr_reader :workflow_version
 
-      JSON_FIELDS = [:tasks, :aggregation, :strings ].freeze
+      JSON_FIELDS = %i[tasks strings].freeze
 
       def headers
-        %w(workflow_id display_name version active classifications_count pairwise
-        grouped prioritized primary_language first_task tutorial_subject_id
-        retired_set_member_subjects_count tasks retirement aggregation strings minor_version)
+        %w[workflow_id display_name version active classifications_count pairwise
+           grouped prioritized primary_language first_task tutorial_subject_id
+           retired_set_member_subjects_count tasks retirement strings minor_version]
       end
 
       def to_rows(workflow_version)