From 89ddadc64ec3ff7f383ac46673dfe9693282e698 Mon Sep 17 00:00:00 2001
From: Martin Fenner <martin.fenner@datacite.org>
Date: Sun, 10 Mar 2019 23:21:49 +0100
Subject: [PATCH] correctly show all activities per doi. #216

---
 app/controllers/activities_controller.rb | 7 +------
 app/models/concerns/indexable.rb         | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 330c58bf2..fe676f0f7 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -1,7 +1,6 @@
 class ActivitiesController < ApplicationController
   include Countable
 
-  before_action :set_doi
   before_action :set_activity, only: [:show]
   before_action :set_include
 
@@ -20,7 +19,7 @@ def index
     elsif params[:ids].present?
       response = Activity.find_by_ids(params[:ids], page: page, sort: sort)
     else
-      response = Activity.query(params[:query], page: page, sort: sort)
+      response = Activity.query(params[:query], uid: params[:doi_id], page: page, sort: sort)
     end
 
     begin
@@ -78,10 +77,6 @@ def set_include
     end
   end
 
-  def set_doi
-    @doi = Doi.where(doi: params[:doi_id]).first
-  end
-
   def set_activity
     @activity = Activity.where(request_uuid: params[:id]).first
     fail ActiveRecord::RecordNotFound unless @activity.present?
diff --git a/app/models/concerns/indexable.rb b/app/models/concerns/indexable.rb
index 40ed21563..d404ecc23 100644
--- a/app/models/concerns/indexable.rb
+++ b/app/models/concerns/indexable.rb
@@ -137,6 +137,7 @@ def query(query, options={})
       must << { terms: { provider_id: options[:provider_id].split(",") }} if options[:provider_id].present?
       must << { terms: { client_id: options[:client_id].to_s.split(",") }} if options[:client_id].present?
       must << { term: { prefix: options[:prefix] }} if options[:prefix].present?
+      must << { term: { uid: options[:uid] }} if options[:uid].present?
       must << { term: { "author.id" => "https://orcid.org/#{options[:person_id]}" }} if options[:person_id].present?
       must << { range: { created: { gte: "#{options[:created].split(",").min}||/y", lte: "#{options[:created].split(",").max}||/y", format: "yyyy" }}} if options[:created].present?
       must << { term: { schema_version: "http://datacite.org/schema/kernel-#{options[:schema_version]}" }} if options[:schema_version].present?