merged master

Author: niklas573

.env

@@ -19,3 +19,4 @@ DEVISE_JWT_SECRET_KEY=9dde7c3cebc4c85e91a6f6e520b683396cd4f0d218671f4f2a398f2b6f
 # STRIPE_TAX_RATE_ID=
 #
 # FRONTEND_URL=
+# IRIS_EPS_URL=

.env.test

@@ -1,2 +1,3 @@
 STRIPE_SUBSCRIPTION_PRICE_ID=test_price
-HAPPY_PDF_API_KEY=HAPPY_KEY
+HAPPY_PDF_API_KEY=HAPPY_KEY
+IRIS_EPS_URL=https://localhost:5556/jsonrpc

Gemfile

@@ -22,6 +22,7 @@ gem 'activestorage-validator'
 gem 'image_processing'
 gem 'paper_trail'
 gem 'protobuf'
+gem 'jimson'
 
 # Emails
 gem 'mailgun-ruby', '~> 1.2'

Gemfile.lock

@@ -93,6 +93,7 @@ GEM
     aws-sigv4 (1.2.3)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.16)
+    blankslate (3.1.3)
     bootsnap (1.7.5)
       msgpack (~> 1.0)
     builder (3.2.4)
@@ -181,6 +182,11 @@ GEM
     interactor-rails (2.2.1)
       interactor (~> 3.0)
       rails (>= 4.2)
+    jimson (0.13.0)
+      blankslate (>= 3.1.3)
+      multi_json (>= 1.11.2)
+      rack (>= 1.4.5)
+      rest-client (>= 1.7.3)
     jmespath (1.4.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
@@ -226,6 +232,7 @@ GEM
     mini_portile2 (2.5.1)
     minitest (5.14.4)
     msgpack (1.4.2)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nested_form (0.3.2)
@@ -423,6 +430,7 @@ DEPENDENCIES
   image_processing
   inky-rb
   interactor-rails
+  jimson
   letter_opener
   listen (~> 3.5)
   mailgun-ruby (~> 1.2)

README.md

@@ -70,12 +70,19 @@ Install rcvr-app frontend: https://github.com/railslove/rcvr-app
 Create a frontend entry in your postgres database:
 
 ```
-docker-compose exec postgres psql -U postgres`
-postgres=# insert into frontends (name, url) values('App-Local', 'http://localhost:3333');
+docker-compose exec postgres psql -U postgres
+postgres=# \connect rcvr_api_development
+rcvr_api_development=# insert into frontends (name, url) values('App-Local', 'http://localhost:3333');
 ```
 
 Your port might vary depending on your set up (see rcvr-app README).
 
+You should also update the frontend .env.local to match your backends local url: 
+
+NEXT_PUBLIC_API_BASE=http://api.localhost:3000 
+
+for local development the http://api. prefix is mandatory
+
 ### Deployment
 
 - `origin/master` deploys to production on push

app/controllers/owners/areas_controller.rb

@@ -54,7 +54,7 @@ def area
     end
 
     def area_params
-      params.require(:area).permit(:name)
+      params.require(:area).permit(:name, :test_exemption)
     end
   end
 end

app/controllers/owners/companies_controller.rb

@@ -34,7 +34,7 @@ def stats
       company = @owner.companies.find(params[:company_id])
 
       stats = company.areas.map do |area|
-        { area_name: area.name, checkin_count: area.tickets.open.count }
+        { area_name: area.name, area_test_exemption: area.test_exemption, checkin_count: area.tickets.open.count }
       end
 
       render json: stats

app/jobs/iris_delete_company.rb

@@ -0,0 +1,12 @@
+class IrisDeleteCompany < ApplicationJob
+  queue_as :default
+
+  def perform(company_id)
+    return if ENV["IRIS_EPS_URL"].blank?
+    Jimson::Client.new(
+      ENV["IRIS_EPS_URL"], {id_type: :string}, "ls-1.", {verify_ssl: false}
+    ).deleteLocationFromSearchIndex({
+      locationId: company_id
+    })
+  end
+end

app/jobs/iris_update_company.rb

@@ -0,0 +1,32 @@
+class IrisUpdateCompany < ApplicationJob
+  queue_as :default
+
+  def perform(company_id)
+    return if ENV["IRIS_EPS_URL"].blank?
+
+    company = Company.find(company_id)
+    return unless company
+
+    Jimson::Client.new(
+      ENV["IRIS_EPS_URL"], {id_type: :string}, "ls-1.", {verify_ssl: false}
+    ).postLocationsToSearchIndex({
+      locations: [
+        {
+          id: company.id, 
+          name: company.name, 
+          contact: {
+            officalName: company.name, 
+            representative: company.owner.name, 
+            address: {
+              street: company.street, 
+              city: company.city, 
+              zip: company.zip
+            }, 
+            email: company.owner.email,
+            phone: company.owner.phone
+          }
+        }
+      ]
+    })
+  end
+end

app/models/affiliate.rb

@@ -27,4 +27,8 @@ def link
   def owner_count
     Owner.where(affiliate: self.code).count
   end
+
+  def company_count
+    Company.joins(:owner).where(owners: {affiliate: self.code}).count
+  end
 end

app/models/area.rb

@@ -2,7 +2,7 @@ class Area < ApplicationRecord
   include ApiSerializable
   include RailsAdminConfig::ForArea
 
-  EXPOSED_ATTRIBUTES = %i[id name menu_link checkin_link company_id company_name company_need_to_show_corona_test company_cwa_link_enabled affiliate_logo owner_is_blocked menu_alias frontend_url public_key privacy_policy_link]
+  EXPOSED_ATTRIBUTES = %i[id name menu_link checkin_link company_id company_name company_need_to_show_corona_test company_cwa_link_enabled affiliate_logo owner_is_blocked menu_alias frontend_url public_key privacy_policy_link test_exemption].freeze
 
   belongs_to :company
   has_many :tickets, dependent: :destroy

app/models/company.rb

@@ -48,22 +48,32 @@ class Company < ApplicationRecord
   delegate :menu_alias, :frontend_url, :public_key, to: :owner
   delegate :affiliate_logo, to: :owner
   delegate :auto_checkout_time, to: :owner
-  delegate :affiliate, to: :owner
+  delegate :affiliate, to: :owner, allow_nil: true
 
   attr_accessor :remove_menu_pdf
 
   before_update {
     menu_pdf.purge if remove_menu_pdf == '1' and menu_pdf.attached?
   }
 
+  after_commit(on: [:create, :update]) {
+    IrisUpdateCompany.perform_later(self.id)
+  }
+
+  after_commit(on: [:destroy]) {
+    IrisDeleteCompany.perform_later(self.id)
+  }
+
   def menu_pdf_link
     return unless menu_pdf.attached?
 
     url_for(menu_pdf)
   end
 
   def stats_url
-    owners_company_stats_url(self)
+    if self.id
+      owners_company_stats_url(self)
+    end
   end
 
   def open_ticket_count

app/models/concerns/rails_admin_config/for_affiliate.rb

@@ -15,6 +15,14 @@ module ForAffiliate
             path = bindings[:view].index_path(model_name: 'Owner')
             bindings[:view].link_to(bindings[:object].owner_count, "#{path}?f[affiliate][1][o]=is&f[affiliate][1][v]=#{ERB::Util.url_encode(bindings[:object].code)}")
           end
+          read_only true
+        end
+        field :companies_count do
+          label "Companies"
+          formatted_value do
+            bindings[:object].company_count
+          end
+          read_only true
         end
         fields :stripe_price_id_monthly, :custom_trial_phase, :logo_link
 

config/initializers/rest-client.rb

@@ -0,0 +1,3 @@
+require "rest-client"
+
+RestClient.proxy = ENV["QUOTAGUARDSTATIC_URL"] if ENV["QUOTAGUARDSTATIC_URL"].present?

db/migrate/20210608123942_change_coronatestoptions.rb

@@ -0,0 +1,19 @@
+class ChangeCoronatestoptions < ActiveRecord::Migration[6.1]
+  def up
+    execute "
+        ALTER TABLE companies ALTER need_to_show_corona_test SET DEFAULT null;
+        ALTER TABLE companies
+        ALTER need_to_show_corona_test TYPE INTEGER
+        USING
+        CASE
+        WHEN true THEN 48 ELSE 0
+        end;
+      "
+  end
+
+  def down
+    execute "
+      ALTER TABLE companies ALTER COLUMN need_to_show_corona_test TYPE BOOL USING need_to_show_corona_test::boolean;
+    "
+  end
+end

db/migrate/20210610105453_add_exception_areas.rb

@@ -0,0 +1,5 @@
+class AddExceptionAreas < ActiveRecord::Migration[6.1]
+  def change
+    add_column :areas, :test_exemption, :boolean, default: false
+  end
+end

db/schema.rb

@@ -57,6 +57,7 @@
     t.datetime "updated_at", precision: 6, null: false
     t.string "name"
     t.uuid "company_id"
+    t.boolean "test_exemption", default: false
     t.index ["company_id"], name: "index_areas_on_company_id"
   end
 
@@ -71,7 +72,7 @@
     t.string "street"
     t.string "zip"
     t.string "city"
-    t.boolean "need_to_show_corona_test", default: false
+    t.integer "need_to_show_corona_test"
     t.integer "location_type", default: 0
     t.boolean "cwa_link_enabled", default: false
     t.string "cwa_crypto_seed"

spec/factories/area.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :area do
     name { Faker::FunnyName.name }
-
+    test_exemption { true }
     company
   end
 end

spec/jobs/iris_delete_company_spec.rb

@@ -0,0 +1,12 @@
+require 'rails_helper'
+
+RSpec.describe IrisDeleteCompany, type: :job do
+
+  it "should send a delete request via JSON-RPC" do
+    company = FactoryBot.create(:company)
+    expect_any_instance_of(Jimson::ClientHelper).to receive(:process_call).with(:deleteLocationFromSearchIndex, {
+      locationId: company.id
+    })
+    IrisDeleteCompany.perform_now(company.id)
+  end
+end

spec/jobs/iris_update_company_spec.rb

@@ -0,0 +1,29 @@
+
+require 'rails_helper'
+
+RSpec.describe IrisUpdateCompany, type: :job do
+
+  it "should send a update request via JSON-RPC" do
+    company = FactoryBot.create(:company)
+    expect_any_instance_of(Jimson::ClientHelper).to receive(:process_call).with(:postLocationsToSearchIndex, {
+      locations: [
+        {
+          id: company.id, 
+          name: company.name, 
+          contact: {
+            officalName: company.name, 
+            representative: company.owner.name, 
+            address: {
+              street: company.street, 
+              city: company.city, 
+              zip: company.zip
+            }, 
+            email: company.owner.email,
+            phone: company.owner.phone
+          }
+        }
+      ]
+    })
+    IrisUpdateCompany.perform_now(company.id)
+  end
+end

spec/models/affiliate_spec.rb

@@ -21,4 +21,31 @@
       end
     end
   end
+
+  describe "owner_count" do
+    let(:affiliate) { FactoryBot.create(:affiliate) }
+
+    it "should return the correct owner count" do
+      FactoryBot.create(:owner, affiliate: affiliate.code)
+      FactoryBot.create(:owner, affiliate: affiliate.code)
+      FactoryBot.create(:owner)
+
+      expect(affiliate.owner_count).to eql 2
+    end
+  end
+
+  describe "company_count" do
+    let(:affiliate) { FactoryBot.create(:affiliate) }
+
+    it "should return the correct owner count" do
+      owner1 = FactoryBot.create(:owner, affiliate: affiliate.code)
+      owner2 = FactoryBot.create(:owner, affiliate: affiliate.code)
+      FactoryBot.create(:company, owner: owner1)
+      FactoryBot.create(:company, owner: owner1)
+      FactoryBot.create(:company, owner: owner2)
+      FactoryBot.create(:company)
+
+      expect(affiliate.company_count).to eql 3
+    end
+  end
 end

spec/models/company_spec.rb

@@ -27,4 +27,33 @@
     end
 
   end
+
+  describe "affiliate=" do
+    it 'should update the affiliate code in the owner' do
+      company = FactoryBot.create(:company)
+      company.affiliate = "awesome-code"
+      expect(company.owner.affiliate).to eql("awesome-code")
+    end
+  end
+
+  describe 'updates IRIS on create/update' do
+    it 'should schedule a job for creates' do
+      expect(IrisUpdateCompany).to receive(:perform_later)
+      FactoryBot.create(:company)
+    end
+
+    it 'should schedule a job for updates' do
+      company = FactoryBot.create(:company)
+      expect(IrisUpdateCompany).to receive(:perform_later).with(company.id)
+      company.update(name: "IRIS Update Name")
+    end
+  end
+
+  describe 'informs IRIS about destroy' do
+    it 'should schedule a job for destroys' do
+      company = FactoryBot.create(:company)
+      expect(IrisDeleteCompany).to receive(:perform_later).with(company.id)
+      company.destroy
+    end
+  end
 end

spec/requests/owners/area_request_spec.rb

@@ -44,11 +44,13 @@
     let!(:area) { FactoryBot.create(:area, company: company) }
 
     subject do
-      -> { patch(owners_area_path(area), params: { area: { name: 'New Name' } }) }
+      -> { patch(owners_area_path(area), params: { area: { test_exemption: true, name: 'New Name' } }) }
     end
 
     it { is_expected.to change { area.reload.name }.to('New Name') }
 
+    it { expect(area.reload.test_exemption).to eq(true) }
+    
     it 'renders the area' do
       subject.call