marty 1.0.15 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 443c5c011284c9a2ea3e10f62be61aca86b5ee27
-  data.tar.gz: c6bdf687627ec7971dabf549b7a8390c186a976a
+  metadata.gz: ddef9c94cc142b0d56475fd47ce2d8a91bdc988e
+  data.tar.gz: 46e3879a1402abf89018c5ac88323109d83ce905
 SHA512:
-  metadata.gz: 4cb6dc2818dc2990744feb4fc44a8d8d97f6637237555b40e5c00a9cfdaacbe9a93e3941c6c8c54bb3e21bbcd247cc6dbf4dfea4466cc0688248fc2217a97b7c
-  data.tar.gz: d15b0f44ed1d6825e38ac6626c27beb6b966741dade658d13eebf05f2001a214b6a20771bfc768983991309a411e16f883f566ceb66a052765772b5eb876431c
+  metadata.gz: 7cf2b4a830eb713c974a60909d6e777eacbcbcb773f6bfa217ae00d0a87d1df17ab982c8f725be17d4e5932f723c2afa11a83a58dbc1c048b77380a1b5acfbe8
+  data.tar.gz: 15ac135cf790bd8eb3bd8cb5f8bdda2c2930be1b62c9d880eb9e770bdc1ed0d835f6dcbf0f67cdd3ef78bea0c422e3cd50bc5a1bf58786c872b0265061d15ac4

data/app/components/marty/promise_view.rb

@@ -55,7 +55,11 @@ class Marty::PromiseView < Netzke::Tree::Base
     config.root_visible = false
     config.paging = :none
     config.bbar = bbar
-
+    config.read_only = true
+    config.permissions = { update: false,
+                           create: false,
+                           delete: false,
+                         }
     # garbage collect old promises (hacky to do this here)
     Marty::Promise.cleanup(false)
   end

data/app/models/marty/event.rb

@@ -17,29 +17,41 @@ class Marty::Event < Marty::Base
     self.comment = self.comment.truncate(255) if self.comment
   end
 
-  BASE_QUERY = "SELECT ev.id,
-                   ev.klass,
-                   ev.subject_id,
-                   ev.enum_event_operation,
-                   ev.comment,
-                   coalesce(pr.start_dt, ev.start_dt) start_dt,
-                   coalesce(pr.end_dt, ev.end_dt) end_dt,
-                   expire_secs
-                FROM marty_events ev
-                LEFT JOIN marty_promises pr ON ev.promise_id = pr.id "
-
+  UPDATE_SQL =<<SQL
+  UPDATE marty_events as me
+  SET start_dt = p.start_dt,
+      end_dt = p.end_dt
+  FROM marty_promises p
+  WHERE me.promise_id = p.id
+    AND (   (    p.start_dt IS NOT NULL
+             AND me.start_dt IS NULL
+            )
+         OR (    p.end_dt IS NOT NULL
+             AND me.end_dt IS NULL
+            )
+        )
+SQL
+  BASE_QUERY =<<SQL
+SELECT id,
+            klass,
+            subject_id,
+            enum_event_operation,
+            comment,
+            start_dt,
+            end_dt,
+            expire_secs,
+            error
+     FROM marty_events
+SQL
   def self.running_query(time_now_s)
-    "SELECT * FROM
-       (#{BASE_QUERY}
-        WHERE coalesce(pr.start_dt, ev.start_dt, '1900-1-1') >=
-                   '#{time_now_s}'::timestamp - interval '24 hours') sub
-     WHERE (end_dt IS NULL or end_dt > '#{time_now_s}'::timestamp)
+    "#{BASE_QUERY}
+     WHERE start_dt >= '#{time_now_s}'::timestamp - interval '24 hours'
+       AND (end_dt IS NULL or end_dt > '#{time_now_s}'::timestamp)
        AND (expire_secs IS NULL
         OR expire_secs > EXTRACT (EPOCH FROM '#{time_now_s}'::timestamp - start_dt))
       ORDER BY start_dt"
   end
 
-
   def self.op_is_running?(klass, subject_id, operation)
     all_running.detect do |pm|
       pm["klass"] == klass && pm["subject_id"].to_i == subject_id.to_i &&
@@ -76,16 +88,17 @@ class Marty::Event < Marty::Base
   end
 
   def self.lookup_event(klass, subject_id, operation)
-    get_data(BASE_QUERY +
-             " WHERE klass = '#{klass}'
-                AND subject_id = #{subject_id}
-                and enum_event_operation = '#{operation}'")
+    get_data("#{BASE_QUERY}
+              WHERE klass = '#{klass}'
+              AND subject_id = #{subject_id}
+              AND enum_event_operation = '#{operation}'")
 
     #For now we return a bare hash
     #Marty::Event.find_by_id(hash["id"])
   end
 
-  def self.finish_event(klass, subject_id, operation, comment=nil)
+  def self.finish_event(klass, subject_id, operation, error=false, comment=nil)
+    raise "error must be true or false" unless [true, false].include?(error)
     time_now_s = Time.zone.now.strftime('%Y-%m-%d %H:%M:%S.%6N')
 
     event = get_data(running_query(time_now_s)).detect do |ev|
@@ -98,6 +111,7 @@ class Marty::Event < Marty::Base
     ev = Marty::Event.find_by_id(event["id"])
     raise "can't explicitly finish a promise event" if ev.promise_id
     ev.end_dt = Time.zone.now
+    ev.error = error
     ev.comment = comment if comment
     ev.save!
   end
@@ -112,10 +126,11 @@ class Marty::Event < Marty::Base
 
     op_sql = "AND enum_event_operation = '#{operation}'" if operation
 
-    get_data("SELECT * FROM (#{BASE_QUERY}) sub
+    get_data("#{BASE_QUERY}
               WHERE klass = '#{klass}'
-                AND subject_id = #{subject_id} #{op_sql}
-             ORDER BY end_dt desc").first
+              AND subject_id = #{subject_id} #{op_sql}
+              AND end_dt IS NOT NULL
+              ORDER BY end_dt desc").first
   end
 
   def self.currently_running(klass, subject_id)
@@ -142,6 +157,10 @@ class Marty::Event < Marty::Base
     hash['end_dt'] ? hash['end_dt'].strftime("%H:%M") : '---'
   end
 
+  def self.update_start_and_end
+    ActiveRecord::Base.connection.execute(UPDATE_SQL)
+  end
+
   def self.get_data(sql)
     ActiveRecord::Base.connection.execute(sql).to_a.map do |h|
       h["id"]          = h["id"].to_i
@@ -150,6 +169,7 @@ class Marty::Event < Marty::Base
       h["end_dt"]      = Time.zone.parse(h["end_dt"]) if h["end_dt"]
       h["expire_secs"] = h["expire_secs"].to_i if h["expire_secs"]
       h["comment"]     = h["comment"]
+      h["error"]       = h["error"]
       h
     end
   end
@@ -166,6 +186,7 @@ class Marty::Event < Marty::Base
     time_now_i = time_now.to_i
     time_now_s = time_now.strftime('%Y-%m-%d %H:%M:%S.%6N')
     if time_now_i - @all_running[:timestamp] > @poll_secs
+      update_start_and_end
       @all_running[:data] = get_data(running_query(time_now_s))
       @all_running[:timestamp] = time_now_i
     end
@@ -184,6 +205,7 @@ class Marty::Event < Marty::Base
              strftime('%Y-%m-%d %H:%M:%S.%6N')
 
     if time_now_i - @all_finished[:timestamp] > @poll_secs
+      update_start_and_end
       raw = get_data(
         "SELECT * FROM
             (SELECT ROW_NUMBER() OVER (PARTITION BY klass,
@@ -197,6 +219,14 @@ class Marty::Event < Marty::Base
       )
       @all_finished[:timestamp] = time_now_i
       raw.each_with_object(@all_finished[:data]) do |ev, hash|
+        if ev["end_dt"] && ev["error"].nil?
+          real_ev = Marty::Event.where(id: ev["id"]).first
+          promise = Marty::Promise.where(id: real_ev["promise_id"]).first
+          maybe_error = promise.result["error"]
+          ev["error"] = real_ev.error = !!maybe_error
+          real_ev.comment = maybe_error
+          real_ev.save!
+        end
         subhash = hash[[ev["klass"], ev["subject_id"]]] ||= {}
         subhash[ev["enum_event_operation"]] =
           ev["end_dt"].strftime("%Y-%m-%d %H:%M:%S")

data/db/migrate/202_add_completion_status_to_event.rb

@@ -0,0 +1,6 @@
+class AddCompletionStatusToEvent < ActiveRecord::Migration
+  def change
+    add_column :marty_events, :error, :boolean, null: true
+    execute "update marty_events set error = 'f'"
+  end
+end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.15"
+  VERSION = "1.0.17"
 end

data/spec/job_helper.rb

@@ -95,6 +95,13 @@ SLEEPER:
     a = Gemini::Helper.sleep(secs) && secs
 EOS
 
+NAME_J = "PromiseJ"
+SCRIPT_J = <<EOS
+FAILER:
+    dummy =? nil
+    a = ERR('I had an error')
+EOS
+
 def promise_bodies
   {
     NAME_A => SCRIPT_A,
@@ -106,5 +113,6 @@ def promise_bodies
     NAME_G => SCRIPT_G,
     NAME_H => SCRIPT_H,
     NAME_I => SCRIPT_I,
+    NAME_J => SCRIPT_J,
   }
 end

data/spec/models/event_spec.rb

@@ -23,22 +23,26 @@ describe Marty::Event do
     @old_start = '1970-01-01 08:00:00'
     @old_end = '1970-01-01 09:00:00'
     # add events
-    [['testcl1',  123, @time, nil,            nil,     'AVM',     'a comment'],
-     ['testcl1',  123, @time + 2.second, nil,nil,     'CRA',     'b comment'],
-     ['testcl1',  123, @time + 4.seconds, nil,10000,     'PRICING', 'c comment'],
-     ['testcl2', 123, @time, nil,             2, 'AVM',     'e comment'],
-     ['testcl2', 123, @time + 1.second, nil,  4, 'CRA',     'f comment'],
+    [['testcl1',  123, @time, nil,            nil,     'AVM',     'a comment',
+      nil],
+     ['testcl1',  123, @time + 2.second, nil,nil,     'CRA',     'b comment',
+      nil],
+     ['testcl1',  123, @time + 4.seconds, nil,10000,     'PRICING', 'c comment',
+      nil],
+     ['testcl2', 123, @time, nil,             2, 'AVM',     'e comment', nil],
+     ['testcl2', 123, @time + 1.second, nil,  4, 'CRA',     'f comment', nil],
      ['testcl2', 123, Time.zone.parse(@old_start),
-      Time.zone.parse(@old_end), nil, 'PRICING', 'old event'],
+      Time.zone.parse(@old_end), nil, 'PRICING', 'old event', 0],
     ].each do
-      |klass, subjid, startdt, enddt, expire, op, comment|
+      |klass, subjid, startdt, enddt, expire, op, comment, error|
       Marty::Event.create!(klass: klass,
                          subject_id: subjid,
                          start_dt: startdt,
                          end_dt: enddt,
                          expire_secs: expire,
                          comment: comment,
-                         enum_event_operation: op)
+                         enum_event_operation: op,
+                         error: error)
     end
 
 
@@ -48,6 +52,12 @@ describe Marty::Event do
                                  id: 987,
                                  operation: 'PRICING'})
     res.force
+    engine = Marty::ScriptSet.new.get_engine(NAME_J)
+    res = engine.background_eval("FAILER", {"dummy" => "dummy"}, ["a"],
+                                {klass: "testcl3",
+                                 id: 654,
+                                 operation: 'PRICING'})
+    res.force rescue nil
     sleep 5
     save_clean_db(@save_file)
   end
@@ -69,7 +79,6 @@ describe Marty::Event do
       ['AVM', 'CRA', 'PRICING'])
     expect(Marty::Event.currently_running('testcl2', 123)).to eq([])
     expect(Marty::Event.currently_running('testcl3', 987)).to eq([])
-
     expect(Marty::Event.last_event('testcl1', 123)).to include(
       {"klass"=>"testcl1",
        "subject_id"=>123,
@@ -78,9 +87,8 @@ describe Marty::Event do
     expect(Marty::Event.last_event('testcl2', 123)).to include(
       {"klass"=>"testcl2",
        "subject_id"=>123,
-       "enum_event_operation"=>"CRA",
-       "comment"=>"f comment",
-       "expire_secs"=>4})
+       "enum_event_operation"=>"PRICING",
+       "comment"=>"old event"})
     expect(Marty::Event.last_event('testcl3', 987)).to include(
       {"klass"=>"testcl3",
         "subject_id"=>987,
@@ -112,9 +120,29 @@ describe Marty::Event do
   end
 
   it "misc API tests" do
-
+    ev1 = Marty::Event.where(klass: 'testcl3', subject_id: 987).first
+    ev2 = Marty::Event.where(klass: 'testcl3', subject_id: 654).first
     af = Marty::Event.all_finished
-    expect(af.count).to eq(2)
+    ev3 = Marty::Event.where(klass: 'testcl3', subject_id: 987).first
+    ev4 = Marty::Event.where(klass: 'testcl3', subject_id: 654).first
+
+    # ev1/ev2 should have null start/end
+    # ev3/ev4 should have start/end populated from promise and error status
+    expect(ev1.start_dt).to be_nil
+    expect(ev1.end_dt).to be_nil
+    expect(ev1.error).to be_falsey
+    expect(ev2.start_dt).to be_nil
+    expect(ev2.end_dt).to be_nil
+    expect(ev2.error).to be_falsey
+
+    expect(ev3.start_dt).not_to be_nil
+    expect(ev3.end_dt).not_to be_nil
+    expect(ev3.error).to be_falsey
+    expect(ev4.start_dt).not_to be_nil
+    expect(ev4.end_dt).not_to be_nil
+    expect(ev4.error).to be_truthy
+
+    expect(af.count).to eq(3)
     expect(af).to include(['testcl3', 987])
     expect(af).to include(['testcl2', 123])
     expect(af[['testcl3', 987]]).to include('PRICING')
@@ -125,7 +153,7 @@ describe Marty::Event do
     expect(Marty::Event.currently_running('testcl1', 123)).to eq(
       ['AVM', 'CRA', 'PRICING'])
     expect(Marty::Event.op_is_running?('testcl1', 123, 'AVM')).to be_truthy
-    Marty::Event.finish_event('testcl1', 123, 'AVM', 'wassup')
+    Marty::Event.finish_event('testcl1', 123, 'AVM', false, 'wassup')
     Marty::Event.clear_cache
     expect(Marty::Event.currently_running('testcl1', 123)).to eq(
       ['CRA', 'PRICING'])
@@ -138,7 +166,8 @@ describe Marty::Event do
                                  "subject_id"=>123,
                                  "enum_event_operation"=>"AVM",
                                  "comment"=>"wassup",
-                                 "expire_secs"=>nil})
+                                 "expire_secs"=>nil,
+                                 "error"=>'f'})
     Marty::Event.update_comment(ev.first, "updated")
     ev = Marty::Event.lookup_event('testcl1', 123, 'AVM')
     expect(ev.first).to include({"comment"=>"updated"})
@@ -148,11 +177,10 @@ describe Marty::Event do
     expect(Marty::Event.pretty_op(ev)).to eq('Pricing')
 
     af = Marty::Event.all_finished
-    expect(af.count).to eq(3)
+    expect(af.count).to eq(4)
     expect(af[['testcl3', 987]]).to include('PRICING')
     expect(af[['testcl1', 123]]).to include('AVM')
     expect(af[['testcl1', 123]]['AVM']).to start_with(@date_string)
-
   end
 
   it "raises on error" do
@@ -164,20 +192,24 @@ describe Marty::Event do
       to raise_error(%r!AVM is already running for testcl/1234!)
     expect {Marty::Event.create_event('testcl', 2345, 'AVM', Time.zone.now, 600,
                                      "the comment") }.not_to raise_error
-    expect {Marty::Event.finish_event('testcl', 1234, 'AVM', "new comment") }.
+    expect {Marty::Event.finish_event('testcl', 1234, 'AVM', false,
+                                      "new comment") }.
       not_to raise_error
-    expect {Marty::Event.finish_event('testcl', 1234, 'AVM', "new comment") }.
+    expect {Marty::Event.finish_event('testcl', 1234, 'AVM', false,
+                                      "new comment") }.
       to raise_error(%r!event testcl/1234/AVM not found!)
-    expect {Marty::Event.finish_event('testcl', 2345, 'AVM', 'foobar') }.
+    expect {Marty::Event.finish_event('testcl', 2345, 'AVM', false, 'foobar') }.
       not_to raise_error
-    expect {Marty::Event.finish_event('testcl', 2345, 'AVM', 'foobar') }.
+    expect {Marty::Event.finish_event('testcl', 2345, 'AVM', false, 'foobar') }.
       to raise_error(%r!event testcl/2345/AVM not found!)
+    expect {Marty::Event.finish_event('testcl', 2345, 'AVM', nil, 'foobar') }.
+      to raise_error(/error must be true or false/)
     expect {Marty::Event.create_event('testcl', 1234, 'AMV', Time.zone.now, 600,
                                       "the comment") }.
       to raise_error(%r!PG::.*invalid input value for enum.*"AMV"!)
     Marty::Event.clear_cache
     af = Marty::Event.all_finished
-    expect(af.count).to eq(4)
+    expect(af.count).to eq(5)
     expect(af).to include(['testcl', 1234])
     expect(af).to include(['testcl', 2345])
     expect(af[['testcl', 1234]]).to include('AVM')
@@ -200,7 +232,7 @@ describe Marty::Event do
 
     Marty::Event.create_event('testcl', 789, 'AVM', Time.zone.now, 600,
                               "comment")
-    Marty::Event.finish_event('testcl', 789, 'AVM', long_comment)
+    Marty::Event.finish_event('testcl', 789, 'AVM', false, long_comment)
 
     e1 = Marty::Event.lookup_event('testcl', 123, 'PRICING').first
     e2 = Marty::Event.lookup_event('testcl', 456, 'CRA').first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.17
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -436,6 +436,7 @@ files:
 - db/migrate/106_make_grid_indexes_nullable.rb
 - db/migrate/200_create_marty_event_operation_enum.rb
 - db/migrate/201_create_marty_events.rb
+- db/migrate/202_add_completion_status_to_event.rb
 - db/seeds.rb
 - gemini_deprecations.md
 - lib/marty.rb