marty 8.0.0 → 8.2.0

data/spec/job_helper.rb

@@ -109,7 +109,19 @@ LOGGER:
     result = Gemini::Helper.testlog('message', [msgid]) &&
              Gemini::Helper.testaction('message %d', msgid) && msgid
 EOS
-
+NAME_L = 'PromiseL'
+SCRIPT_L = <<EOS
+Node:
+    jobs = [1, 2, 3]
+    job_title =? 'base'
+    base_attr = [ (Node(p_title  = ('%s %s' % [job_title, j]),
+                       job_title = ('%s %s' % [job_title, j])) | "run0") == true
+                  for j in jobs ]
+    run0 = [ (Node(p_title   = ('%s %s' % [job_title, j]),
+                   job_title = ('%s %s' % [job_title, j])) | "run1") == true
+                  for j in jobs ]
+    run1 = Gemini::Helper.sleep(5, job_title)
+EOS
 NAME_M = 'PromiseM'
 SCRIPT_M = <<EOS
 Node:
@@ -160,6 +172,7 @@ def promise_bodies
     NAME_I => SCRIPT_I,
     NAME_J => SCRIPT_J,
     NAME_K => SCRIPT_K,
+    NAME_L => SCRIPT_L,
     NAME_M => SCRIPT_M,
     NAME_N => SCRIPT_N,
   }

data/spec/lib/mcfly_model_spec.rb

@@ -46,6 +46,7 @@ A:
 
     a_func = Gemini::FannieBup.a_func('infinity', e_id, bc_id)
     b_func = Gemini::FannieBup.b_func('infinity', e_id, bc_id, 12)
+    c_func = Gemini::FannieBup.c_func('infinity', e_id, bc_id, 12)
 EOF
 errscript = <<EOF
 Err:
@@ -121,22 +122,23 @@ describe 'McflyModel' do
   it 'lookup mode default' do
     a1 = @engine.evaluate('A', 'lookup', params)
     a2 = @engine.evaluate('A', 'clookup', params)
-    expect(a1).to eq(a2)                            # cache/non return same
-    expect(a1.class).to eq(OpenStruct)              # mode default so return OS
-    expect(a2.class).to eq(OpenStruct)
+    expect(a1).to eq(a2) # cache/non return same
+    expect(a1.class).to eq(Hash) # mode default so return hash
+    expect(a2.class).to eq(Hash)
 
     # check that keys are non mcfly non uniqueness
-    expect(a1.to_h.keys.to_set).to eq(Set[:buy_up, :buy_down])
+    expect(a1.to_h.keys.to_set).to eq(Set['buy_up', 'buy_down'])
   end
 
   it 'lookup non generated' do
     # a1 will be AR Relations
-    # b1 will be OpenStructs because the b fns return #first
+    # b1 will be hash because the b fns return #first
     e_id = Gemini::Entity.where(name: 'PLS').first.id
     bc_id = Gemini::BudCategory.where(name: 'Conv Fixed 20').first.id
     p = { 'e_id' => e_id, 'bc_id' => bc_id }
     a1 = @engine.evaluate('A', 'a_func', p)
     b1 = @engine.evaluate('A', 'b_func', p)
+    c1 = @engine.evaluate('A', 'c_func', p)
 
     # all return relations
     expect(ActiveRecord::Relation === a1).to be_truthy
@@ -150,10 +152,15 @@ describe 'McflyModel' do
     # a1 is AR but still missing the FK entity_id so will raise
     expect { a1.first.entity }.to raise_error(/missing attribute: entity_id/)
 
-    expect(b1.class).to eq(OpenStruct)
+    expect(b1.class).to eq(Hash)
 
     # make sure b1 has correct keys
-    expect(b1.to_h.keys.to_set).to eq(Set[:buy_up, :buy_down])
+    expect(b1.to_h.keys.to_set).to eq(Set['buy_up', 'buy_down'])
+
+    expect(c1.class).to eq(OpenStruct)
+
+    # make sure c1 has correct keys
+    expect(c1.to_h.keys.to_set).to eq(Set[:buy_up, :buy_down])
   end
 
   it 'lookup mode nil' do

data/spec/models/promise_spec.rb

@@ -93,6 +93,127 @@ describe Marty::Promise, slow: true, retry: 3 do
       expect(log.message).to eq 'was called'
     end
 
+    it 'can cancel jobs' do
+      run_ruby_job = lambda do |title1, title2|
+        title = title1 + ' ' + title2
+        Marty::Promises::Ruby::Create.call(
+          module_name: 'Gemini::Helper',
+          method_name: 'promise_test',
+          method_args: [title2],
+          params: {
+            p_title: title,
+            _user_id: 1,
+          }
+        )
+      end
+      engine = Marty::ScriptSet.new.get_engine(NAME_L)
+      run_delorean_job = lambda do |title1, title2|
+        engine.background_eval('Node', { 'p_title' => title1 + ' ' + title2,
+                                         'job_title' => title2 }, ['base_attr'])
+      end
+
+      aggregate_failures do
+        [['Ruby', run_ruby_job],
+         ['PromiseL', run_delorean_job]].each do |title1, runner|
+          # first run with no cancel.  make sure the test parts work as expected
+          title2 = 'first run'
+          x = runner.call(title1, title2)
+
+          base_p = nil
+          timeout = 60
+          # wait until base promise completes
+          loop do
+            base_p = Marty::Promise.find_by("title like '#{title1}%'")
+            break if p&.status || timeout == 0
+
+            timeout -= 1
+            sleep 1
+          end
+          expect(base_p.is_a?(Marty::Promise)).to be_truthy
+          expect(base_p.status).to be_truthy
+          expect(timeout).to be < 55
+
+          # count promises that ran
+          ps = Marty::Promise.where("title like '#{title2} %' or "\
+                                    "title = '#{title1} #{title2}'").
+                 pluck(:id, :title, :end_dt, :status, :result)
+
+          # this check could fail on rare occasion due to the fact that
+          # delayed jobs sometimes run twice
+          expect(ps.count).to eq(13)
+
+          # check status
+          expect(ps.all? { |p| p[4] }).to be_truthy
+
+          # check the names
+          exp_pnames = [
+            'first run 1', 'first run 1 1', 'first run 1 2', 'first run 1 3',
+            'first run 2', 'first run 2 1', 'first run 2 2', 'first run 2 3',
+            'first run 3', 'first run 3 1', 'first run 3 2', 'first run 3 3'
+          ]
+
+          expect(ps.map { |p| p[1] }.reject { |s| s.starts_with?(title1) }.sort).
+            to eq(exp_pnames)
+
+          # make sure the log was written by the leaf jobs. (uniq because
+          # rarely jobs run twice due to race condition -- see promise.rb:126)
+          exp_log = ['first run 1 1', 'first run 1 2', 'first run 1 3',
+                     'first run 2 1', 'first run 2 2', 'first run 2 3',
+                     'first run 3 1', 'first run 3 2', 'first run 3 3']
+          logs = Marty::Log.all.pluck(:details).map { |d| d['label'] }.sort.uniq
+          expect(logs).to eq(exp_log)
+
+          Marty::Promise.where("title like '#{title2}%'").destroy_all
+          Marty::Log.where("details->>'label' like '#{title2}%'").destroy_all
+
+          # run with early cancel
+          cancel_with_checks(runner, title1, '2nd run', '1', ps.count,
+                             exp_log.count)
+
+          # run with later cancel
+          cancel_with_checks(runner, title1, '3rd run', '1 1', ps.count,
+                             exp_log.count)
+
+          # some workers may die because we deleted the promises,
+          # so restart them
+          stop_delayed_job
+          start_delayed_job
+        end
+      end
+    end
+
+    def cancel_with_checks(runner, title1, title2, cancel_name, cnt1, cnt2)
+      testinfo = "#{title1} #{title2}"
+      runner.call(title1, title2)
+
+      # wait for indicated job and cancel
+      timeout = 30
+      title_where = "title = '#{title2} #{cancel_name}'"
+      until timeout == 0 || (p = Marty::Promise.find_by(title_where))
+        sleep 1
+        timeout -= 1
+      end
+      expect(p).to be_a(Marty::Promise), testinfo
+      Marty::Promises::Cancel.call(p.id)
+
+      # count the logs that were generated, should be less
+      l = Marty::Log.where("details->>'label' like '#{title2}%'").uniq
+      expect(l.count).to be < cnt2, testinfo
+
+      ps = Marty::Promise.where("title like '#{title2}%' or "\
+                                "title = '#{title1} #{title2}'").
+             pluck(:job_id, :id, :title, :end_dt, :status, :result)
+
+      # cancel should have stopped creation of promises
+      expect(ps.count).to be < cnt1, testinfo
+
+      # make sure all the promises have an error=Cancelled in result
+      errors = ps.map(&:last).map { |h| h['error'] }.to_set
+      expect(errors).to eq(['Cancelled'].to_set), testinfo
+      Marty::Promise.where("title like '#{title2}%'").destroy_all
+      Marty::Log.where("details->>'label' like '#{title2}%'").destroy_all
+    end
+
     it 'fails on exception' do
       expect(Marty::Promise.where(title: 'PromiseJ').exists?).to be false
 

data/spec/services/notifications/create_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+module Marty
+  describe Notifications::Create do
+    before do
+      populate_test_users
+    end
+
+    let(:user1) do
+      Marty::User.find_by(login: :admin1)
+    end
+
+    let(:user2) do
+      Marty::User.find_by(login: :admin2)
+    end
+
+    let(:event_type) do
+      'API reached the limit'
+    end
+
+    let!(:config) do
+      ::Marty::Notifications::Config.create!(
+        event_type: event_type,
+        recipient: user1,
+        delivery_type: :web,
+        state: :on,
+        text: 'Please contact the customer'
+      )
+    end
+
+    let!(:config2) do
+      ::Marty::Notifications::Config.create!(
+        event_type: event_type,
+        recipient: user2,
+        delivery_type: :web,
+        state: :on,
+      )
+    end
+
+    def create_notification
+      hash = described_class.call(
+        event_type: event_type,
+        text: 'Test limit is 1000'
+      )
+
+      Marty::Notifications::Notification.find(hash[:id])
+    end
+
+    it 'creates deliveries' do
+      notification = create_notification
+
+      expect(notification.deliveries.size).to eq 2
+
+      delivery1 = user1.notification_deliveries.find_by(
+        notification: notification
+      )
+
+      expect(delivery1.state).to eq 'sent'
+      expect(delivery1.text).to eq 'Please contact the customer'
+
+      delivery2 = user2.notification_deliveries.find_by(
+        notification: notification
+      )
+      expect(delivery2.state).to eq 'sent'
+      expect(delivery2.text).to eq ''
+    end
+
+    it "doesn't create delivery when config is off" do
+      config2.update!(state: :off)
+
+      notification = create_notification
+
+      expect(notification.deliveries.size).to eq 1
+
+      delivery2 = user2.notification_deliveries.find_by(
+        notification: notification
+      )
+
+      expect(delivery2).to_not be_present
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.2.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,8 +14,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actioncable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +226,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: state_machines
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: state_machines-activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zip-zip
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +290,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/marty/application.js
+- app/assets/javascripts/marty/cable.js
 - app/assets/javascripts/marty/codemirror/codemirror.js
 - app/assets/javascripts/marty/codemirror/mode/delorean/delorean.js
 - app/assets/javascripts/marty/codemirror/mode/javascript/javascript.js
@@ -257,7 +300,11 @@ files:
 - app/assets/stylesheets/marty/application.css
 - app/assets/stylesheets/marty/codemirror/codemirror.css
 - app/assets/stylesheets/marty/codemirror/delorean.css
+- app/assets/stylesheets/marty/codemirror/notifications.css
 - app/assets/stylesheets/marty/dark_mode.css
+- app/channels/application_cable/channel.rb
+- app/channels/application_cable/connection.rb
+- app/channels/marty/notification_channel.rb
 - app/components/marty/api_auth_view.rb
 - app/components/marty/api_config_view.rb
 - app/components/marty/api_log_view.rb
@@ -290,6 +337,10 @@ files:
 - app/components/marty/new_posting_form.rb
 - app/components/marty/new_posting_form/client/new_posting_form.js
 - app/components/marty/new_posting_window.rb
+- app/components/marty/notifications/config_view.rb
+- app/components/marty/notifications/deliveries_view.rb
+- app/components/marty/notifications/grid_view.rb
+- app/components/marty/notifications/window.rb
 - app/components/marty/panel.rb
 - app/components/marty/panel/client/panel.js
 - app/components/marty/posting_grid.rb
@@ -306,8 +357,8 @@ files:
 - app/components/marty/reporting.rb
 - app/components/marty/reporting/client/reporting.js
 - app/components/marty/schedule_jobs_dashboard.rb
-- app/components/marty/schedule_jobs_dashboard/client/schedule_jobs_dashboard.js
 - app/components/marty/schedule_jobs_grid.rb
+- app/components/marty/schedule_jobs_grid/client/schedule_jobs_grid.js
 - app/components/marty/schedule_jobs_logs.rb
 - app/components/marty/schedule_jobs_logs/client/schedule_jobs_logs.js
 - app/components/marty/script_form.rb
@@ -322,6 +373,7 @@ files:
 - app/components/marty/simple_app/client/statusbar_ext.js
 - app/components/marty/tag_grid.rb
 - app/components/marty/user_view.rb
+- app/components/marty/users/user_view.rb
 - app/controllers/marty/application_controller.rb
 - app/controllers/marty/components_controller.rb
 - app/controllers/marty/delayed_job_controller.rb
@@ -356,6 +408,11 @@ files:
 - app/models/marty/import_type.rb
 - app/models/marty/log.rb
 - app/models/marty/name_validator.rb
+- app/models/marty/notifications.rb
+- app/models/marty/notifications/config.rb
+- app/models/marty/notifications/delivery.rb
+- app/models/marty/notifications/event_type.rb
+- app/models/marty/notifications/notification.rb
 - app/models/marty/pg_enum.rb
 - app/models/marty/posting.rb
 - app/models/marty/posting_type.rb
@@ -373,6 +430,13 @@ files:
 - app/services/marty/data_grid_view/save_grid.rb
 - app/services/marty/enums/report.rb
 - app/services/marty/jobs/schedule.rb
+- app/services/marty/notifications/create.rb
+- app/services/marty/notifications/create_deliveries.rb
+- app/services/marty/notifications/process_delivery.rb
+- app/services/marty/notifications/processors/email.rb
+- app/services/marty/notifications/processors/sms.rb
+- app/services/marty/notifications/processors/web.rb
+- app/services/marty/promises/cancel.rb
 - app/services/marty/promises/delorean.rb
 - app/services/marty/promises/delorean/create.rb
 - app/services/marty/promises/ruby.rb
@@ -437,6 +501,10 @@ files:
 - db/migrate/512_add_promise_priority.rb
 - db/migrate/513_add_priority_to_promise_view.rb
 - db/migrate/514_remove_marty_events.rb
+- db/migrate/519_create_marty_notifications_event_types.rb
+- db/migrate/520_create_marty_notifications.rb
+- db/migrate/521_create_marty_notifications_deliveries.rb
+- db/migrate/522_create_marty_notifications_config.rb
 - db/seeds.rb
 - db/sql/lookup_grid_distinct_v1.sql
 - db/sql/query_grid_dir_v1.sql
@@ -1636,6 +1704,7 @@ files:
 - spec/features/javascripts/login.js.coffee
 - spec/features/jobs_dashboard_spec.rb
 - spec/features/log_view_spec.rb
+- spec/features/notifications_spec.rb
 - spec/features/reporting_spec.rb
 - spec/features/rule_spec.rb
 - spec/features/schedule_jobs_dashboard_spec.rb
@@ -1700,6 +1769,7 @@ files:
 - spec/requests/routes_spec.rb
 - spec/services/background_job/fetch_missing_in_schedule_cron_jobs_spec.rb
 - spec/services/jobs/schedule_spec.rb
+- spec/services/notifications/create_spec.rb
 - spec/spec_helper.rb
 - spec/support/chromedriver.rb
 - spec/support/components/netzke_combobox.rb