Skip to content

Commit

Permalink
added aggreagtions for views and downlaods
Browse files Browse the repository at this point in the history
  • Loading branch information
@kjgarza
kjgarza committed Aug 1, 2019
1 parent 883ee78 commit 1ee110d
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 11 deletions.
21 changes: 13 additions & 8 deletions app/controllers/events_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,19 +115,21 @@ def index
total_pages = page[:size] > 0 ? (total_for_pages / page[:size]).ceil : 0


aggregations = params.fetch(:aggregations,"").nil? ? "" : params.fetch(:aggregations,"")
aggregations = params.fetch(:aggregations,"") || ""

sources = total.positive? && aggregations.blank? || aggregations.include?("query_aggregations") ? facet_by_source(response.response.aggregations.sources.buckets) : nil
prefixes = total.positive? && aggregations.blank? || aggregations.include?("query_aggregations") ? facet_by_source(response.response.aggregations.prefixes.buckets) : nil
citation_types = total.positive? && aggregations.blank? || aggregations.include?("query_aggregations") ? facet_by_citation_type(response.response.aggregations.citation_types.buckets) : nil
relation_types = total.positive? && aggregations.blank? || aggregations.include?("query_aggregations") ? facet_by_relation_type(response.response.aggregations.relation_types.buckets) : nil
registrants = total.positive? && aggregations.include?("query_aggregations") ? facet_by_registrants(response.response.aggregations.registrants.buckets) : nil
pairings = total.positive? && aggregations.include?("query_aggregations") ? facet_by_pairings(response.response.aggregations.pairings.buckets) : nil
dois = total.positive? && aggregations.include?("query_aggregations") ? facet_by_dois(response.response.aggregations.dois.buckets) : nil
dois_usage = total.positive? && aggregations.include?("query_aggregations") ? facet_by_dois(response.response.aggregations.dois_usage.dois.buckets) : nil
citations_histogram = total.positive? && aggregations.include?("query_aggregations") ? facet_citations_by_year(response.response.aggregations.dois_citations) : nil
registrants = total.positive? && aggregations.blank? || aggregations.include?("query_aggregations") ? facet_by_registrants(response.response.aggregations.registrants.buckets) : nil
pairings = total.positive? && aggregations.blank? || aggregations.include?("query_aggregations") ? facet_by_pairings(response.response.aggregations.pairings.buckets) : nil
dois = total.positive? && aggregations.blank? || aggregations.include?("query_aggregations") ? facet_by_dois(response.response.aggregations.dois.buckets) : nil
dois_usage = total.positive? && aggregations.blank? || aggregations.include?("query_aggregations") ? facet_by_dois(response.response.aggregations.dois_usage.dois.buckets) : nil
dois_citations = total.positive? && aggregations.blank? || aggregations.include?("query_aggregations") ? facet_citations_by_year(response.response.aggregations.dois_citations) : nil
citations_histogram = total.positive? && aggregations.include?("metrics_aggregations") ? facet_citations_by_year(response.response.aggregations.citations_histogram) : nil
citations = total.positive? && aggregations.include?("metrics_aggregations") ? facet_citations_by_dois(response.response.aggregations.citations.dois.buckets) : nil
views_histogram = total.positive? && aggregations.include?("metrics_aggregations") ? facet_citations_by_year(response.response.aggregations.views) : nil
downloads_histogram = total.positive? && aggregations.include?("metrics_aggregations") ? facet_citations_by_year(response.response.aggregations.downloads) : nil

results = response.results

Expand All @@ -144,8 +146,11 @@ def index
registrants: registrants,
"doisRelationTypes": dois,
"doisUsageTypes": dois_usage,
"doisCitations": citations_histogram,
"uniqueCitations": citations
"doisCitations": dois_citations,
"citationsHistogram": citations_histogram,
"citations": citations,
"viewsHistogram": views_histogram,
"downloadsHistogram": downloads_histogram
}.compact

options[:links] = {
Expand Down
63 changes: 61 additions & 2 deletions app/models/event.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,17 @@ class Event < ActiveRecord::Base
"describes", "is-described-by"
]

VIEWS_RELATION_TYPES = [
"unique-dataset-investigations-regular",
"total-dataset-investigations-regular"
]


DOWNLOADS_RELATION_TYPES = [
"unique-dataset-requests-regular",
"total-dataset-requests-regular"
]

validates :subj_id, :source_id, :source_token, presence: true

attr_accessor :container_title, :url
Expand Down Expand Up @@ -207,7 +218,7 @@ def self.query_aggregations
script: "#{INCLUDED_RELATION_TYPES}.contains(doc['relation_type_id'].value)"
}
},
aggs: { years: { date_histogram: { field: 'citation_year', interval: 'year', min_doc_count: 1 }, aggs: { "total_by_year" => { sum: { field: 'total' }}}},"sum_distribution"=>sum_year_distribution}
aggs: { years: { date_histogram: { field: 'occurred_at', interval: 'year', min_doc_count: 1 }, aggs: { "total_by_year" => { sum: { field: 'total' }}}},"sum_distribution"=>sum_year_distribution}
}
}
end
Expand Down Expand Up @@ -238,7 +249,55 @@ def self.metrics_aggregations
aggs: { dois: {
terms: { field: 'obj_id', size: 50, min_doc_count: 1 }, aggs: { unique_citations: { cardinality: { field: 'citation_id' }}}
}}
}
},
views: {
filter: {
script: {
script: "#{VIEWS_RELATION_TYPES}.contains(doc['relation_type_id'].value) && doc['source_id'].value == 'datacite-usage' && doc['occurred_at'].value.getMillis() >= doc['obj.datePublished'].value.getMillis() && doc['occurred_at'].value.getMillis() < new Date().getTime()" ,
}
},
aggs: {
dois: {
terms: {
field: 'obj_id',
size: 50,
min_doc_count: 1
},
aggs: {
"total_by_type" => {
sum: {
field: 'total'
}
}
}
},
years: { date_histogram: { field: 'occurred_at', interval: 'year', min_doc_count: 1 }, aggs: { "total_by_year" => { sum: { field: 'total' } } } }, "sum_distribution" => sum_year_distribution
}
},
downloads: {
filter: {
script: {
script: "#{DOWNLOADS_RELATION_TYPES}.contains(doc['relation_type_id'].value) && doc['source_id'].value == 'datacite-usage' && doc['occurred_at'].value.getMillis() >= doc['obj.datePublished'].value.getMillis() && doc['occurred_at'].value.getMillis() < new Date().getTime()" ,
}
},
aggs: {
dois: {
terms: {
field: 'obj_id',
size: 50,
min_doc_count: 1
},
aggs: {
"total_by_type" => {
sum: {
field: 'total'
}
}
}
},
years: { date_histogram: { field: 'occurred_at', interval: 'year', min_doc_count: 1 }, aggs: { "total_by_year" => { sum: { field: 'total' } } } }, "sum_distribution" => sum_year_distribution
}
}
}
end

Expand Down
2 changes: 1 addition & 1 deletion spec/models/event_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
end

it "has citation_year" do
expect(subject.citation_year).to eq(2006)
expect(subject.citation_year).to eq(2015)
end

it "has published_dates" do
Expand Down

0 comments on commit 1ee110d

Please sign in to comment.