From 94259c55d8fd0fb2dfeb8af92debe50a12b02d57 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Thu, 11 Jun 2015 10:39:13 +0300 Subject: [PATCH 1/3] Update schema file --- db/schema.rb | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 2f0849424..b5277609e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150609103333) do +ActiveRecord::Schema.define(version: 20150610112238) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -19,7 +19,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do create_table "account_activities", force: :cascade do |t| t.integer "account_id" t.integer "invoice_id" - t.decimal "sum", precision: 8, scale: 2 + t.decimal "sum", precision: 10, scale: 2 t.string "currency" t.integer "bank_transaction_id" t.datetime "created_at" @@ -36,7 +36,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do create_table "accounts", force: :cascade do |t| t.integer "registrar_id" t.string "account_type" - t.decimal "balance", precision: 8, scale: 2, default: 0.0, null: false + t.decimal "balance", precision: 10, scale: 2, default: 0.0, null: false t.datetime "created_at" t.datetime "updated_at" t.string "currency" @@ -98,7 +98,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do t.string "buyer_name" t.string "document_no" t.string "description" - t.decimal "sum", precision: 8, scale: 2 + t.decimal "sum", precision: 10, scale: 2 t.string "reference_no" t.datetime "paid_at" t.datetime "created_at" @@ -114,7 +114,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do t.string "vk_rec_id" t.string "vk_stamp" t.string "vk_t_no" - t.decimal "vk_amount", precision: 8, scale: 2 + t.decimal "vk_amount", precision: 10, scale: 2 t.string "vk_curr" t.string "vk_rec_acc" t.string "vk_rec_name" @@ -328,10 +328,10 @@ ActiveRecord::Schema.define(version: 20150609103333) do create_table "invoice_items", force: :cascade do |t| t.integer "invoice_id" - t.string "description", null: false + t.string "description", null: false t.string "unit" t.integer "amount" - t.decimal "price", precision: 8, scale: 2 + t.decimal "price", precision: 10, scale: 2 t.datetime "created_at" t.datetime "updated_at" t.string "creator_str" @@ -341,20 +341,20 @@ ActiveRecord::Schema.define(version: 20150609103333) do add_index "invoice_items", ["invoice_id"], name: "index_invoice_items_on_invoice_id", using: :btree create_table "invoices", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "invoice_type", null: false - t.datetime "due_date", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "invoice_type", null: false + t.datetime "due_date", null: false t.string "payment_term" - t.string "currency", null: false + t.string "currency", null: false t.string "description" t.string "reference_no" - t.decimal "vat_prc", precision: 8, scale: 2, null: false + t.decimal "vat_prc", precision: 10, scale: 2, null: false t.datetime "paid_at" t.integer "seller_id" - t.string "seller_name", null: false + t.string "seller_name", null: false t.string "seller_reg_no" - t.string "seller_iban", null: false + t.string "seller_iban", null: false t.string "seller_bank" t.string "seller_swift" t.string "seller_vat_no" @@ -368,7 +368,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do t.string "seller_email" t.string "seller_contact_name" t.integer "buyer_id" - t.string "buyer_name", null: false + t.string "buyer_name", null: false t.string "buyer_reg_no" t.string "buyer_country_code" t.string "buyer_state" @@ -382,7 +382,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do t.string "updator_str" t.integer "number" t.datetime "cancelled_at" - t.decimal "sum_cache", precision: 8, scale: 2 + t.decimal "sum_cache", precision: 10, scale: 2 end add_index "invoices", ["buyer_id"], name: "index_invoices_on_buyer_id", using: :btree @@ -983,7 +983,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do t.text "crt" t.string "type" t.string "registrant_ident" - t.string "encrypted_password", default: "", null: false + t.string "encrypted_password", default: "" t.datetime "remember_created_at" t.integer "failed_attempts", default: 0, null: false t.datetime "locked_at" From 41f3bf30788e46d1a424ece822e0bfbbf312a5b7 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Thu, 11 Jun 2015 10:53:47 +0300 Subject: [PATCH 2/3] rubocop syntax update --- app/mailers/contact_mailer.rb | 2 ++ app/models/depp/contact.rb | 2 +- app/models/domain.rb | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/mailers/contact_mailer.rb b/app/mailers/contact_mailer.rb index cf8c03d38..8b443d279 100644 --- a/app/mailers/contact_mailer.rb +++ b/app/mailers/contact_mailer.rb @@ -1,4 +1,5 @@ class ContactMailer < ApplicationMailer + # rubocop: disable Metrics/CyclomaticComplexity def email_updated(contact) unless Rails.env.production? return unless TEST_EMAILS.include?(contact.email) || TEST_EMAILS.include?(contact.email_was) @@ -18,4 +19,5 @@ class ContactMailer < ApplicationMailer mail(to: email, subject: "#{I18n.t(:contact_email_update_subject)} [#{@contact.code}]") end end + # rubocop: enable Metrics/CyclomaticComplexity end diff --git a/app/models/depp/contact.rb b/app/models/depp/contact.rb index 063fa0f1f..be0429c2f 100644 --- a/app/models/depp/contact.rb +++ b/app/models/depp/contact.rb @@ -230,7 +230,7 @@ module Depp def extension_xml xml = { _anonymus: [] } - ident = ident_xml[:_anonymus].try(:first) if !persisted? + ident = ident_xml[:_anonymus].try(:first) unless persisted? legal = legal_document_xml[:_anonymus].try(:first) xml[:_anonymus] << ident if ident.present? xml[:_anonymus] << legal if legal.present? diff --git a/app/models/domain.rb b/app/models/domain.rb index e650b118d..61ad23d43 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -1,3 +1,4 @@ +# rubocop: disable Metrics/ClassLength class Domain < ActiveRecord::Base include Versions # version/domain_version.rb has_paper_trail class_name: "DomainVersion", meta: { children: :children_log } @@ -426,7 +427,7 @@ class Domain < ActiveRecord::Base domain_statuses.where(value: DomainStatus::CLIENT_DELETE_PROHIBITED).destroy_all domain_statuses.where(value: DomainStatus::SERVER_DELETE_PROHIBITED).destroy_all domain_statuses.reload - self.force_delete_at = Time.zone.now + Setting.redemption_grace_period.days unless self.force_delete_at + self.force_delete_at = Time.zone.now + Setting.redemption_grace_period.days unless force_delete_at save(validate: false) end @@ -479,3 +480,4 @@ class Domain < ActiveRecord::Base whois_record.blank? ? create_whois_record : whois_record.save end end +# rubocop: enable Metrics/ClassLength From c9714aaa5d4adcfcbfe2932526e48be8c8aa3bdd Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Thu, 11 Jun 2015 10:57:57 +0300 Subject: [PATCH 3/3] Update schema file --- db/schema.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index c4e21b748..4dd3a3743 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,8 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150610112238) do +ActiveRecord::Schema.define(version: 20150609103333) do + # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -305,7 +306,6 @@ ActiveRecord::Schema.define(version: 20150610112238) do t.datetime "registrant_verification_asked_at" t.string "registrant_verification_token" t.json "pending_json" - t.datetime "force_delete_at" end add_index "domains", ["delete_at"], name: "index_domains_on_delete_at", using: :btree