mirror of
https://github.com/internetee/registry.git
synced 2025-07-27 21:16:12 +02:00
Removed date_from attribute
This commit is contained in:
Sergei Tsoganov
parent
0ca07a50fb
commit
7db8b5d970
5 changed files with 78 additions and 200 deletions
|
|
@ -9,7 +9,7 @@ module Repp
|
|||
param :end_date, String, required: true, desc: 'Period end date'
|
||||
end
|
||||
def market_share_distribution
|
||||
domains_by_rar = domains_by_registrar(@date_to, @date_from)
|
||||
domains_by_rar = domains_by_registrar(@date_to)
|
||||
result = serialize_distribution_result(domains_by_rar)
|
||||
render_success(data: result)
|
||||
end
|
||||
|
|
@ -22,8 +22,8 @@ module Repp
|
|||
param :compare_to_end_date, String, required: true, desc: 'Comparison date'
|
||||
end
|
||||
def market_share_growth_rate
|
||||
domains_by_rar = domains_by_registrar(@date_to, @date_from)
|
||||
prev_domains_by_rar = domains_by_registrar(@date_compare_to, @date_compare_from)
|
||||
domains_by_rar = domains_by_registrar(@date_to)
|
||||
prev_domains_by_rar = domains_by_registrar(@date_compare_to)
|
||||
|
||||
set_zero_values!(domains_by_rar, prev_domains_by_rar)
|
||||
|
||||
|
|
@ -50,9 +50,7 @@ module Repp
|
|||
|
||||
def set_date_params
|
||||
@date_to = to_date(search_params[:end_date]).end_of_month
|
||||
@date_from = to_date(search_params[:start_date] || '01.00')
|
||||
@date_compare_to = to_date(search_params[:compare_to_end_date]).end_of_month
|
||||
@date_compare_from = to_date(search_params[:compare_to_start_date] || '01.00')
|
||||
end
|
||||
|
||||
def to_date(date_param)
|
||||
|
|
@ -79,25 +77,25 @@ module Repp
|
|||
end
|
||||
end
|
||||
|
||||
def domains_by_registrar(date_to, date_from)
|
||||
# rubocop:disable Metrics/MethodLength
|
||||
def domains_by_registrar(date_to)
|
||||
sql = <<-SQL
|
||||
SELECT
|
||||
registrar_id,
|
||||
SUM(domain_count) AS total_domain_count
|
||||
FROM (
|
||||
-- Count domains from the domains table, excluding those in created_domains
|
||||
-- Query for current domains for each registrar
|
||||
SELECT
|
||||
registrar_id::text AS registrar_id,
|
||||
COUNT(*) AS domain_count
|
||||
FROM
|
||||
domains
|
||||
WHERE
|
||||
created_at >= :date_from
|
||||
GROUP BY
|
||||
registrar_id
|
||||
|
||||
UNION ALL
|
||||
|
||||
-- Query for 'create' events and count domains created by registrar
|
||||
SELECT
|
||||
(object_changes->'registrar_id'->>1)::text AS registrar_id,
|
||||
COUNT(*) * -1 AS domain_count
|
||||
|
|
@ -111,7 +109,7 @@ module Repp
|
|||
|
||||
UNION ALL
|
||||
|
||||
-- Query for 'update' events and count domains transferred to a new registrar only for domains in created_domains
|
||||
-- Query for 'update' events and count domains transferred to a new registrar
|
||||
SELECT
|
||||
(object_changes->'registrar_id'->>1)::text AS registrar_id,
|
||||
COUNT(*) * -1 AS domain_count
|
||||
|
|
@ -126,7 +124,7 @@ module Repp
|
|||
|
||||
UNION ALL
|
||||
|
||||
-- Query for 'update' events and count domains transferred from an old registrar only for domains in created_domains
|
||||
-- Query for 'update' events and count domains transferred from an old registrar
|
||||
SELECT
|
||||
(object_changes->'registrar_id'->>0)::text AS registrar_id,
|
||||
COUNT(*) AS domain_count
|
||||
|
|
@ -141,7 +139,7 @@ module Repp
|
|||
|
||||
UNION ALL
|
||||
|
||||
-- Query for 'destroy' events and count the number of domains destroyed associated with each registrar only for domains in created_domains
|
||||
-- Query for 'destroy' events and count the number of domains destroyed associated with each registrar
|
||||
SELECT
|
||||
(object_changes->'registrar_id'->>0)::text AS registrar_id,
|
||||
COUNT(*) AS domain_count
|
||||
|
|
@ -158,181 +156,13 @@ module Repp
|
|||
registrar_id;
|
||||
SQL
|
||||
|
||||
results = ActiveRecord::Base.connection.execute(
|
||||
ActiveRecord::Base.send(:sanitize_sql_array, [sql, date_from: date_from, date_to: date_to])
|
||||
ActiveRecord::Base.connection.execute(
|
||||
ActiveRecord::Base.send(:sanitize_sql_array, [sql, date_to: date_to])
|
||||
).each_with_object({}) do |row, hash|
|
||||
hash[row['registrar_id']] = row['total_domain_count'].to_i
|
||||
end
|
||||
|
||||
results
|
||||
end
|
||||
|
||||
# def domains_by_registrar(date_to, date_from)
|
||||
# p 'Count the number of domains created by each registrar'
|
||||
# sql = <<-SQL
|
||||
# WITH created_domains AS (
|
||||
# SELECT
|
||||
# (object_changes->'registrar_id'->>1)::text AS registrar_id,
|
||||
# (object_changes->'name'->>1)::text AS domain_name
|
||||
# FROM
|
||||
# log_domains
|
||||
# WHERE
|
||||
# event = 'create'
|
||||
# AND created_at BETWEEN :date_from AND :date_to
|
||||
# )
|
||||
# SELECT
|
||||
# registrar_id,
|
||||
# SUM(domain_count) AS total_domain_count
|
||||
# FROM (
|
||||
# -- Count domains from created_domains
|
||||
# SELECT
|
||||
# registrar_id,
|
||||
# COUNT(*) AS domain_count
|
||||
# FROM
|
||||
# created_domains
|
||||
# GROUP BY
|
||||
# registrar_id
|
||||
|
||||
# UNION ALL
|
||||
|
||||
# -- Query for 'update' events and count domains transferred to a new registrar only for domains in created_domains
|
||||
# SELECT
|
||||
# (object_changes->'registrar_id'->>1)::text AS registrar_id,
|
||||
# COUNT(*) AS domain_count
|
||||
# FROM
|
||||
# log_domains
|
||||
# WHERE
|
||||
# event = 'update'
|
||||
# AND object_changes->'registrar_id' IS NOT NULL
|
||||
# AND (object->'name')::text IN (SELECT domain_name FROM created_domains)
|
||||
# AND created_at BETWEEN :date_from AND :date_to
|
||||
# GROUP BY
|
||||
# registrar_id
|
||||
|
||||
# UNION ALL
|
||||
|
||||
# -- Query for 'update' events and count domains transferred from an old registrar only for domains in created_domains
|
||||
# SELECT
|
||||
# (object_changes->'registrar_id'->>0)::text AS registrar_id,
|
||||
# COUNT(*) * -1 AS domain_count
|
||||
# FROM
|
||||
# log_domains
|
||||
# WHERE
|
||||
# event = 'update'
|
||||
# AND object_changes->'registrar_id' IS NOT NULL
|
||||
# AND (object->'name')::text IN (SELECT domain_name FROM created_domains)
|
||||
# AND created_at BETWEEN :date_from AND :date_to
|
||||
# GROUP BY
|
||||
# registrar_id
|
||||
|
||||
# UNION ALL
|
||||
|
||||
# -- Query for 'destroy' events and count the number of domains destroyed associated with each registrar only for domains in created_domains
|
||||
# SELECT
|
||||
# (object_changes->'registrar_id'->>0)::text AS registrar_id,
|
||||
# COUNT(*) * -1 AS domain_count
|
||||
# FROM
|
||||
# log_domains
|
||||
# WHERE
|
||||
# event = 'destroy'
|
||||
# AND (object_changes->'name'->>0)::text IN (SELECT domain_name FROM created_domains)
|
||||
# AND created_at BETWEEN :date_from AND :date_to
|
||||
# GROUP BY
|
||||
# registrar_id
|
||||
|
||||
# UNION ALL
|
||||
|
||||
# -- Count domains from the domains table, excluding those in created_domains
|
||||
# SELECT
|
||||
# registrar_id::text AS registrar_id,
|
||||
# COUNT(*) AS domain_count
|
||||
# FROM
|
||||
# domains
|
||||
# WHERE
|
||||
# name NOT IN (SELECT domain_name FROM created_domains)
|
||||
# AND created_at BETWEEN :date_from AND :date_to
|
||||
# GROUP BY
|
||||
# registrar_id
|
||||
|
||||
# ) AS combined
|
||||
# GROUP BY
|
||||
# registrar_id;
|
||||
# SQL
|
||||
|
||||
# results = ActiveRecord::Base.connection.execute(
|
||||
# ActiveRecord::Base.send(:sanitize_sql_array, [sql, date_from: date_from, date_to: date_to])
|
||||
# ).each_with_object({}) do |row, hash|
|
||||
# hash[row['registrar_id']] = row['total_domain_count'].to_i
|
||||
# end
|
||||
|
||||
# p results
|
||||
# end
|
||||
|
||||
# def domains_by_registrar(date_to, date_from)
|
||||
# log_domains_del = log_domains(event: 'destroy', date_to: date_to, date_from: date_from)
|
||||
# log_domains_trans = log_domains(event: 'update', date_to: date_to, date_from: date_from)
|
||||
# logged_domains = log_domains_trans.map { |ld| ld.object['name'] } +
|
||||
# log_domains_del.map { |ld| ld.object['name'] }
|
||||
# domains_grouped = ::Domain.where('created_at <= ? AND created_at >= ?', date_to, date_from)
|
||||
# .where.not(name: logged_domains.uniq)
|
||||
# .group(:registrar_id).count.stringify_keys
|
||||
|
||||
# summarize([group(log_domains_del), group(log_domains_trans), domains_grouped])
|
||||
# end
|
||||
|
||||
# def domains_by_registrar(date_to, date_from)
|
||||
# domain_versions = ::Version::DomainVersion.where('object_changes IS NOT NULL')
|
||||
# .where('created_at >= ? AND created_at <= ?', date_from, date_to)
|
||||
# .select(:event, :object, :object_changes)
|
||||
# registrar_counts = Hash.new(0)
|
||||
# processed_domains = []
|
||||
# Rails.logger.info "Processing total #{domain_versions.size} log_domain records"
|
||||
# domain_versions.each do |v|
|
||||
# registrar_ids = v.object_changes['registrar_id']
|
||||
# next if registrar_ids.nil? || registrar_ids.empty?
|
||||
|
||||
# case v.event
|
||||
# when 'create'
|
||||
# processed_domains << v.object_changes['name'][1]
|
||||
# registrar_counts[registrar_ids[1].to_s] += 1
|
||||
# when 'update'
|
||||
# if processed_domains.include?(v.object['name'])
|
||||
# registrar_counts[registrar_ids[0].to_s] -= 1
|
||||
# registrar_counts[registrar_ids[1].to_s] += 1
|
||||
# else
|
||||
# registrar_counts[registrar_ids[1].to_s] += 1
|
||||
# processed_domains << v.object['name']
|
||||
# end
|
||||
# when 'destroy'
|
||||
# registrar_counts[registrar_ids[0].to_s] -= 1
|
||||
# end
|
||||
# end
|
||||
|
||||
# current_domains_grouped = ::Domain.where('created_at <= ? AND created_at >= ?', date_to, date_from)
|
||||
# .where.not(name: processed_domains.uniq)
|
||||
# .group(:registrar_id).count.stringify_keys
|
||||
|
||||
# summarize([registrar_counts, current_domains_grouped])
|
||||
# end
|
||||
|
||||
def summarize(arr)
|
||||
arr.inject { |memo, el| memo.merge(el) { |_, old_v, new_v| old_v + new_v } }
|
||||
end
|
||||
|
||||
def log_domains(event:, date_to:, date_from:)
|
||||
domain_version = ::Version::DomainVersion.where(event: event)
|
||||
domain_version.where!("object_changes ->> 'registrar_id' IS NOT NULL") if event == 'update'
|
||||
domain_version.where('created_at > ?', date_to)
|
||||
.where("object ->> 'created_at' <= ?", date_to)
|
||||
.where("object ->> 'created_at' >= ?", date_from)
|
||||
.select("DISTINCT ON (object ->> 'name') object, created_at")
|
||||
.order(Arel.sql("object ->> 'name', created_at desc"))
|
||||
end
|
||||
|
||||
def group(domains)
|
||||
domains.group_by { |ld| ld.object['registrar_id'].to_s }
|
||||
.transform_values(&:count)
|
||||
end
|
||||
# rubocop:enable Metrics/MethodLength
|
||||
|
||||
def registrar_names
|
||||
@registrar_names ||= ::Registrar.where(test_registrar: false)
|
||||
|
|
@ -346,7 +176,10 @@ module Repp
|
|||
|
||||
name = registrar_names[key]
|
||||
hash = { name: name, y: value }
|
||||
hash.merge!({ sliced: true, selected: true }) if current_user.registrar.name == name
|
||||
if current_user.registrar.name == name
|
||||
hash[:sliced] = true
|
||||
hash[:selected] = true
|
||||
end
|
||||
hash
|
||||
end.compact
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue