From 56e0b1909dc7bbca7e49a2a04082579b3873bb59 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Mon, 5 May 2025 14:20:25 +0300 Subject: [PATCH] Add company register deletion reason to force delete notes Update schedule_force_delete to include kandeliik_tekstina as a parameter Modify soft_delete_company to include kandeliik_tekstina parameter Append company registry deletion reason to force delete notes when available Pass nil to schedule_force_delete when company details response is empty --- .../domains/force_delete/set_status.rb | 2 +- app/jobs/company_register_status_job.rb | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/interactions/domains/force_delete/set_status.rb b/app/interactions/domains/force_delete/set_status.rb index 76947dfa2..1cace098e 100644 --- a/app/interactions/domains/force_delete/set_status.rb +++ b/app/interactions/domains/force_delete/set_status.rb @@ -4,7 +4,7 @@ module Domains def execute domain.force_delete_type = type type == :fast_track ? force_delete_fast_track : force_delete_soft - domain.status_notes[DomainStatus::FORCE_DELETE] = "Company no: #{domain.registrant.ident}" if reason == 'invalid_company' + domain.status_notes[DomainStatus::FORCE_DELETE] = "Company no: #{domain.registrant.ident} #{"+ #{notes}" if notes.present?}" if reason == 'invalid_company' domain.skip_whois_record_update = true domain.force_delete_domain_statuses_history_data = { reason: domain.status_notes[DomainStatus::FORCE_DELETE], diff --git a/app/jobs/company_register_status_job.rb b/app/jobs/company_register_status_job.rb index 36672d34f..90f706693 100644 --- a/app/jobs/company_register_status_job.rb +++ b/app/jobs/company_register_status_job.rb @@ -71,7 +71,7 @@ class CompanyRegisterStatusJob < ApplicationJob contact.update(company_register_status: status, checked_company_at: Time.zone.now) end - def schedule_force_delete(contact, company_status) + def schedule_force_delete(contact, company_status, kandeliik_tekstina) contact.registrant_domains.each do |domain| next if domain.force_delete_scheduled? @@ -80,7 +80,7 @@ class CompanyRegisterStatusJob < ApplicationJob notify_by_email: true, reason: 'invalid_company', email: contact.email, - notes: company_status_notes(company_status) + notes: company_status_notes(company_status) + "#{" + #{kandeliik_tekstina}" if kandeliik_tekstina.present?}" ) end end @@ -112,7 +112,7 @@ class CompanyRegisterStatusJob < ApplicationJob if company_details_response.empty? Rails.logger.info("Empty company details response for contact #{contact.id}") - schedule_force_delete(contact, company_status) + schedule_force_delete(contact, company_status, nil) return end @@ -121,9 +121,9 @@ class CompanyRegisterStatusJob < ApplicationJob Rails.logger.info("Kandeliik tekstina for contact #{contact.id}: #{kandeliik_tekstina}") if kandeliik_tekstina == PAYMENT_STATEMENT_BUSINESS_REGISTRY_REASON - soft_delete_company(contact, company_status) + soft_delete_company(contact, company_status, kandeliik_tekstina) else - schedule_force_delete(contact, company_status) + schedule_force_delete(contact, company_status, kandeliik_tekstina) end end @@ -133,7 +133,7 @@ class CompanyRegisterStatusJob < ApplicationJob company_details_response.first.kandeliik.last.last.kandeliik_tekstina end - def soft_delete_company(contact, company_status) + def soft_delete_company(contact, company_status, kandeliik_tekstina) contact.registrant_domains.reject { |domain| domain.force_delete_scheduled? }.each do |domain| next if domain.force_delete_scheduled? @@ -142,7 +142,8 @@ class CompanyRegisterStatusJob < ApplicationJob notify_by_email: true, reason: 'invalid_company', email: contact.email, - notes: company_status_notes(company_status)) + notes: company_status_notes(company_status) + "#{" + #{kandeliik_tekstina}" if kandeliik_tekstina.present?}" + ) end puts "Soft delete process initiated for company: #{contact.name} with ID: #{contact.id}"