marty 8.0.0 → 8.2.0

data/app/models/marty/promise.rb

@@ -42,6 +42,7 @@ class Marty::Promise < Marty::Base
   def set_result(res)
     # log "SETRES #{Process.pid} #{self}"
 
+    reload
     # promise must have been started and not yet ended
     if !start_dt || end_dt || result != {}
       # log "SETERR #{Process.pid} #{self}"

data/app/models/marty/user.rb

@@ -9,6 +9,13 @@ class Marty::User < Marty::Base
 
   has_many :user_roles, dependent: :destroy
 
+  has_many(
+    :notification_deliveries,
+    class_name: '::Marty::Notifications::Delivery',
+    dependent: :destroy,
+    foreign_key: :recipient_id
+  )
+
   scope :active, -> { where(active: true) }
 
   validate :verify_changes
@@ -114,6 +121,13 @@ class Marty::User < Marty::Base
      end
   end
 
+  def unread_web_notifications_count
+    notification_deliveries.where(
+      delivery_type: :web,
+      state: [:sent]
+    ).count
+  end
+
   private
 
   def verify_changes

data/app/services/marty/notifications/create.rb

@@ -0,0 +1,39 @@
+module Marty
+  module Notifications
+    module Create
+      extend Delorean::Functions
+
+      delorean_fn :call do |event_type:, text:|
+        notification, deliveries = ActiveRecord::Base.transaction do
+          notification = ::Marty::Notifications::Notification.create!(
+            event_type: event_type,
+            text: text,
+            state: :pending
+          )
+
+          # FIXME: We should consider processing deliveries in the background
+          deliveries = ::Marty::Notifications::CreateDeliveries.call(
+            notification: notification
+          )
+
+          [notification, deliveries]
+        end
+
+        deliveries.each do |delivery|
+          ::Marty::Notifications::ProcessDelivery.call(
+            delivery: delivery
+          )
+        end
+
+        notification.set_processed!
+
+        {
+          id: notification.id,
+          event_type: event_type,
+          text: text,
+          state: notification.state,
+        }
+      end
+    end
+  end
+end

data/app/services/marty/notifications/create_deliveries.rb

@@ -0,0 +1,25 @@
+module Marty
+  module Notifications
+    module CreateDeliveries
+      class << self
+        def call(notification:)
+          configs(notification).map do |config|
+            notification.deliveries.create!(
+              state: :pending,
+              delivery_type: config.delivery_type,
+              recipient: config.recipient,
+              text: config.text
+            )
+          end
+        end
+
+        def configs(notification)
+          Marty::Notifications::Config.where(
+            state: :on,
+            event_type: notification.event_type
+          )
+        end
+      end
+    end
+  end
+end

data/app/services/marty/notifications/process_delivery.rb

@@ -0,0 +1,11 @@
+module Marty
+  module Notifications
+    module ProcessDelivery
+      class << self
+        def call(delivery:)
+          delivery.processor.call(delivery: delivery)
+        end
+      end
+    end
+  end
+end

data/app/services/marty/notifications/processors/email.rb

@@ -0,0 +1,13 @@
+module Marty
+  module Notifications
+    module Processors
+      module Email
+        class << self
+          def call(delivery:)
+            raise 'Not implemented!'
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/marty/notifications/processors/sms.rb

@@ -0,0 +1,13 @@
+module Marty
+  module Notifications
+    module Processors
+      module Sms
+        class << self
+          def call(delivery:)
+            raise 'Not implemented!'
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/marty/notifications/processors/web.rb

@@ -0,0 +1,27 @@
+module Marty
+  module Notifications
+    module Processors
+      module Web
+        class << self
+          def call(delivery:)
+            delivery.set_sent!
+            notify_websocket(delivery: delivery)
+          end
+
+          private
+
+          def notify_websocket(delivery:)
+            return unless Rails.application.config.marty.enable_action_cable
+
+            unread_notifications_count = delivery.recipient&.unread_web_notifications_count
+
+            ActionCable.server.broadcast(
+              "marty_notifications_#{delivery.recipient_id}",
+              unread_notifications_count: unread_notifications_count
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/marty/promises/cancel.rb

@@ -0,0 +1,37 @@
+module Marty::Promises
+  module Cancel
+    class << self
+      def call(id)
+        ids = get_all_ids(id)
+        promises = Marty::Promise.where(id: ids)
+        jobids = promises.map(&:job_id).compact.sort
+        Delayed::Job.where(id: jobids).destroy_all
+        promises.each do |p|
+          p.update!(status: false,
+                    end_dt: p.end_dt || Time.zone.now,
+                    result: p.result + { error: 'Cancelled' })
+        end
+      end
+
+      private
+
+      # Promises are nodes/leaves on a tree. Given a promise id
+      # from anywhere on the tree, find the ids of all promises
+      # on that tree.
+      def get_all_ids(id)
+        get_base = lambda do |pid|
+          p = Marty::Promise.find_by(id: pid)
+          p.parent_id ? get_base.call(p.parent_id) : pid
+        end
+        base_id = get_base.call(id)
+        get_children = lambda do |pid|
+          children = Marty::Promise.where(parent_id: pid).pluck(:id)
+          children.present? ?
+            (children + children.map { |cid| get_children.call(cid) }).flatten :
+            children
+        end
+        [base_id] + get_children.call(base_id)
+      end
+    end
+  end
+end

data/app/services/marty/promises/delorean/create.rb

@@ -15,9 +15,13 @@ module Marty
           pid = promise_params[:_parent_id]
           if pid
             ppr = Marty::Promise.find_by(id: pid)
+            # make sure parent isn't cancelled
+            return if ppr&.result&.[]('error') == 'Cancelled'
+
             default_priority = ppr.priority if ppr
           end
           priority = promise_params['p_priority'] || default_priority
+
           promise = Marty::Promise.create(
             title: title,
             user_id: promise_params[:_user_id],

data/app/services/marty/promises/ruby/create.rb

@@ -15,10 +15,13 @@ module Marty
           pid = promise_params[:_parent_id]
           if pid
             ppr = Marty::Promise.find_by(id: pid)
+            # make sure parent isn't cancelled
+            return if ppr&.result&.[]('error') == 'Cancelled'
+
             default_priority = ppr.priority if ppr
           end
-
           priority = promise_params['p_priority'] || default_priority
+
           promise = Marty::Promise.create(
             title: title,
             user_id: promise_params[:_user_id],

data/app/views/marty/diagnostic/op.html.erb

@@ -1,5 +1,9 @@
 <!DOCTYPE html>
 <html>
+  <% if cookies[:dark_mode] == 'true' %>
+    <%= stylesheet_link_tag 'marty/dark_mode', media: 'all', 'data-turbolinks-track': 'reload' %>
+  <% end %>
+
   <head>
     <title><%=Rails.application.class.parent_name%> Diagnostic</title>
     <style type="text/css">

data/db/migrate/514_remove_marty_events.rb

@@ -3,7 +3,7 @@ class RemoveMartyEvents < ActiveRecord::Migration[4.2]
     drop_table :marty_events
 
     execute <<-SQL
-      DROP TYPE enum_event_operations;
+      DROP TYPE IF EXISTS enum_event_operations;
     SQL
   end
 

data/db/migrate/519_create_marty_notifications_event_types.rb

@@ -0,0 +1,16 @@
+class CreateMartyNotificationsEventTypes < ActiveRecord::Migration[4.2]
+  def up
+    values = ::Marty::Notifications::EventType::VALUES
+    str_values = values.map {|v| ActiveRecord::Base.connection.quote v}.join ','
+
+    execute <<-SQL
+       CREATE TYPE marty_notifications_event_types AS ENUM (#{str_values});
+    SQL
+  end
+
+  def down
+    execute <<-SQL
+       DROP TYPE marty_notifications_event_types;
+    SQL
+  end
+end

data/db/migrate/520_create_marty_notifications.rb

@@ -0,0 +1,11 @@
+class CreateMartyNotifications < ActiveRecord::Migration[4.2]
+  def change
+    create_table :marty_notifications do |t|
+      t.pg_enum :event_type, enum: :marty_notifications_event_types, null: false
+      t.string :state, null: false
+      t.text :text, null: false
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/521_create_marty_notifications_deliveries.rb

@@ -0,0 +1,22 @@
+class CreateMartyNotificationsDeliveries < ActiveRecord::Migration[4.2]
+  def change
+    create_table :marty_notifications_deliveries do |t|
+      t.integer :notification_id, null: false
+      t.integer :recipient_id
+      t.string :delivery_type, null: false
+      t.string :state, null: false
+      t.text :text, null: false, default: ''
+      t.string :error_text, null: false, default: ''
+
+      t.timestamps null: false
+    end
+
+    add_foreign_key :marty_notifications_deliveries, :marty_notifications,
+                    column: :notification_id, on_delete: :cascade
+    add_foreign_key :marty_notifications_deliveries, :marty_users,
+                    column: :recipient_id, on_delete: :nullify
+
+    add_index :marty_notifications_deliveries, [:notification_id, :recipient_id, :delivery_type],
+              unique: true, name: :index_marty_notifications_deliveries_on_n_id_r_id_and_type
+  end
+end

data/db/migrate/522_create_marty_notifications_config.rb

@@ -0,0 +1,21 @@
+class CreateMartyNotificationsConfig < ActiveRecord::Migration[4.2]
+  def change
+    create_table :marty_notifications_configs do |t|
+      t.pg_enum :event_type, enum: :marty_notifications_event_types, null: false
+      t.integer :recipient_id
+      t.string :delivery_type, null: false
+      t.string :state, null: false
+      t.text :text, null: false, default: ''
+
+      t.timestamps null: false
+    end
+
+    add_foreign_key :marty_notifications_configs, :marty_users,
+                    column: :recipient_id, on_delete: :nullify
+
+    add_index :marty_notifications_configs,
+      [:event_type, :recipient_id, :delivery_type],
+      unique: true,
+      name: :index_marty_notifications_configs_on_event_recipient_delivery
+  end
+end

data/db/sql/lookup_grid_distinct_v1.sql

@@ -37,7 +37,7 @@ DECLARE
 
   result JSONB;
   return_json JSONB;
-  
+
   error_extra JSONB;
 
   target RECORD;
@@ -58,7 +58,7 @@ BEGIN
     END IF;
   END LOOP;
 
-  FOREACH direction IN ARRAY directions LOOP 
+  FOREACH direction IN ARRAY directions LOOP
 
     IF direction = 'h' THEN
       data_grid_metadata_current := data_grid_metadata_h;
@@ -89,7 +89,7 @@ BEGIN
 
      query_index_result := empty_jsonb_array;
 
-     -- execute the SQL query that has been received before and 
+     -- execute the SQL query that has been received before and
      -- add it's (possibly multiplt) results to query_index_result variable
      FOR target IN EXECUTE query_dir_result ->> 0 USING query_dir_result -> 1 LOOP
        query_index_result := query_index_result || to_jsonb(target.index);
@@ -105,7 +105,7 @@ BEGIN
      END IF;
 
 
-     IF dis AND jsonb_array_length(query_index_result) > 1 THEN 
+     IF dis AND jsonb_array_length(query_index_result) > 1 THEN
        RAISE EXCEPTION 'matches > 1';
      END IF;
 
@@ -114,7 +114,7 @@ BEGIN
     vertical_indexes := COALESCE(vertical_indexes, empty_jsonb_array);
     horizontal_indexes := COALESCE(horizontal_indexes, empty_jsonb_array);
 
-    IF ((jsonb_array_length(vertical_indexes)) = 0 
+    IF ((jsonb_array_length(vertical_indexes)) = 0
        OR (jsonb_array_length(horizontal_indexes)) = 0)
        AND NOT data_grid_lenient
        AND NOT return_grid_data THEN
@@ -140,7 +140,7 @@ BEGIN
       result := data_grid_data -> vertical_index -> horizontal_index;
     END IF;
 
-    IF NOT return_grid_data THEN 
+    IF NOT return_grid_data THEN
       data_grid_data := NULL;
       data_grid_metadata := NULL;
     END IF;

data/lib/marty.rb

@@ -7,6 +7,7 @@
 
 # Also note that anything required here will need to require in any
 # classes that they might be overriding methods in
+require 'action_cable/engine'
 
 require 'marty/engine'
 require 'marty/railtie'
@@ -22,6 +23,7 @@ require 'marty/rails_app'
 # to the Gemfile
 require 'net-ldap'
 require 'delayed_cron_job'
+require 'state_machines-activerecord'
 
 require 'pathname'
 

data/lib/marty/diagnostic/version.rb

@@ -1,30 +1,40 @@
-module Marty::Diagnostic; class Version < Base
-  diagnostic_fn do
-    begin
-      message = `cd #{Rails.root}; git describe --tags --always;`.strip
-    rescue StandardError
-      message = error('Failed accessing git')
+module Marty::Diagnostic
+  class Version < Base
+    diagnostic_fn do
+      begin
+        submodules = `cd #{Rails.root}; git submodule`.split("\n").map do |s|
+          sha, path, tag = s.split
+          name = File.basename(path)
+          {
+            "#{name}_sha".titleize => sha[0..7],
+            "#{name}_tag".titleize => tag,
+          }
+        end.reduce(&:merge) || {}
+
+        git_tag = `cd #{Rails.root}; git describe --tags --always;`.strip
+        git = { 'Root Git' => git_tag }.merge(submodules)
+      rescue StandardError
+        git = { 'Root Git' => error('Failed accessing git') }
+      end
+      rbv = "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_PLATFORM})"
+      {
+        'Marty'                   => Marty::VERSION,
+        'Delorean'                => Delorean::VERSION,
+        'Mcfly'                   => Mcfly::VERSION,
+        'Rails'                   => Rails.version,
+        'Netzke Core'             => Netzke::Core::VERSION,
+        'Netzke Basepack'         => Netzke::Basepack::VERSION,
+        'Ruby'                    => rbv,
+        'RubyGems'                => Gem::VERSION,
+        'Database Schema Version' => db_schema,
+        'Environment'             => Rails.env,
+      }.merge(git)
     end
-    rbv = "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_PLATFORM})"
-    {
-      'Marty'                   => Marty::VERSION,
-      'Delorean'                => Delorean::VERSION,
-      'Mcfly'                   => Mcfly::VERSION,
-      'Git'                     => message,
-      'Rails'                   => Rails.version,
-      'Netzke Core'             => Netzke::Core::VERSION,
-      'Netzke Basepack'         => Netzke::Basepack::VERSION,
-      'Ruby'                    => rbv,
-      'RubyGems'                => Gem::VERSION,
-      'Database Schema Version' => db_schema,
-      'Environment'             => Rails.env,
-    }
-  end
 
-  def self.db_schema
-      Database.db_schema
-  rescue StandardError => e
-      error(e.message)
+    def self.db_schema
+        Database.db_schema
+    rescue StandardError => e
+        error(e.message)
+    end
   end
 end
-end