Merge branch 'master' into 115693873-whodunnit_empty

app/controllers/admin/contact_versions_controller.rb

@@ -0,0 +1,56 @@
+class Admin::ContactVersionsController < AdminController
+  load_and_authorize_resource
+
+  def index
+    params[:q] ||= {}
+
+    @q = ContactVersion.search(params[:q])
+    @versions = @q.result.page(params[:page])
+    search_params = params[:q].deep_dup
+
+    whereS = "1=1"
+
+    search_params.each do |key, value|
+      next if value.empty?
+      case key
+        when 'event'
+          whereS += " AND event = '#{value}'"
+        else
+          whereS += create_where_string(key, value)
+      end
+    end
+
+    versions = ContactVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc)
+    @q = versions.search(params[:q])
+    @versions = @q.result.page(params[:page])
+    @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i > 0
+
+  end
+
+  def show
+    per_page = 7
+    @version  = ContactVersion.find(params[:id])
+    @versions = ContactVersion.where(item_id: @version.item_id).order(created_at: :desc, id: :desc)
+    @versions_map = @versions.all.map(&:id)
+
+    # what we do is calc amount of results until needed version
+    # then we cacl which page it is
+    if params[:page].blank?
+      counter = @versions_map.index(@version.id) + 1
+      page    = counter / per_page
+      page   += 1 if (counter % per_page) != 0
+      params[:page] = page
+    end
+
+    @versions = @versions.page(params[:page]).per(per_page)
+  end
+
+  def search
+    render json: ContactVersion.search_by_query(params[:q])
+  end
+
+  def create_where_string(key, value)
+    " AND object->>'#{key}' ~* '#{value}'"
+  end
+
+end

app/controllers/admin/contacts_controller.rb

@@ -10,22 +10,14 @@ class Admin::ContactsController < AdminController
       search_params[:registrant_domains_id_not_null] = 1
     end
 
-    @q = Contact.includes(:registrar).search(search_params)
-    @contacts = @q.result(distinct: :true).page(params[:page])
-
-    if params[:statuses_contains]
-      contacts = Contact.includes(:registrar).where(
-        "contacts.statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}"
-      )
-    else
-      contacts = Contact.includes(:registrar)
-    end
+    contacts = Contact.includes(:registrar).joins(:registrar).select('contacts.*, registrars.name')
+    contacts = contacts.filter_by_states(params[:statuses_contains].join(','))       if params[:statuses_contains]
     contacts = contacts.where("ident_country_code is null or ident_country_code=''") if params[:only_no_country_code].eql?('1')
 
 
     normalize_search_parameters do
       @q = contacts.search(search_params)
-      @contacts = @q.result(distinct: :true).page(params[:page])
+      @contacts = @q.result.uniq.page(params[:page])
     end
 
     @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i > 0

app/controllers/admin/domain_versions_controller.rb

@@ -1,18 +1,75 @@
 class Admin::DomainVersionsController < AdminController
   load_and_authorize_resource
 
-  # rubocop:disable Style/GuardClause
   def index
-    @domain = Domain.where(id: params[:domain_id]).includes({versions: :item}).first
-    @versions = @domain.versions
+    params[:q] ||= {}
+
+    @q = DomainVersion.includes(:item).search(params[:q])
+    @versions = @q.result.page(params[:page])
+    search_params = params[:q].deep_dup
+
+    if search_params[:registrant].present?
+      registrants = Contact.where("name ilike ?", "%#{search_params[:registrant].strip}%")
+      search_params.delete(:registrant)
+    end
+
+    if search_params[:registrar].present?
+      registrars = Registrar.where("name ilike ?", "%#{search_params[:registrar].strip}%")
+      search_params.delete(:registrar)
+    end
+
+    whereS = "1=1"
+
+    search_params.each do |key, value|
+      next if value.empty?
+      case key
+        when 'event'
+        whereS += " AND event = '#{value}'"
+        when 'name'
+        whereS += " AND (object->>'name' ~* '#{value}' OR object_changes->>'name' ~* '#{value}')"
+      else
+        whereS += create_where_string(key, value)
+      end
+    end
+
+    whereS += "  AND object->>'registrant_id' IN (#{registrants.map { |r| "'#{r.id.to_s}'" }.join ','})" if registrants.present?
+    whereS += "  AND 1=0"                                                                                if registrants == []
+    whereS += "  AND object->>'registrar_id' IN (#{registrars.map { |r| "'#{r.id.to_s}'" }.join ','})"   if registrars.present?
+    whereS += "  AND 1=0"                                                                                if registrars == []
+
+    versions = DomainVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc)
+    @q = versions.search(params[:q])
+    @versions = @q.result.page(params[:page])
+    @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i > 0
+    render "admin/domain_versions/archive"
 
-    # Depricated it had to load legal document. We may do it by parsing and adding link.
-    # if @domain.pending_json.present?
-    #   frame = Nokogiri::XML(@domain.pending_json['frame'])
-    #   @pending_user  = User.find(@domain.pending_json['current_user_id'])
-    #   @pending_domain = Epp::Domain.find(@domain.id)
-    #   @pending_domain.update(frame, @pending_user, false)
-    # end
   end
-  # rubocop:enable Style/GuardClause
+
+  def show
+    per_page = 7
+    @version  = DomainVersion.find(params[:id])
+    @versions = DomainVersion.where(item_id: @version.item_id).order(created_at: :desc, id: :desc)
+    @versions_map = @versions.all.map(&:id)
+
+    # what we do is calc amount of results until needed version
+    # then we cacl which page it is
+    if params[:page].blank?
+      counter = @versions_map.index(@version.id) + 1
+      page    = counter / per_page
+      page   += 1 if (counter % per_page) != 0
+      params[:page] = page
+    end
+
+    @versions = @versions.page(params[:page]).per(per_page)
+  end
+
+  def search
+    render json: DomainVersion.search_by_query(params[:q])
+  end
+
+  def create_where_string(key, value)
+    " AND object->>'#{key}' ~* '#{value}'"
+  end
+
+
 end

app/controllers/admin/domains_controller.rb

@@ -9,7 +9,7 @@ class Admin::DomainsController < AdminController
     params[:q] ||= {}
     if params[:statuses_contains]
       domains = Domain.includes(:registrar, :registrant).where(
-        "statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}"
+        "domains.statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}"
       )
     else
       domains = Domain.includes(:registrar, :registrant)
@@ -77,6 +77,11 @@ class Admin::DomainsController < AdminController
     redirect_to [:admin, @domain]
   end
 
+  def versions
+    @domain = Domain.where(id: params[:domain_id]).includes({versions: :item}).first
+    @versions = @domain.versions
+  end
+
   private
 
   def set_domain

app/controllers/admin/epp_logs_controller.rb

@@ -5,7 +5,11 @@ class Admin::EppLogsController < AdminController
   def index
     @q = ApiLog::EppLog.search(params[:q])
     @q.sorts = 'id desc' if @q.sorts.empty?
-    @epp_logs = @q.result.page(params[:page])
+
+    @epp_logs = @q.result
+    @epp_logs = @epp_logs.where("extract(epoch from created_at) >= extract(epoch from ?::timestamp)", Time.parse(params[:q][:created_at_gteq])) if params[:q][:created_at_gteq].present?
+    @epp_logs = @epp_logs.where("extract(epoch from created_at) <= extract(epoch from ?::timestamp)", Time.parse(params[:q][:created_at_lteq])) if params[:q][:created_at_lteq].present?
+    @epp_logs = @epp_logs.page(params[:page])
   end
 
   def show

app/controllers/admin/repp_logs_controller.rb

@@ -5,7 +5,11 @@ class Admin::ReppLogsController < AdminController
   def index
     @q = ApiLog::ReppLog.search(params[:q])
     @q.sorts = 'id desc' if @q.sorts.empty?
-    @repp_logs = @q.result.page(params[:page])
+
+    @repp_logs = @q.result
+    @repp_logs = @repp_logs.where("extract(epoch from created_at) >= extract(epoch from ?::timestamp)", Time.parse(params[:q][:created_at_gteq])) if params[:q][:created_at_gteq].present?
+    @repp_logs = @repp_logs.where("extract(epoch from created_at) <= extract(epoch from ?::timestamp)", Time.parse(params[:q][:created_at_lteq])) if params[:q][:created_at_lteq].present?
+    @repp_logs = @repp_logs.page(params[:page])
   end
 
   def show

app/controllers/admin/settings_controller.rb

@@ -51,6 +51,7 @@ class Admin::SettingsController < AdminController
       :admin_contacts_max_count,
       :tech_contacts_min_count,
       :tech_contacts_max_count,
+      :orphans_contacts_in_months,
       :ds_digest_type,
       :dnskeys_min_count,
       :dnskeys_max_count,