diff --git a/.rubocop.yml b/.rubocop.yml index ba9acf010..e28a5b39b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -116,3 +116,7 @@ Style/FirstParameterIndentation: # old school regex // works fine Style/RegexpLiteral: Enabled: false + +# annoying to maintain, small thing, no real problem +Style/SpaceInsideHashLiteralBraces: + Enabled: false diff --git a/config/deploy.rb b/config/deploy.rb index ddb993b17..05eb64ab4 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -16,6 +16,7 @@ set :deploy_to, '$HOME/registry' set :repository, 'https://github.com/domify/registry' # dev repo set :branch, 'master' set :rails_env, 'alpha' +set :que_restart, true # alpha branch, only use for heavy debugging task :epp do @@ -24,6 +25,7 @@ task :epp do set :repository, 'https://github.com/domify/registry' # dev repo set :branch, 'master' set :rails_env, 'alpha' + set :que_restart, false end # alpha branch, only use for heavy debugging @@ -33,6 +35,7 @@ task :registrar do set :repository, 'https://github.com/domify/registry' # dev repo set :branch, 'master' set :rails_env, 'alpha' + set :que_restart, false end # alpha branch, only use for heavy debugging @@ -42,6 +45,7 @@ task :registrant do set :repository, 'https://github.com/domify/registry' # dev repo set :branch, 'master' set :rails_env, 'alpha' + set :que_restart, false end # staging @@ -51,6 +55,7 @@ task :st do set :repository, 'https://github.com/internetee/registry' # production repo set :branch, 'staging' set :rails_env, 'staging' + set :que_restart, true end # staging @@ -60,6 +65,7 @@ task :eppst do set :repository, 'https://github.com/internetee/registry' # production repo set :branch, 'staging' set :rails_env, 'staging' + set :que_restart, false end # staging @@ -69,6 +75,7 @@ task :registrarst do set :repository, 'https://github.com/internetee/registry' # production repo set :branch, 'staging' set :rails_env, 'staging' + set :que_restart, false end # staging @@ -78,6 +85,7 @@ task :registrantst do set :repository, 'https://github.com/internetee/registry' # production repo set :branch, 'staging' set :rails_env, 'staging' + set :que_restart, false end # production @@ -87,6 +95,7 @@ task :pr do set :repository, 'https://github.com/internetee/registry' # production repo set :branch, 'master' set :rails_env, 'production' + set :que_restart, true end # production @@ -96,6 +105,7 @@ task :epppr do set :repository, 'https://github.com/internetee/registry' # production repo set :branch, 'master' set :rails_env, 'production' + set :que_restart, false end # production @@ -105,6 +115,7 @@ task :registrarpr do set :repository, 'https://github.com/internetee/registry' # production repo set :branch, 'master' set :rails_env, 'production' + set :que_restart, false end # production @@ -114,6 +125,7 @@ task :registrantpr do set :repository, 'https://github.com/internetee/registry' # production repo set :branch, 'master' set :rails_env, 'production' + set :que_restart, false end # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server. @@ -193,6 +205,7 @@ task deploy: :environment do to :launch do invoke :restart invoke :'deploy:cleanup' + queue! "QUE_WORKER_COUNT=1 #{rake} daemon:que:restart" if que_restart end end end diff --git a/db/schema-read-only.rb b/db/schema-read-only.rb index 74097a123..768be3160 100644 --- a/db/schema-read-only.rb +++ b/db/schema-read-only.rb @@ -19,7 +19,7 @@ ActiveRecord::Schema.define(version: 20150706091724) 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" @@ -37,7 +37,7 @@ ActiveRecord::Schema.define(version: 20150706091724) 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" @@ -99,7 +99,7 @@ ActiveRecord::Schema.define(version: 20150706091724) 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" @@ -115,7 +115,7 @@ ActiveRecord::Schema.define(version: 20150706091724) 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" @@ -212,12 +212,6 @@ ActiveRecord::Schema.define(version: 20150706091724) do t.string "updator_str" end - create_table "data_migrations", id: false, force: :cascade do |t| - t.string "version", null: false - end - - add_index "data_migrations", ["version"], name: "unique_data_migrations", unique: true, using: :btree - create_table "delegation_signers", force: :cascade do |t| t.integer "domain_id" t.string "key_tag" @@ -345,10 +339,10 @@ ActiveRecord::Schema.define(version: 20150706091724) 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" @@ -358,20 +352,20 @@ ActiveRecord::Schema.define(version: 20150706091724) 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" @@ -385,7 +379,7 @@ ActiveRecord::Schema.define(version: 20150706091724) 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" @@ -399,7 +393,7 @@ ActiveRecord::Schema.define(version: 20150706091724) 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 @@ -1026,7 +1020,7 @@ ActiveRecord::Schema.define(version: 20150706091724) 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" diff --git a/db/structure.sql b/db/structure.sql index 64275585f..7b0a41ae6 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -41,7 +41,7 @@ CREATE FUNCTION generate_zonefile(i_origin character varying) RETURNS text ret text; BEGIN -- define filters - include_filter = '%.' || i_origin; + include_filter = '%' || i_origin; -- for %.%.% IF i_origin ~ '\.' THEN @@ -198,7 +198,7 @@ CREATE TABLE account_activities ( id integer NOT NULL, account_id integer, invoice_id integer, - sum numeric(8,2), + sum numeric(10,2), currency character varying, bank_transaction_id integer, created_at timestamp without time zone, @@ -237,7 +237,7 @@ CREATE TABLE accounts ( id integer NOT NULL, registrar_id integer, account_type character varying, - balance numeric(8,2) DEFAULT 0.0 NOT NULL, + balance numeric(10,2) DEFAULT 0 NOT NULL, created_at timestamp without time zone, updated_at timestamp without time zone, currency character varying, @@ -395,7 +395,7 @@ CREATE TABLE bank_transactions ( buyer_name character varying, document_no character varying, description character varying, - sum numeric(8,2), + sum numeric(10,2), reference_no character varying, paid_at timestamp without time zone, created_at timestamp without time zone, @@ -436,7 +436,7 @@ CREATE TABLE banklink_transactions ( vk_rec_id character varying, vk_stamp character varying, vk_t_no character varying, - vk_amount numeric(8,2), + vk_amount numeric(10,2), vk_curr character varying, vk_rec_acc character varying, vk_rec_name character varying, @@ -673,15 +673,6 @@ CREATE SEQUENCE countries_id_seq ALTER SEQUENCE countries_id_seq OWNED BY countries.id; --- --- Name: data_migrations; Type: TABLE; Schema: public; Owner: -; Tablespace: --- - -CREATE TABLE data_migrations ( - version character varying NOT NULL -); - - -- -- Name: delegation_signers; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -994,7 +985,7 @@ CREATE TABLE invoice_items ( description character varying NOT NULL, unit character varying, amount integer, - price numeric(8,2), + price numeric(10,2), created_at timestamp without time zone, updated_at timestamp without time zone, creator_str character varying, @@ -1035,7 +1026,7 @@ CREATE TABLE invoices ( currency character varying NOT NULL, description character varying, reference_no character varying, - vat_prc numeric(8,2) NOT NULL, + vat_prc numeric(10,2) NOT NULL, paid_at timestamp without time zone, seller_id integer, seller_name character varying NOT NULL, @@ -1068,7 +1059,7 @@ CREATE TABLE invoices ( updator_str character varying, number integer, cancelled_at timestamp without time zone, - sum_cache numeric(8,2) + sum_cache numeric(10,2) ); @@ -2367,7 +2358,7 @@ CREATE TABLE pricelists ( id integer NOT NULL, "desc" character varying, category character varying, - price_cents numeric(10,2) DEFAULT 0.0 NOT NULL, + price_cents numeric(10,2) DEFAULT 0 NOT NULL, price_currency character varying DEFAULT 'EUR'::character varying NOT NULL, valid_from timestamp without time zone, valid_to timestamp without time zone, @@ -2605,7 +2596,7 @@ CREATE TABLE users ( crt text, type character varying, registrant_ident character varying, - encrypted_password character varying DEFAULT ''::character varying NOT NULL, + encrypted_password character varying DEFAULT ''::character varying, remember_created_at timestamp without time zone, failed_attempts integer DEFAULT 0 NOT NULL, locked_at timestamp without time zone @@ -4461,13 +4452,6 @@ CREATE INDEX index_whois_records_on_domain_id ON whois_records USING btree (doma CREATE INDEX index_whois_records_on_registrar_id ON whois_records USING btree (registrar_id); --- --- Name: unique_data_migrations; Type: INDEX; Schema: public; Owner: -; Tablespace: --- - -CREATE UNIQUE INDEX unique_data_migrations ON data_migrations USING btree (version); - - -- -- Name: unique_schema_migrations; Type: INDEX; Schema: public; Owner: -; Tablespace: -- @@ -4683,6 +4667,8 @@ INSERT INTO schema_migrations (version) VALUES ('20150227092508'); INSERT INTO schema_migrations (version) VALUES ('20150227113121'); +INSERT INTO schema_migrations (version) VALUES ('20150302130224'); + INSERT INTO schema_migrations (version) VALUES ('20150302161712'); INSERT INTO schema_migrations (version) VALUES ('20150303130729'); @@ -4741,6 +4727,8 @@ INSERT INTO schema_migrations (version) VALUES ('20150417082723'); INSERT INTO schema_migrations (version) VALUES ('20150421134820'); +INSERT INTO schema_migrations (version) VALUES ('20150422090645'); + INSERT INTO schema_migrations (version) VALUES ('20150422092514'); INSERT INTO schema_migrations (version) VALUES ('20150422132631'); @@ -4785,6 +4773,8 @@ INSERT INTO schema_migrations (version) VALUES ('20150519115050'); INSERT INTO schema_migrations (version) VALUES ('20150519140853'); +INSERT INTO schema_migrations (version) VALUES ('20150519142542'); + INSERT INTO schema_migrations (version) VALUES ('20150519144118'); INSERT INTO schema_migrations (version) VALUES ('20150520163237'); @@ -4793,6 +4783,12 @@ INSERT INTO schema_migrations (version) VALUES ('20150520164507'); INSERT INTO schema_migrations (version) VALUES ('20150521120145'); +INSERT INTO schema_migrations (version) VALUES ('20150522164020'); + +INSERT INTO schema_migrations (version) VALUES ('20150525075550'); + +INSERT INTO schema_migrations (version) VALUES ('20150603141054'); + INSERT INTO schema_migrations (version) VALUES ('20150603141549'); INSERT INTO schema_migrations (version) VALUES ('20150603211318'); @@ -4814,4 +4810,3 @@ INSERT INTO schema_migrations (version) VALUES ('20150701074344'); INSERT INTO schema_migrations (version) VALUES ('20150703084632'); INSERT INTO schema_migrations (version) VALUES ('20150706091724'); -