hyrax 3.2.0 → 3.3.0

data/app/jobs/valkyrie_ingest_job.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+class ValkyrieIngestJob < Hyrax::ApplicationJob
+  queue_as Hyrax.config.ingest_queue_name
+
+  ##
+  # @param [Valkyrie::StorageAdapter::StreamFile] file
+  def perform(file)
+    ingest(file: file)
+  end
+
+  ##
+  # @param [Valkyrie::StorageAdapter::StreamFile] file
+  #
+  # @return [void]
+  def ingest(file:)
+    file_set = Hyrax.query_service.find_by(id: file.file_set_uri)
+    updated_metadata = upload_file(file: file, file_set: file_set)
+
+    add_file_to_file_set(file_set: file_set, file_metadata: updated_metadata)
+  end
+
+  ##
+  # @todo this should publish something to allow the fileset
+  #   to reindex its membership
+  # @param [Hyrax::FileSet] file_set the file set to add to
+  # @param [Hyrax::FileMetadata] file_metadata the metadata object representing
+  #   the file to add
+  #
+  # @return [Hyrax::FileSet] updated file set
+  def add_file_to_file_set(file_set:, file_metadata:)
+    file_set.file_ids << file_metadata.id
+    Hyrax.persister.save(resource: file_set)
+  end
+
+  ##
+  # @param [Hyrax::UploadedFile] file
+  # @param [Hyrax::FileSet] file_set
+  #
+  # @return [Hyrax::FileMetadata] the metadata representing the uploaded file
+  def upload_file(file:, file_set:)
+    carrier_wave_sanitized_file = file.uploader.file
+    uploaded = Hyrax.storage_adapter
+                    .upload(resource: file_set,
+                            file: carrier_wave_sanitized_file,
+                            original_filename: carrier_wave_sanitized_file.original_filename)
+
+    file_metadata = Hyrax.custom_queries.find_file_metadata_by(id: uploaded.id)
+    file_metadata.file_set_id = file.file_set_uri
+    file_metadata.file_identifier = uploaded.id
+    file_metadata.size = uploaded.size
+
+    Hyrax.publisher.publish("object.file.uploaded", metadata: file_metadata)
+
+    file_metadata
+  end
+end

data/app/models/concerns/hyrax/ability.rb

@@ -1,7 +1,30 @@
 # frozen_string_literal: true
 module Hyrax
   ##
-  # Provides Hyrax's engine level user/group permissions.
+  # Provides Hyrax's engine level user/group authorizations.
+  #
+  # Authorization (allow or deny) of the following actions is managed by the
+  # rules defined here:
+  #
+  #   - read:
+  #   - show:
+  #   - edit:
+  #   - update:
+  #   - create:
+  #   - discover:
+  #   - manage:
+  #   - download:
+  #   - destroy:
+  #   - collect:
+  #   - toggle_trophy:
+  #   - transfer:
+  #   - accept:
+  #   - reject:
+  #   - manage_any:
+  #   - create_any:
+  #   - view_admin_show_any:
+  #   - review:
+  #   - create_collection_type:
   #
   # @note This is intended as a mixin layered over
   #   +Blacklight::AccessControls::Ability+ and +Hydra::AccessControls+. Its
@@ -390,10 +413,8 @@ module Hyrax
     # Returns true if the current user is the depositor of the specified work
     # @param document_id [String] the id of the document.
     def user_is_depositor?(document_id)
-      Hyrax::WorkRelation.new.search_with_conditions(
-        id: document_id,
-        DepositSearchBuilder.depositor_field => current_user.user_key
-      ).any?
+      doc = Hyrax::SolrService.search_by_id(document_id, fl: 'depositor_ssim')
+      current_user.user_key == doc.fetch('depositor_ssim').first
     end
 
     def curation_concerns_models

data/app/models/concerns/hyrax/solr_document/metadata.rb

@@ -54,6 +54,7 @@ module Hyrax
         attribute :admin_set, Solr::Array, "admin_set_tesim"
         attribute :member_ids, Solr::Array, "member_ids_ssim"
         attribute :member_of_collection_ids, Solr::Array, "member_of_collection_ids_ssim"
+        attribute :member_of_collections, Solr::Array, "member_of_collections_ssim"
         attribute :description, Solr::Array, "description_tesim"
         attribute :abstract, Solr::Array, "abstract_tesim"
         attribute :title, Solr::Array, "title_tesim"

data/app/models/file_download_stat.rb

@@ -12,10 +12,10 @@ class FileDownloadStat < Hyrax::Statistic
         Rails.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
         return []
       end
-      profile.hyrax__download(sort: 'date',
-                              start_date: start_date,
-                              end_date: Date.yesterday,
-                              limit: 10_000)
+      profile.hyrax__analytics__google__download(sort: 'date',
+                                                 start_date: start_date,
+                                                 end_date: Date.yesterday,
+                                                 limit: 10_000)
              .for_file(file.id)
     end
 

data/app/models/hyrax/default_administrative_set.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+module Hyrax
+  # This class stores the id of the default `Hyrax::AdministrativeSet`.  This is
+  # used to populate a cache of the default admin set in Hyrax::Configuration.
+  #
+  # @see Hyrax::Configuration.default_admin_set
+  # @see Hyrax::Configuration.default_admin_set_id
+  # @see Hyrax::Configuration.reset_default_admin_set
+  class DefaultAdministrativeSet < ActiveRecord::Base
+    self.table_name = 'hyrax_default_administrative_set'
+
+    class << self
+      # Set the default admin set id in the first record.
+      # @param default_admin_set_id [String | Valkyrie::ID] id of the new default admin set
+      def update(default_admin_set_id:)
+        validate_id(default_admin_set_id)
+        Hyrax.config.reset_default_admin_set
+
+        # saving default_admin_set_id for the first time
+        return new(default_admin_set_id: default_admin_set_id.to_s).save if count.zero?
+
+        # replacing previously saved default_admin_set_id
+        existing = first
+        existing.default_admin_set_id = default_admin_set_id.to_s
+        existing.save
+      end
+
+      def save_supported?
+        ActiveRecord::Base.connection.table_exists? table_name
+      end
+
+      private
+
+      def validate_id(id)
+        # The id is validated prior to updating because a bad default admin set
+        # will cause lots of problems.
+        return true if id.is_a?(String) || id.is_a?(Valkyrie::ID)
+        raise ArgumentError, "default_admin_set_id must be a non-blank String or Valkyrie::ID"
+      end
+    end
+  end
+end

data/app/models/hyrax/statistic.rb

@@ -34,13 +34,40 @@ module Hyrax
           Rails.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
           return []
         end
-        profile.hyrax__pageview(sort: 'date',
-                                start_date: start_date,
-                                end_date: Date.yesterday,
-                                limit: 10_000)
+        profile.hyrax__analytics__google__pageviews(sort: 'date',
+                                                    start_date: start_date,
+                                                    end_date: Date.yesterday,
+                                                    limit: 10_000)
                .for_path(path)
       end
 
+      def query_works(query)
+        models = Hyrax.config.curation_concerns.map { |m| "\"#{m}\"" }
+        ActiveFedora::SolrService.query("has_model_ssim:(#{models.join(' OR ')})", fl: query, rows: 100_000)
+      end
+
+      def work_types
+        results = query_works("human_readable_type_tesim")
+        results.group_by { |result| result['human_readable_type_tesim'].join('') }.transform_values(&:count)
+      end
+
+      def resource_types
+        results = query_works("resource_type_tesim")
+        resource_types = []
+        results.each do |y|
+          if y["resource_type_tesim"].nil? || (y["resource_type_tesim"] == [""])
+            resource_types.push("Unknown")
+          elsif y["resource_type_tesim"].count > 1
+            y["resource_type_tesim"].each do |t|
+              resource_types.push(t)
+            end
+          else
+            resource_types.push(y["resource_type_tesim"].join(""))
+          end
+        end
+        resource_types.group_by { |rt| rt }.transform_values(&:count)
+      end
+
       private
 
       def cached_stats(object, start_date, _method)

data/app/presenters/hyrax/admin/dashboard_presenter.rb

@@ -3,20 +3,22 @@ module Hyrax
   module Admin
     class DashboardPresenter
       # @return [Fixnum] the number of currently registered users
-      def user_count
-        ::User.where(guest: false).count
+      def user_count(start_date, end_date)
+        ::User.where(guest: false)
+              .where({ created_at: start_date.to_date.beginning_of_day..end_date.to_date.end_of_day })
+              .count
       end
 
       def repository_objects
         @repository_objects ||= Admin::RepositoryObjectPresenter.new
       end
 
-      def repository_growth
-        @repository_growth ||= Admin::RepositoryGrowthPresenter.new
+      def repository_growth(start_date, end_date)
+        @repository_growth ||= Admin::RepositoryGrowthPresenter.new(start_date, end_date)
       end
 
-      def user_activity
-        @user_activity ||= Admin::UserActivityPresenter.new
+      def user_activity(start_date, end_date)
+        @user_activity ||= Admin::UserActivityPresenter.new(start_date, end_date)
       end
     end
   end

data/app/presenters/hyrax/admin/repository_growth_presenter.rb

@@ -2,26 +2,31 @@
 module Hyrax
   module Admin
     class RepositoryGrowthPresenter
-      def initialize
-        @x_min = 90.days.ago.beginning_of_day
+      def initialize(start_date, end_date)
+        @x_min = start_date
+        @x_max = end_date
         @date_format = ->(x) { x.strftime('%F') }
       end
 
       def as_json(*)
         works.to_a.zip(collections.to_a).map do |e|
-          { y: e.first.first, a: e.first.last, b: e.last.last }
+          { y: e.first.first, works: e.first.last, collections: e.last.last }
         end
       end
 
       private
 
       def works
-        Hyrax::Statistics::Works::OverTime.new(x_min: @x_min,
+        Hyrax::Statistics::Works::OverTime.new(delta_x: 1,
+                                               x_min: @x_min,
+                                               x_max: @x_max,
                                                x_output: @date_format).points
       end
 
       def collections
-        Hyrax::Statistics::Collections::OverTime.new(x_min: @x_min,
+        Hyrax::Statistics::Collections::OverTime.new(delta_x: 1,
+                                                     x_min: @x_min,
+                                                     x_max: @x_max,
                                                      x_output: @date_format).points
       end
     end

data/app/presenters/hyrax/admin/user_activity_presenter.rb

@@ -2,28 +2,24 @@
 module Hyrax
   module Admin
     class UserActivityPresenter
-      def initialize
-        @x_min = 90.days.ago.beginning_of_day
-        @date_format = ->(x) { x.strftime('%b %-d') }
+      def initialize(start_date, end_date)
+        @x_min = start_date
+        @x_max = end_date
+        @date_format = ->(x) { x }
       end
 
       def as_json(*)
-        new_users.to_a.zip(returning_users.to_a).map do |e|
-          { y: e.first.first, a: e.first.last, b: e.last.try(:last) }
-        end
+        new_users.to_a
       end
 
       private
 
       def new_users
-        Hyrax::Statistics::Users::OverTime.new(x_min: @x_min,
+        Hyrax::Statistics::Users::OverTime.new(delta_x: 1,
+                                               x_min: @x_min,
+                                               x_max: @x_max,
                                                x_output: @date_format).points
       end
-
-      # TODO: using google analytics
-      def returning_users
-        []
-      end
     end
   end
 end

data/app/presenters/hyrax/file_set_presenter.rb

@@ -34,6 +34,8 @@ module Hyrax
              :original_file_id,
              to: :solr_document
 
+    delegate :member_of_collection_ids, to: :parent
+
     def workflow
       nil
     end

data/app/presenters/hyrax/menu_presenter.rb

@@ -43,6 +43,10 @@ module Hyrax
       end
     end
 
+    def analytics_reporting_section?
+      %w[work_reports collection_reports].include?(controller_name)
+    end
+
     # Draw a collaspable menu section. The passed block should contain <li> items.
     def collapsable_section(text, id:, icon_class:, open:, &block)
       CollapsableSectionPresenter.new(view_context: view_context,

data/app/presenters/hyrax/pcdm_member_presenter_factory.rb

@@ -19,7 +19,7 @@ module Hyrax
     ##
     # @param [#member_ids] object
     # @param [::Ability] ability
-    def initialize(object, ability)
+    def initialize(object, ability, _request = nil)
       @object = object
       @ability = ability
     end

data/app/presenters/hyrax/work_show_presenter.rb

@@ -10,10 +10,11 @@ module Hyrax
     attr_writer :member_presenter_factory
     attr_accessor :solr_document, :current_ability, :request
 
-    class_attribute :collection_presenter_class
+    class_attribute :collection_presenter_class, :presenter_factory_class
 
     # modify this attribute to use an alternate presenter class for the collections
     self.collection_presenter_class = CollectionPresenter
+    self.presenter_factory_class = MemberPresenterFactory
 
     # Methods used by blacklight helpers
     delegate :has?, :first, :fetch, :export_formats, :export_as, to: :solr_document
@@ -304,7 +305,9 @@ module Hyrax
 
     def member_presenter_factory
       @member_presenter_factory ||=
-        MemberPresenterFactory.new(solr_document, current_ability, request)
+        self.class
+            .presenter_factory_class
+            .new(solr_document, current_ability, request)
     end
 
     def graph

data/app/presenters/hyrax/work_usage.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Hyrax
+  # TODO: - Analytics do we still need this?
   # Follows the model established by {FileUsage}.
   #
   # Called by the stats controller, it finds cached work pageview data,

data/app/search_builders/hyrax/README.md

@@ -66,4 +66,4 @@ module Hyrax
 end
 ```
 
-There is no point having the other `filter_models` methods apply `:fq`s that we then try to undo or overwrite.  In general, directly overwriting the whole `default_processor_chain` or solr parameters like `:fq` is less flexible than appending constraints sufficient for your use case.  In particular, you might find that you have overwritten components that implement access controls, thereby making your SearchBuilder less useful and less secure.  When in doubt, examine the actual solr queries produced.
+There is no point having the other `filter_models` methods apply `:fq`s that we then try to undo or overwrite.  In general, directly overwriting the whole `default_processor_chain` or solr parameters like `:fq` is less flexible than appending constraints sufficient for your use case.  In particular, you might find that you have overwritten components that implement access controls, thereby making your SearchBuilder less useful and less secure.  When in doubt, examine the actual solr queries produced.

data/app/search_builders/hyrax/dashboard/collections_search_builder.rb

@@ -9,7 +9,7 @@ module Hyrax
 
       # This overrides the models in FilterByType
       def models
-        [::AdminSet, ::Collection, Hyrax.config.collection_model.safe_constantize].uniq.compact
+        [::AdminSet, ::Collection, Hyrax.config.collection_class].uniq.compact
       end
 
       # adds a filter to exclude collections and admin sets created by the

data/app/search_builders/hyrax/my/collections_search_builder.rb

@@ -21,6 +21,6 @@ class Hyrax::My::CollectionsSearchBuilder < ::Hyrax::CollectionSearchBuilder
   # This overrides the models in FilterByType
   # @return [Array<Class>] a list of classes to include
   def models
-    [::AdminSet, Hyrax::AdministrativeSet, Hyrax.config.collection_model.safe_constantize].compact
+    [::AdminSet, Hyrax::AdministrativeSet, ::Collection, Hyrax.config.collection_class].uniq.compact
   end
 end

data/app/services/hyrax/admin_set_create_service.rb

@@ -13,8 +13,9 @@ module Hyrax
     DEFAULT_ID = 'admin_set/default'
     DEFAULT_TITLE = ['Default Admin Set'].freeze
 
-    class_attribute :permissions_create_service
+    class_attribute :permissions_create_service, :default_admin_set_persister
     self.permissions_create_service = Hyrax::Collections::PermissionsCreateService
+    self.default_admin_set_persister = Hyrax::DefaultAdministrativeSet
 
     class << self
       # @api public
@@ -40,16 +41,15 @@ module Hyrax
       # @see Hyrax::AdministrativeSet
       # @raise [RuntimeError] if admin set cannot be persisted
       def find_or_create_default_admin_set
-        Hyrax.query_service.find_by(id: DEFAULT_ID)
-      rescue Valkyrie::Persistence::ObjectNotFoundError
-        create_default_admin_set!
+        find_default_admin_set || create_default_admin_set!
       end
 
       # @api public
-      # Is the admin_set the default Hyrax::AdministrativeSet
-      # @param id [#to_s] the id of the admin set to check
+      # @param id [#to_s] id of the admin set to check
+      # @return [Boolean] true if the id is for the default admin set; otherwise, false
       def default_admin_set?(id:)
-        id.to_s == DEFAULT_ID
+        return false if id.blank?
+        id.to_s == default_admin_set_id
       end
 
       # @api public
@@ -88,18 +88,80 @@ module Hyrax
       # TODO: Parameters admin_set_id and title are defined to support .create_default_admin_set
       #       which is deprecated.  When it is removed, the parameters will no longer be required.
       def create_default_admin_set!(admin_set_id: DEFAULT_ID, title: DEFAULT_TITLE)
-        admin_set = Hyrax::AdministrativeSet.new(id: admin_set_id, title: Array.wrap(title))
-        new(admin_set: admin_set, creating_user: nil).create!
+        admin_set = create_admin_set(suggested_id: admin_set_id, title: title)
+        admin_set = new(admin_set: admin_set, creating_user: nil, default_admin_set: true).create!
+        default_admin_set_persister.update(default_admin_set_id: admin_set.id) if save_default?
+        admin_set
+      end
+
+      def save_default?
+        default_admin_set_persister.save_supported?
+      end
+
+      # Create an instance of `Hyrax::AdministrativeSet` with the suggested_id if supported.
+      # @return [Hyrax::AdministrativeSet] the new admin set
+      def create_admin_set(suggested_id:, title:)
+        if suggested_id.blank? || Hyrax.config.disable_wings || !Hyrax.metadata_adapter.is_a?(Wings::Valkyrie::MetadataAdapter)
+          # allow persister to assign id
+          Hyrax::AdministrativeSet.new(title: Array.wrap(title))
+        else
+          # use suggested_id
+          Hyrax::AdministrativeSet.new(id: suggested_id, title: Array.wrap(title))
+        end
+      end
+
+      # Find default AdministrativeSet using saved id
+      # @return [Hyrax::AdministrativeSet] the default admin set; nil if id not saved
+      # @raise [RuntimeError] if an admin set with the saved id doesn't exist
+      def find_default_admin_set
+        id = default_admin_set_id
+        return if id.blank?
+        Hyrax.query_service.find_by(id: id)
+      rescue Valkyrie::Persistence::ObjectNotFoundError
+        # The default ID is DEFAULT_ID when saving is not supported.  It is ok
+        # for this default id to be known but not found.  The admin set will be
+        # created with DEFAULT_ID by find_or_create_default_admin_set.
+        return unless save_default?
+
+        # id is saved in the default_admin_set_persister's table but doesn't exist
+        # NOTE: This is a corrupt state and shouldn't happen.  Manual intervention
+        #       is required to determine the correct value for the default admin
+        #       set id.  The saved id either needs to be updated to the correct
+        #       value or deleted to allow a new default admin set to be found
+        #       (i.e. an admin set with id DEFAULT_ID) or generated.
+        raise "Corrupt default admin set.  Persisted admin set with saved default_admin_set_id doesn't exist."
+      end
+
+      # Find default AdministrativeSet using DEFAULT_ID.
+      # @note Use of hardcoded ID is being deprecated as some Valkyrie adapters
+      #       do not support hardcoded IDs (e.g. postgres)
+      # @return [Hyrax::AdministrativeSet] the default admin set; nil if not found
+      def find_unsaved_default_admin_set
+        admin_set = Hyrax.query_service.find_by(id: DEFAULT_ID)
+        default_admin_set_persister.update(default_admin_set_id: DEFAULT_ID) if save_default?
+        admin_set
+      rescue Valkyrie::Persistence::ObjectNotFoundError
+        # a default admin set hasn't been created yet
+      end
+
+      # @return [String | nil] the default admin set id; returns nil if not set
+      # @note For general use, it is better to use `Hyrax.config.default_admin_set_id`.
+      def default_admin_set_id
+        return DEFAULT_ID unless save_default?
+        id = default_admin_set_persister.first&.default_admin_set_id
+        id = find_unsaved_default_admin_set&.id&.to_s if id.blank?
+        id
       end
     end
 
     # @param admin_set [Hyrax::AdministrativeSet | AdminSet] the admin set to operate on
     # @param creating_user [User] the user who created the admin set (if any).
     # @param workflow_importer [#call] imports the workflow
-    def initialize(admin_set:, creating_user:, workflow_importer: default_workflow_importer)
+    def initialize(admin_set:, creating_user:, workflow_importer: default_workflow_importer, default_admin_set: false)
       @admin_set = admin_set
       @creating_user = creating_user
       @workflow_importer = workflow_importer
+      @default_admin_set = default_admin_set
     end
 
     attr_reader :creating_user, :admin_set, :workflow_importer
@@ -125,8 +187,8 @@ module Hyrax
 
     private
 
-    def default_admin_set?(id:)
-      self.class.default_admin_set?(id: id)
+    def default_admin_set?
+      @default_admin_set
     end
 
     def admin_group_name
@@ -144,7 +206,7 @@ module Hyrax
             permission_template = permissions_create_service.create_default(collection: result,
                                                                             creating_user: creating_user)
             workflow = create_workflows_for(permission_template: permission_template)
-            create_default_access_for(permission_template: permission_template, workflow: workflow) if default_admin_set?(id: admin_set.id)
+            create_default_access_for(permission_template: permission_template, workflow: workflow) if default_admin_set?
           end
         end
       end
@@ -163,7 +225,7 @@ module Hyrax
             permission_template = permissions_create_service.create_default(collection: admin_set,
                                                                             creating_user: creating_user)
             workflow = create_workflows_for(permission_template: permission_template)
-            create_default_access_for(permission_template: permission_template, workflow: workflow) if default_admin_set?(id: admin_set.id)
+            create_default_access_for(permission_template: permission_template, workflow: workflow) if default_admin_set?
           end
         end
       end

data/app/services/hyrax/analytics/google/events.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+module Hyrax
+  module Analytics
+    module Google
+      module Events
+        extend Legato::Model
+
+        metrics :total_events
+        dimensions :event_category, :event_action, :event_label
+
+        # Filter by event id
+        filter :for_id, &->(id) { matches(:eventLabel, id) }
+
+        # Filter by event action
+        filter(:work_view) { |_event_action| matches(:eventAction, 'work-view') }
+        filter(:work_in_collection_view) { |_event_action| matches(:eventAction, 'work-in-collection-view') }
+        filter(:collection_page_view) { |_event_action| matches(:eventAction, 'collection-page-view') }
+        filter(:file_set_download) { |_event_action| matches(:eventAction, 'file-set-download') }
+        filter(:work_in_collection_download) { |_event_action| matches(:eventAction, 'work-in-collection-download') }
+        filter(:file_set_in_work_download) { |_event_action| matches(:eventAction, 'file-set-in-work-download') }
+        filter(:collection_file_download) { |_event_action| matches(:eventAction, 'file-set-in-collection-download') }
+
+        def self.list(profile, start_date, end_date, action)
+          action = action.underscore
+          results = []
+          Events.results(profile,
+            start_date: start_date,
+            end_date: end_date,
+            sort: ['-totalEvents']).send(action).each do |result|
+              results.push([result.eventLabel, result.totalEvents.to_i])
+            end
+          results
+        end
+      end
+    end
+  end
+end

data/app/services/hyrax/analytics/google/events_daily.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+module Hyrax
+  module Analytics
+    module Google
+      module EventsDaily
+        extend Legato::Model
+
+        metrics :total_events
+        dimensions :date, :event_category, :event_action
+
+        # Filter by event id
+        filter :for_id, &->(id) { matches(:eventLabel, id) }
+
+        # Filter by event action
+        filter(:work_view) { |_event_action| matches(:eventAction, 'work-view') }
+        filter(:work_in_collection_view) { |_event_action| matches(:eventAction, 'work-in-collection-view') }
+        filter(:collection_page_view) { |_event_action| matches(:eventAction, 'collection-page-view') }
+        filter(:file_set_download) { |_event_action| matches(:eventAction, 'file-set-download') }
+        filter(:work_in_collection_download) { |_event_action| matches(:eventAction, 'work-in-collection-download') }
+        filter(:file_set_in_work_download) { |_event_action| matches(:eventAction, 'file-set-in-work-download') }
+        filter(:collection_file_download) { |_event_action| matches(:eventAction, 'file-set-in-collection-download') }
+
+        # returns a daily number of events for a specific action
+        def self.summary(profile, start_date, end_date, action)
+          action = action.underscore
+          response = EventsDaily.results(profile,
+            start_date: start_date,
+            end_date: end_date).send(action)
+          dates = (start_date.to_date...end_date.to_date)
+          results_array(response, dates)
+        end
+
+        # returns a daily number of events for a specific action
+        def self.by_id(profile, start_date, end_date, id, action)
+          action = action.underscore
+          response = EventsDaily.results(profile,
+            start_date: start_date,
+            end_date: end_date).for_id(id).send(action)
+          dates = (start_date.to_date...end_date.to_date)
+          results_array(response, dates)
+        end
+
+        # def self.pageviews(profile, start_date, end_date, ref)
+        #   ref = ref.underscore
+        #   response = PageviewsDaily.results(profile,
+        #     start_date: start_date,
+        #     end_date: end_date).send(ref)
+        #   dates = (start_date.to_date...end_date.to_date)
+        #   results_array(response, dates)
+        # end
+
+        # takes all the dates in between the date range and generate an array [date, totalEvents]
+        def self.results_array(response, dates)
+          results = []
+          response.to_a.each do |result|
+            results.push([result.date.to_date, result.totalEvents.to_i])
+          end
+          new_results = []
+          dates.each do |date|
+            match = results.detect { |a, _b| a == date }
+            if match
+              new_results.push(match)
+            else
+              new_results.push([date, 0])
+            end
+          end
+          Hyrax::Analytics::Results.new(new_results)
+        end
+      end
+    end
+  end
+end