master to ruby-2.5.5

.codeclimate.yml

@@ -33,12 +33,10 @@ exclude_patterns:
   - "lib/gem_ext/"
   - "lib/tasks/api_log.rake"
   - "lib/tasks/bootstrap.rake"
-  - "lib/tasks/convert.rake"
   - "lib/tasks/db.rake"
   - "lib/tasks/documents.rake"
   - "lib/tasks/import.rake"
   - "lib/tasks/legal_doc.rake"
-  - "lib/tasks/statuses.rake"
   - "lib/tasks/whois.rake"
   - "spec/"
   - "test/"

CHANGELOG.md

@@ -1,3 +1,16 @@
+27.8.2019
+* Added some new database constraints [#1265](https://github.com/internetee/registry/pull/1265)
+
+26.08.2019
+* Introduced automatic payment processing using LHV Connect [#1232](https://github.com/internetee/registry/issues/1232)
+* removed unused script [#1261](https://github.com/internetee/registry/pull/1261)
+* removed unused factory [#1262](https://github.com/internetee/registry/pull/1262)
+* removed unused seller_it column from invoices db table [#1264](https://github.com/internetee/registry/pull/1264)
+* removed unused rake tasks [#1268](https://github.com/internetee/registry/pull/1268)
+
+21.08.2019
+* Nokogiri update to 1.10.4 (CVE-2019-5477) [#1266](https://github.com/internetee/registry/pull/1266)
+
 08.07.2019
 * Invoices are not delivered to e-invoice provider when registrar has no billing email [#1255](https://github.com/internetee/registry/issues/1255)
 

Gemfile

@@ -92,6 +92,7 @@ gem 'airbrake'
 
 gem 'company_register', github: 'internetee/company_register', branch: :master
 gem 'e_invoice', github: 'internetee/e_invoice', branch: :master
+gem 'lhv', github: 'internetee/lhv', tag: 'v0.1.0'
 
 group :development do
   # deploy

Gemfile.lock

@@ -41,6 +41,15 @@ GIT
       hpricot
       libxml-ruby
 
+GIT
+  remote: https://github.com/internetee/lhv.git
+  revision: e211516bc5fff2139584d4da41c17511863c229d
+  tag: v0.1.0
+  specs:
+    lhv (0.1.0)
+      keystores
+      nokogiri
+
 GIT
   remote: https://github.com/tarmotalu/digidoc_client.git
   revision: 1645e83a5a548addce383f75703b0275c5310c32
@@ -231,6 +240,7 @@ GEM
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
+    keystores (0.4.0)
     libxml-ruby (3.0.0)
     loofah (2.2.3)
       crass (~> 1.0.2)
@@ -479,6 +489,7 @@ DEPENDENCIES
   jquery-rails (= 4.0.4)
   jquery-ui-rails (= 5.0.5)
   kaminari (= 0.16.3)
+  lhv!
   mina (= 0.3.1)
   money-rails
   nokogiri

app/models/invoice.rb

@@ -3,7 +3,6 @@ class Invoice < ActiveRecord::Base
   include Concerns::Invoice::Cancellable
   include Concerns::Invoice::Payable
 
-  belongs_to :seller, class_name: 'Registrar'
   belongs_to :buyer, class_name: 'Registrar'
   has_one  :account_activity
   has_many :items, class_name: 'InvoiceItem', dependent: :destroy
@@ -36,7 +35,7 @@ class Invoice < ActiveRecord::Base
   attribute :vat_rate, ::Type::VATRate.new
 
   def set_invoice_number
-    last_no = Invoice.order(number: :desc).where('number IS NOT NULL').limit(1).pluck(:number).first
+    last_no = Invoice.order(number: :desc).limit(1).pluck(:number).first
 
     if last_no && last_no >= Setting.invoice_number_min.to_i
       self.number = last_no + 1

app/views/registrar/invoices/index.haml

@@ -57,7 +57,7 @@
             %th{class: 'col-xs-3'}= t(:total)
         %tbody
           - @invoices.each do |invoice|
-            %tr.invoice
+            %tr
               %td= link_to(invoice, [:registrar, invoice])
               - if invoice.paid?
                 %td= l invoice.receipt_date

config/application-example.yml

@@ -152,6 +152,12 @@ action_mailer_default_port: # default: no port (80)
 action_mailer_default_from: # no-reply@example.com
 action_mailer_force_delete_from: # `From` header for `DomainDeleteMailer#forced` email
 
+lhv_keystore:
+lhv_keystore_password:
+lhv_keystore_alias:
+lhv_ca_file: # Needed only in dev mode
+lhv_dev_mode: 'false'
+
 # Since the keys for staging are absent from the repo, we need to supply them separate for testing.
 test:
   payments_seb_bank_certificate: 'test/fixtures/files/seb_bank_cert.pem'
@@ -161,6 +167,9 @@ test:
   action_mailer_default_host: 'registry.test'
   action_mailer_default_from: 'no-reply@registry.test'
   action_mailer_force_delete_from: 'legal@registry.test'
+  lhv_keystore: 'test/fixtures/files/keystore.jks'
+  lhv_keystore_password: 'testtest'
+  lhv_keystore_alias: 'testtest'
 
 # Airbrake // Errbit:
 airbrake_host: "https://your-errbit-host.ee"

config/schedule.rb

@@ -57,6 +57,13 @@
   every 42.minutes do
     rake 'domain:discard'
   end
+
+  # Should be at least once every 4 days, since according to LHV specs:
+  # "Unread messages older than 5 days are automatically scheduled for deletion"
+  # https://partners.lhv.ee/en/connect/#messaging
+  every :day, at: '12:01am' do
+    rake 'invoices:process_payments'
+  end
 end
 
 every 10.minutes do

db/migrate/20190811184334_remove_invoices_seller_id.rb

@@ -0,0 +1,5 @@
+class RemoveInvoicesSellerId < ActiveRecord::Migration
+  def change
+    remove_column :invoices, :seller_id
+  end
+end

db/migrate/20190811195814_change_invoices_number_to_not_null.rb

@@ -0,0 +1,5 @@
+class ChangeInvoicesNumberToNotNull < ActiveRecord::Migration
+  def change
+    change_column_null :invoices, :number, false
+  end
+end

db/migrate/20190811202042_add_invoices_number_uniq_constraint.rb

@@ -0,0 +1,13 @@
+class AddInvoicesNumberUniqConstraint < ActiveRecord::Migration
+  def up
+    execute <<-SQL
+      ALTER TABLE invoices ADD CONSTRAINT unique_number UNIQUE (number)
+    SQL
+  end
+
+  def down
+    execute <<-SQL
+      ALTER TABLE invoices DROP CONSTRAINT unique_number
+    SQL
+  end
+end

db/migrate/20190811202347_add_invoices_buyer_id_fk.rb

@@ -0,0 +1,5 @@
+class AddInvoicesBuyerIdFk < ActiveRecord::Migration
+  def change
+    add_foreign_key :invoices, :registrars, column: :buyer_id
+  end
+end

db/migrate/20190811202711_change_invoices_required_columns_to_not_null.rb

@@ -0,0 +1,15 @@
+class ChangeInvoicesRequiredColumnsToNotNull < ActiveRecord::Migration
+  def change
+    change_column_null :invoices, :buyer_id, false
+    change_column_null :invoices, :seller_reg_no, false
+    change_column_null :invoices, :seller_bank, false
+    change_column_null :invoices, :seller_swift, false
+    change_column_null :invoices, :seller_country_code, false
+    change_column_null :invoices, :seller_street, false
+    change_column_null :invoices, :seller_city, false
+    change_column_null :invoices, :buyer_reg_no, false
+    change_column_null :invoices, :buyer_country_code, false
+    change_column_null :invoices, :buyer_street, false
+    change_column_null :invoices, :buyer_city, false
+  end
+end

db/migrate/20190811205406_change_invoices_required_columns_to_not_null_part2.rb

@@ -0,0 +1,7 @@
+class ChangeInvoicesRequiredColumnsToNotNullPart2 < ActiveRecord::Migration
+  def change
+    change_column_null :invoices, :seller_email, false
+    change_column_null :invoices, :seller_contact_name, false
+    change_column_null :invoices, :buyer_email, false
+  end
+end

db/structure.sql

@@ -935,36 +935,35 @@ CREATE TABLE public.invoices (
     description character varying,
     reference_no character varying NOT NULL,
     vat_rate numeric(4,3) NOT NULL,
-    seller_id integer,
     seller_name character varying NOT NULL,
-    seller_reg_no character varying,
+    seller_reg_no character varying NOT NULL,
     seller_iban character varying NOT NULL,
-    seller_bank character varying,
-    seller_swift character varying,
+    seller_bank character varying NOT NULL,
+    seller_swift character varying NOT NULL,
     seller_vat_no character varying,
-    seller_country_code character varying,
+    seller_country_code character varying NOT NULL,
     seller_state character varying,
-    seller_street character varying,
-    seller_city character varying,
+    seller_street character varying NOT NULL,
+    seller_city character varying NOT NULL,
     seller_zip character varying,
     seller_phone character varying,
     seller_url character varying,
-    seller_email character varying,
-    seller_contact_name character varying,
-    buyer_id integer,
+    seller_email character varying NOT NULL,
+    seller_contact_name character varying NOT NULL,
+    buyer_id integer NOT NULL,
     buyer_name character varying NOT NULL,
-    buyer_reg_no character varying,
-    buyer_country_code character varying,
+    buyer_reg_no character varying NOT NULL,
+    buyer_country_code character varying NOT NULL,
     buyer_state character varying,
-    buyer_street character varying,
-    buyer_city character varying,
+    buyer_street character varying NOT NULL,
+    buyer_city character varying NOT NULL,
     buyer_zip character varying,
     buyer_phone character varying,
     buyer_url character varying,
-    buyer_email character varying,
+    buyer_email character varying NOT NULL,
     creator_str character varying,
     updator_str character varying,
-    number integer,
+    number integer NOT NULL,
     cancelled_at timestamp without time zone,
     total numeric(10,2) NOT NULL,
     in_directo boolean DEFAULT false,
@@ -3199,6 +3198,14 @@ ALTER TABLE ONLY public.registrars
     ADD CONSTRAINT unique_name UNIQUE (name);
 
 
+--
+-- Name: unique_number; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY public.invoices
+    ADD CONSTRAINT unique_number UNIQUE (number);
+
+
 --
 -- Name: unique_reference_no; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
 --
@@ -3453,13 +3460,6 @@ CREATE INDEX index_invoice_items_on_invoice_id ON public.invoice_items USING btr
 CREATE INDEX index_invoices_on_buyer_id ON public.invoices USING btree (buyer_id);
 
 
---
--- Name: index_invoices_on_seller_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
---
-
-CREATE INDEX index_invoices_on_seller_id ON public.invoices USING btree (seller_id);
-
-
 --
 -- Name: index_keyrelays_on_accepter_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
@@ -3913,6 +3913,14 @@ ALTER TABLE ONLY public.domains
     ADD CONSTRAINT domains_registrar_id_fk FOREIGN KEY (registrar_id) REFERENCES public.registrars(id);
 
 
+--
+-- Name: fk_rails_242b91538b; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.invoices
+    ADD CONSTRAINT fk_rails_242b91538b FOREIGN KEY (buyer_id) REFERENCES public.registrars(id);
+
+
 --
 -- Name: fk_rails_59c422f73d; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -4817,3 +4825,15 @@ INSERT INTO schema_migrations (version) VALUES ('20190617122505');
 
 INSERT INTO schema_migrations (version) VALUES ('20190620084334');
 
+INSERT INTO schema_migrations (version) VALUES ('20190811184334');
+
+INSERT INTO schema_migrations (version) VALUES ('20190811195814');
+
+INSERT INTO schema_migrations (version) VALUES ('20190811202042');
+
+INSERT INTO schema_migrations (version) VALUES ('20190811202347');
+
+INSERT INTO schema_migrations (version) VALUES ('20190811202711');
+
+INSERT INTO schema_migrations (version) VALUES ('20190811205406');
+