hyrax 5.0.0 → 5.0.3

data/app/presenters/hyrax/work_usage.rb

@@ -8,11 +8,14 @@ module Hyrax
   # and prepares it for visualization in /app/views/stats/work.html.erb
   class WorkUsage < StatsUsagePresenter
     def initialize(id)
-      self.model = Hyrax::WorkRelation.new.find(id)
+      self.model = Hyrax.query_service.find_by(id: id)
     end
 
     alias work model
-    delegate :to_s, to: :model
+
+    def to_s
+      model.title.first
+    end
 
     def total_pageviews
       pageviews.reduce(0) { |total, result| total + result[1].to_i }

data/app/search_builders/hyrax/expired_embargo_search_builder.rb

@@ -6,7 +6,13 @@ module Hyrax
 
     def only_expired_embargoes(solr_params)
       solr_params[:fq] ||= []
-      solr_params[:fq] = 'embargo_release_date_dtsi:[* TO NOW]'
+      solr_params[:fq] = "embargo_release_date_dtsi:[* TO #{now}]"
+    end
+
+    private
+
+    def now
+      Hyrax::TimeService.time_in_utc.utc.xmlschema
     end
   end
 end

data/app/search_builders/hyrax/expired_lease_search_builder.rb

@@ -6,7 +6,13 @@ module Hyrax
 
     def only_expired_leases(solr_params)
       solr_params[:fq] ||= []
-      solr_params[:fq] = 'lease_expiration_date_dtsi:[* TO NOW]'
+      solr_params[:fq] = "lease_expiration_date_dtsi:[* TO #{now}]"
+    end
+
+    private
+
+    def now
+      Hyrax::TimeService.time_in_utc.utc.xmlschema
     end
   end
 end

data/app/search_builders/hyrax/filter_by_type.rb

@@ -30,9 +30,7 @@ module Hyrax
     end
 
     def models_to_solr_clause
-      models.map do |model|
-        model.respond_to?(:to_rdf_representation) ? model.to_rdf_representation : model.name
-      end.join(',')
+      Hyrax::ModelRegistry.rdf_representations_from(models).join(',')
     end
 
     def generic_type_field

data/app/search_builders/hyrax/valkyrie_abstract_type_relation.rb

@@ -19,8 +19,13 @@ module Hyrax
       Hyrax.query_service.custom_queries.find_count_by(models: allowable_types)
     end
 
-    def where(hash)
-      Hyrax.query_service.find_references_by(resource: hash.values.first, property: hash.keys.first)
+    def where(hash_or_string)
+      case hash_or_string
+      when String
+        Hyrax::SolrService.query(hash_or_string)
+      else
+        Hyrax.query_service.find_references_by(resource: hash_or_string.values.first, property: hash_or_string.keys.first)
+      end
     end
 
     def ==(other)

data/app/services/hyrax/access_control_list.rb

@@ -136,7 +136,7 @@ module Hyrax
     #
     # @return [Boolean]
     def pending_changes?
-      change_set.changed?
+      !change_set.resource.persisted? || change_set.changed?
     end
 
     ##

data/app/services/hyrax/admin_set_create_service.rb

@@ -10,7 +10,7 @@ module Hyrax
   # @see Hyrax::PermissionTemplate
   # @see Sipity::Workflow
   class AdminSetCreateService # rubocop:disable Metrics/ClassLength
-    DEFAULT_ID = 'admin_set/default'
+    DEFAULT_ID = 'admin_set_default'
     DEFAULT_TITLE = ['Default Admin Set'].freeze
 
     class_attribute :permissions_create_service, :default_admin_set_persister
@@ -124,11 +124,22 @@ module Hyrax
       #       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 = begin
+                      # to support repositories still using the deprecated 'admin_set/default' as DEFAULT_ID
+                      Hyrax.query_service.find_by(id: 'admin_set/default')
+                    rescue Ldp::BadRequest, Valkyrie::Persistence::ObjectNotFoundError
+                      # Fedora 6.5+ does not support slashes in IDs, hence the need to rescue Ldp::BadRequest
+                      # if an admin set with deprecated ID 'admin_set/default' does not exist, check again for admin set with DEFAULT_ID
+                      begin
+                        Hyrax.query_service.find_by(id: DEFAULT_ID)
+                      rescue Valkyrie::Persistence::ObjectNotFoundError
+                        nil
+                      end
+                    end
+
+        default_admin_set_persister.update(default_admin_set_id: admin_set.id.to_s) if admin_set.present? && 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

data/app/services/hyrax/admin_set_service.rb

@@ -51,9 +51,10 @@ module Hyrax
     # @return [Hash] admin set id keys and file count values
     def count_files(admin_sets)
       file_counts = Hash.new(0)
+      file_set_models = Hyrax::ModelRegistry.file_set_rdf_representations
       admin_sets.each do |admin_set|
         query = "{!join from=member_ids_ssim to=id}isPartOf_ssim:#{admin_set.id}"
-        file_results = Hyrax::SolrService.get(fq: [query, "{!terms f=has_model_ssim}FileSet,Hyrax::FileSet"], rows: 0)
+        file_results = Hyrax::SolrService.get(fq: [query, "{!terms f=has_model_ssim}#{file_set_models.join(',')}"], rows: 0)
         file_counts[admin_set.id] = file_results['response']['numFound']
       end
       file_counts

data/app/services/hyrax/analytics/ga4/base.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+module Hyrax
+  module Analytics
+    module Ga4
+      class Base
+        attr_reader :start_date, :end_date, :dimensions, :metrics
+
+        def initialize(start_date:,
+                       end_date:,
+                       dimensions: [],
+                       metrics: [])
+          @start_date = start_date.to_date
+          @end_date = end_date.to_date
+          @dimensions = dimensions
+          @metrics = metrics
+        end
+
+        def filters
+          @filters ||= {}
+        end
+
+        def filters=(value)
+          value
+        end
+
+        def add_filter(dimension:, values:)
+          # reset any cached results
+          @results = nil
+          filters[dimension] ||= []
+          filters[dimension] += values
+        end
+
+        def results
+          @results ||= Hyrax::Analytics.client.run_report(report).rows
+        end
+
+        def report
+          ::Google::Analytics::Data::V1beta::RunReportRequest.new(
+            property: Hyrax::Analytics.property,
+            metrics: metrics,
+            date_ranges: [{ start_date: start_date.iso8601, end_date: end_date.iso8601 }],
+            dimensions: dimensions,
+            dimension_filter: dimension_filter
+          )
+        end
+
+        def dimension_filter
+          return nil if filters.blank?
+          {
+            and_group: {
+              expressions: dimension_expressions
+            }
+          }
+        end
+
+        def dimension_expressions
+          filters.map do |dimension, values|
+            {
+              filter: {
+                field_name: dimension,
+                in_list_filter: { values: values.uniq }
+              }
+            }
+          end
+        end
+
+        def results_array(target_type = nil)
+          r = {}
+          # prefill dates so that all dates at least have 0
+          (start_date..end_date).each do |date|
+            r[date] = 0
+          end
+          results.each do |result|
+            date = unwrap_dimension(metric: result, dimension: 0)
+            type = unwrap_dimension(metric: result, dimension: 1)
+            next if date.nil? || type.nil?
+            next if target_type && type != target_type
+            date = date.to_date
+            r[date] += unwrap_metric(result)
+          end
+          Hyrax::Analytics::Results.new(r.to_a)
+        end
+
+        protected
+
+        def unwrap_dimension(metric:, dimension: 0)
+          metric.dimension_values[dimension]&.value
+        end
+
+        def unwrap_metric(metric)
+          metric.metric_values.first.value.to_i
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+module Hyrax
+  module Analytics
+    module Ga4
+      class Events < Hyrax::Analytics::Ga4::Base
+        def initialize(start_date:,
+                       end_date:,
+                       dimensions: [{ name: 'eventName' }, { name: 'contentType' }, { name: 'contentId' }],
+                       metrics: [{ name: 'eventCount' }])
+          super
+        end
+
+        def self.list(start_date, end_date, action)
+          events = Events.new(start_date: start_date, end_date: end_date)
+          events.add_filter(dimension: 'eventName', values: [action])
+          events.top_result_array
+        end
+
+        def top_result_array
+          results.map { |r| [unwrap_dimension(metric: r, dimension: 2), unwrap_metric(r)] }.sort_by { |r| r[1] }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+module Hyrax
+  module Analytics
+    module Ga4
+      class EventsDaily < Hyrax::Analytics::Ga4::Base
+        def initialize(start_date:,
+                       end_date:,
+                       dimensions: [{ name: 'date' }, { name: 'eventName' }, { name: 'contentType' }, { name: 'contentId' }],
+                       metrics: [{ name: 'eventCount' }])
+          super
+        end
+
+        # returns a daily number of events for a specific action
+        def self.summary(start_date, end_date, action)
+          events_daily = EventsDaily.new(
+            start_date: start_date,
+            end_date: end_date
+          )
+          events_daily.add_filter(dimension: 'eventName', values: [action])
+          events_daily.results_array
+        end
+
+        # returns a daily number of events for a specific action
+        def self.by_id(start_date, end_date, id, action)
+          events_daily = EventsDaily.new(
+            start_date: start_date,
+            end_date: end_date
+          )
+          events_daily.add_filter(dimension: 'contentId', values: [id])
+          events_daily.add_filter(dimension: 'eventName', values: [action])
+          events_daily.results_array
+        end
+      end
+    end
+  end
+end

data/app/services/hyrax/analytics/ga4/visits.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+module Hyrax
+  module Analytics
+    module Ga4
+      class Visits < Hyrax::Analytics::Ga4::Base
+        def initialize(start_date:, end_date:, dimensions: [{ name: 'newVsReturning' }], metrics: [{ name: 'sessions' }])
+          super
+        end
+
+        def new_visits
+          unwrap_metric(results.detect { |r| unwrap_dimension(metric: r) == 'new' })
+        end
+
+        def return_visits
+          unwrap_metric(results.detect { |r| unwrap_dimension(metric: r) == 'returning' })
+        end
+
+        def unknown_visits
+          empty_metrics = results.detect { |r| unwrap_dimension(metric: r) == '' }
+          not_set_metrics = results.detect { |r| unwrap_dimension(metric: r) == '(not set)' }
+          unknown = 0
+          unknown += unwrap_metric(empty_metrics) if empty_metrics.present?
+          unknown += unwrap_metric(not_set_metrics) if not_set_metrics.present?
+          unknown
+        end
+
+        def total_visits
+          new_visits + return_visits + unknown_visits
+        end
+      end
+    end
+  end
+end

data/app/services/hyrax/analytics/ga4/visits_daily.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+module Hyrax
+  module Analytics
+    module Ga4
+      class VisitsDaily < Hyrax::Analytics::Ga4::Base
+        def initialize(start_date:, end_date:, dimensions: [{ name: 'date' }, { name: 'newVsReturning' }], metrics: [{ name: 'sessions' }])
+          super
+        end
+
+        def new_visits
+          results_array('new')
+        end
+
+        def return_visits
+          results_array('returning')
+        end
+
+        def total_visits
+          results_array
+        end
+      end
+    end
+  end
+end

data/app/services/hyrax/analytics/ga4.rb

@@ -0,0 +1,204 @@
+# frozen_string_literal: true
+
+require 'oauth2'
+
+begin
+  require "google/analytics/data/v1beta"
+rescue LoadError
+  $stderr.puts "Unable to load 'google/analytics/data/v1beta'; this is okay unless you are trying to do analytics reporting."
+end
+
+module Hyrax
+  module Analytics
+    # rubocop:disable Metrics/ModuleLength
+    module Ga4
+      extend ActiveSupport::Concern
+      # rubocop:disable Metrics/BlockLength
+      class_methods do
+        # Loads configuration options from config/analytics.yml. You only need PRIVATE_KEY_PATH or
+        # PRIVATE_KEY_VALUE. VALUE takes precedence.
+        # Expected structure:
+        # `analytics:`
+        # `  ga4:`
+        #      analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
+        #      property_id: <%= ENV['GOOGLE_ANALYTICS_PROPERTY_ID'] %>
+        #      account_json: <%= ENV['GOOGLE_ACCOUNT_JSON'] %>
+        #      account_json_path: <%= ENV['GOOGLE_ACCOUNT_JSON_PATH'] %>
+        # @return [Config]
+        def config
+          @config ||= Config.load_from_yaml
+        end
+
+        class Config
+          def self.load_from_yaml
+            filename = Rails.root.join('config', 'analytics.yml')
+            yaml = YAML.safe_load(ERB.new(File.read(filename)).result)
+            unless yaml
+              Hyrax.logger.error("Unable to fetch any keys from #{filename}.")
+              return new({})
+            end
+            config = yaml.fetch('analytics')&.fetch('ga4', nil)
+            unless config
+              Deprecation.warn("Deprecated analytics configuration format found. Please update config/analytics.yml.")
+              config = yaml.fetch('analytics')
+              # this has to exist here with a placeholder so it can be set in the Hyrax initializer
+              # it is only for backward compatibility
+              config['analytics_id'] = '-'
+            end
+            new config
+          end
+
+          KEYS = %w[analytics_id property_id account_json account_json_path].freeze
+          REQUIRED_KEYS = %w[analytics_id property_id].freeze
+
+          def initialize(config)
+            @config = config
+          end
+
+          # @return [Boolean] are all the required values present?
+          def valid?
+            return false unless @config['account_json'].present? || @config['account_json_path'].present?
+
+            REQUIRED_KEYS.all? { |required| @config[required].present? }
+          end
+
+          def base64?(value)
+            value.is_a?(String) && Base64.strict_encode64(Base64.decode64(value)) == value
+          end
+
+          def account_json_string
+            return @account_json_string if @account_json_string
+            @account_json_string = if @config['account_json']
+                                     base64?(@config['account_json']) ? Base64.decode64(@config['account_json']) : @config['account_json']
+                                   else
+                                     File.read(@config['account_json_path'])
+                                   end
+          end
+
+          def account_info
+            @account_info ||= JSON.parse(account_json_string)
+          end
+
+          KEYS.each do |key|
+            # rubocop:disable Style/EvalWithLocation
+            class_eval %{ def #{key}; @config.fetch('#{key}'); end }
+            class_eval %{ def #{key}=(value); @config['#{key}'] = value; end }
+            # rubocop:enable Style/EvalWithLocation
+          end
+        end
+
+        def client
+          @client ||= ::Google::Analytics::Data::V1beta::AnalyticsData::Client.new do |conf|
+            conf.credentials = config.account_info
+          end
+        end
+
+        def property
+          "properties/#{config.property_id}"
+        end
+
+        # rubocop:disable Metrics/MethodLength
+        def to_date_range(period)
+          case period
+          when "day"
+            start_date = Time.zone.today
+            end_date = Time.zone.today
+          when "week"
+            start_date = Time.zone.today - 7.days
+            end_date = Time.zone.today
+          when "month"
+            start_date = Time.zone.today - 1.month
+            end_date = Time.zone.today
+          when "year"
+            start_date = Time.zone.today - 1.year
+            end_date = Time.zone.today
+          end
+
+          [start_date, end_date]
+        end
+        # rubocop:enable Metrics/MethodLength
+
+        def keyword_conversion(date)
+          case date
+          when "last12"
+            start_date = Time.zone.today - 11.months
+            end_date = Time.zone.today
+
+            [start_date, end_date]
+          else
+            date.split(",")
+          end
+        end
+
+        def date_period(period, date)
+          if period == "range"
+            date.split(",")
+          else
+            to_date_range(period)
+          end
+        end
+
+        # Configure analytics_start_date in ENV file
+        def default_date_range
+          "#{Hyrax.config.analytics_start_date},#{Time.zone.today + 1.day}"
+        end
+
+        # The number of events by day for an action
+        def daily_events(action, date = default_date_range)
+          date = date.split(",")
+          EventsDaily.summary(date[0], date[1], action)
+        end
+
+        # The number of events by day for an action and ID
+        def daily_events_for_id(id, action, date = default_date_range)
+          date = date.split(",")
+          EventsDaily.by_id(date[0], date[1], id, action)
+        end
+
+        # A list of events sorted by highest event count
+        def top_events(action, date = default_date_range)
+          date = date.split(",")
+          Events.list(date[0], date[1], action)
+        end
+
+        def unique_visitors(date = default_date_range); end
+
+        def unique_visitors_for_id(id, date = default_date_range); end
+
+        def new_visitors(period = 'month', date = default_date_range)
+          start_date, end_date = date_period(period, date)
+          Visits.new(start_date: start_date, end_date: end_date).new_visits
+        end
+
+        def new_visits_by_day(date = default_date_range, period = 'range')
+          start_date, end_date = date_period(period, date)
+          VisitsDaily.new(start_date: start_date, end_date: end_date).new_visits
+        end
+
+        def returning_visitors(period = 'month', date = default_date_range)
+          start_date, end_date = date_period(period, date)
+          Visits.new(start_date: start_date, end_date: end_date).return_visits
+        end
+
+        def returning_visits_by_day(date = default_date_range, period = 'range')
+          start_date, end_date = date_period(period, date)
+          VisitsDaily.new(start_date: start_date, end_date: end_date).return_visits
+        end
+
+        def total_visitors(period = 'month', date = default_date_range)
+          start_date, end_date = date_period(period, date)
+          Visits.new(start_date: start_date, end_date: end_date).total_visits
+        end
+
+        def page_statistics(start_date, object)
+          visits = VisitsDaily.new(start_date: start_date, end_date: Date.yesterday)
+          visits.add_filter(dimension: 'contentId', values: [object.id.to_s])
+          visits.total_visits
+        end
+      end
+      # rubocop:enable Metrics/BlockLength
+    end
+    # rubocop:enable Metrics/ModuleLength
+  end
+end
+# rubocop:enable Metrics/ModuleLength

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

@@ -55,7 +55,6 @@ module Hyrax
           # @return [Boolean] are all the required values present?
           def valid?
             return false unless @config['privkey_value'].present? || @config['privkey_path'].present?
-
             REQUIRED_KEYS.all? { |required| @config[required].present? }
           end
 
@@ -203,10 +202,25 @@ module Hyrax
           date = date_period(period, date)
           Visits.total_visits(profile, date[0], date[1])
         end
+
+        # Hyrax::Download is sent to Hyrax::Analytics.profile as #hyrax__download
+        # see Legato::ProfileMethods.method_name_from_klass
+        def page_statistics(start_date, object)
+          path = Rails.application.routes.url_helpers.polymorphic_path(object)
+          profile = Hyrax::Analytics.profile
+          unless profile
+            Hyrax.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)
+                 .for_path(path)
+        end
       end
       # rubocop:enable Metrics/BlockLength
     end
     # rubocop:enable Metrics/ModuleLength
   end
 end
-# rubocop:enable Metrics/ModuleLength

data/app/services/hyrax/analytics/matomo.rb

@@ -154,24 +154,37 @@ module Hyrax
           response["nb_visits_returning"].to_i + response["nb_visits_new"].to_i
         end
 
+        # TODO: implement
+        def page_statistics(_start_date, _object)
+          []
+        end
+
         def results_array(response, metric)
           results = []
           response.each do |result|
             if result[1].empty?
               results.push([result[0].to_date, 0])
             elsif result[1].is_a?(Array)
-              results.push([result[0].to_date, result[1].first[metric]])
+              results.push([result[0].to_date, result[1].first[metric].to_i])
             else
-              results.push([result[0].to_date, result[1][metric].presence || 0])
+              results.push([result[0].to_date, result[1][metric].presence.to_i])
             end
           end
           Hyrax::Analytics::Results.new(results)
         end
 
+        # If Matomo detects an error it will return a reponse with the key {"result":"error"}
+        # instead of returning an error status code. This method checks for that key.
+        def contains_matomo_error?(response)
+          response.is_a?(Hash) && response["result"] == "error"
+        end
+
         def get(params)
           response = Faraday.get(config.base_url, params)
           return [] if response.status != 200
-          JSON.parse(response.body)
+          api_response = JSON.parse(response.body)
+          return [] if contains_matomo_error?(api_response)
+          api_response
         end
 
         def api_params(method, period, date, additional_params = {})

data/app/services/hyrax/analytics/results.rb

@@ -74,6 +74,12 @@ module Hyrax
         fields = [:date, :pageviews]
         results.map { |row| fields.zip(row).to_h }
       end
+
+      def each
+        results.each do |result|
+          yield({ date: result[0], pageviews: result[1] })
+        end
+      end
     end
   end
 end

data/app/services/hyrax/custom_queries/find_access_control.rb

@@ -20,7 +20,7 @@ module Hyrax
           .find_inverse_references_by(resource: resource, property: :access_to)
           .find { |r| r.is_a?(Hyrax::AccessControl) } ||
           raise(Valkyrie::Persistence::ObjectNotFoundError)
-      rescue ArgumentError # some adapters raise ArgumentError for missing resources
+      rescue ArgumentError, Ldp::Gone, Ldp::NotFound # some adapters raise ArgumentError for missing resources
         raise(Valkyrie::Persistence::ObjectNotFoundError)
       end
     end