diff --git a/db/migrate/20211126085139_add_index_to_json_validation_event.rb b/db/migrate/20211126085139_add_index_to_json_validation_event.rb new file mode 100644 index 000000000..59a536768 --- /dev/null +++ b/db/migrate/20211126085139_add_index_to_json_validation_event.rb @@ -0,0 +1,5 @@ +class AddIndexToJsonValidationEvent < ActiveRecord::Migration[6.1] + def change + add_index :validation_events, :event_data, :using => :gin + end +end diff --git a/db/structure.sql b/db/structure.sql index b4981d4af..4d539a7a6 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -4630,6 +4630,13 @@ CREATE INDEX index_users_on_identity_code ON public.users USING btree (identity_ CREATE INDEX index_users_on_registrar_id ON public.users USING btree (registrar_id); +-- +-- Name: index_validation_events_on_event_data; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_validation_events_on_event_data ON public.validation_events USING gin (event_data); + + -- -- Name: index_validation_events_on_validation_eventable; Type: INDEX; Schema: public; Owner: - -- @@ -5381,6 +5388,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20211124071418'), ('20211124084308'), ('20211125181033'), -('20211125184334'); +('20211125184334'), +('20211126085139'); diff --git a/lib/tasks/verify_email.rake b/lib/tasks/verify_email.rake index 4200d0c6a..968607f9e 100644 --- a/lib/tasks/verify_email.rake +++ b/lib/tasks/verify_email.rake @@ -27,7 +27,7 @@ namespace :verify_email do VerifyEmailsJob.set(wait_until: spam_protect_timeout(options)).perform_later( contact: contact, check_level: check_level(options) - ) + ) if filter_check_level(contact) end end end @@ -65,31 +65,48 @@ def prepare_contacts(options) end end +def filter_check_level(contact) + if contact.validation_events.empty? + return true + end + + data = contact.validation_events.order(created_at: :asc).last + + return true if data.successful? && data.created_at < (Time.zone.now - ValidationEvent::VALIDATION_PERIOD) + + if data.failed? + return false if data.event_data['check_level'] == 'regex' + + return false if data.event_data['check_level'] == 'smtp' + + # возвращает нет, мх валидные теперь + return false if check_mx_contact_validation(contact) + + return true + end + + false +end + def failed_contacts failed_contacts = [] failed_validations_ids = ValidationEvent.failed.distinct.pluck(:validation_eventable_id) contacts = Contact.where(id: failed_validations_ids).includes(:validation_events) contacts.find_each(batch_size: 10_000) do |contact| - - data = contact.validation_events.order(created_at: :asc).last - - if data.failed? - next if data.event_data['check_level'] == 'regex' - - next if data.event_data['check_level'] == 'smtp' - - next if check_mx_contact_validation(contact) - - failed_contacts << contact.id - end + failed_contacts << contact.id if filter_check_level(contact) end failed_contacts.uniq end def check_mx_contact_validation(contact) + flag = false data = contact.validation_events.mx.order(created_at: :asc).last(ValidationEvent::MX_CHECK) - data.all? { |d| d.failed? } + if data.count >= ValidationEvent::MX_CHECK + flag = data.all? { |d| d.failed? } + end + + flag end def contacts_by_domain(domain_name)