erp_tech_svcs 4.0.0 → 4.2.0

data/db/migrate/20150414151421_add_nested_set_columns_to_security_role.rb

@@ -0,0 +1,13 @@
+class AddNestedSetColumnsToSecurityRole < ActiveRecord::Migration
+  def change
+    add_column :security_roles, :lft, :integer unless column_exists?(:security_roles, :lft)
+    add_column :security_roles, :rgt, :integer unless column_exists?(:security_roles, :rgt)
+    add_column :security_roles, :parent_id, :integer unless column_exists?(:security_roles, :parent_id)
+
+    add_index :security_roles, :parent_id unless index_exists?(:security_roles, :parent_id)
+    add_index :security_roles, :lft unless index_exists?(:security_roles, :lft)
+    add_index :security_roles, :rgt unless index_exists?(:security_roles, :rgt)
+
+    SecurityRole.rebuild!
+  end
+end

data/db/migrate/20150609003216_update_user_for_sorcery.rb

@@ -0,0 +1,11 @@
+class UpdateUserForSorcery < ActiveRecord::Migration
+  def up
+    add_column :users, :unlock_token, :string, :default => nil unless column_exists? :users, :unlock_token
+    add_column :users, :last_login_from_ip_address, :string, :default => nil unless column_exists? :users, :last_login_from_ip_address
+  end
+
+  def down
+    remove_column :users, :unlock_token
+    remove_column :users, :last_login_from_ip_address
+  end
+end

data/db/migrate/20150819135108_add_custom_fields_to_notifications.rb

@@ -0,0 +1,5 @@
+class AddCustomFieldsToNotifications < ActiveRecord::Migration
+  def change
+    add_column :notifications, :custom_fields, :text unless column_exists?(:notifications, :custom_fields)
+  end
+end

data/db/migrate/20160122155402_add_description_to_file_asset.rb

@@ -0,0 +1,13 @@
+class AddDescriptionToFileAsset < ActiveRecord::Migration
+  def up
+    unless column_exists? :file_assets, :description
+      add_column :file_assets, :description, :string
+    end
+  end
+
+  def down
+    if column_exists? :file_assets, :description
+      remove_column :file_assets, :description
+    end
+  end
+end

data/db/migrate/20160310163060_add_created_by_updated_by_to_erp_tech_svcs.rb

@@ -0,0 +1,35 @@
+class AddCreatedByUpdatedByToErpTechSvcs < ActiveRecord::Migration
+  def up
+    %w{file_assets}.each do |table|
+
+      unless column_exists? table.to_sym, :created_by_party_id
+        add_column table.to_sym, :created_by_party_id, :integer
+
+        add_index table.to_sym, :created_by_party_id, name: "#{table}_created_by_pty_idx"
+      end
+
+      unless column_exists? table.to_sym, :updated_by_party_id
+        add_column table.to_sym, :updated_by_party_id, :integer
+
+        add_index table.to_sym, :updated_by_party_id, name: "#{table}_updated_by_pty_idx"
+      end
+
+    end
+
+  end
+
+  def down
+    %w{file_assets}.each do |table|
+
+      if column_exists? table.to_sym, :created_by_party_id
+        remove_column table.to_sym, :created_by_party_id
+      end
+
+      if column_exists? table.to_sym, :updated_by_party_id
+        remove_column table.to_sym, :updated_by_party_id
+      end
+    end
+
+  end
+
+end

data/db/migrate/20160313161611_add_tenant_id_to_audit_log.rb

@@ -0,0 +1,16 @@
+class AddTenantIdToAuditLog < ActiveRecord::Migration
+  def up
+    unless column_exists? :audit_logs, :tenant_id
+      add_column :audit_logs, :tenant_id, :integer
+
+      add_index :audit_logs, :tenant_id, name: 'audit_logs_tenant_id'
+    end
+  end
+
+  def down
+    if column_exists? :audit_log, :tenant_id
+      remove_column :audit_logs, :tenant_id
+    end
+  end
+
+end

data/lib/erp_tech_svcs.rb

@@ -1,19 +1,14 @@
-require 'aasm'
-
-#compass_ae libraries
 require 'erp_base_erp_svcs'
-
+require 'aasm'
 require 'paperclip'
 require 'delayed_job'
 require 'delayed_job_active_record'
 require 'mail_alternatives_with_attachments'
 require 'sorcery'
-require 'pdfkit'
-require 'aws'
-require 'activerecord-postgres-hstore'
+require 'wicked_pdf'
+require 'aws-sdk'
 require 'nested-hstore'
 require "erp_tech_svcs/version"
-require "erp_tech_svcs/utils/compass_logger"
 require "erp_tech_svcs/utils/default_nested_set_methods"
 require "erp_tech_svcs/utils/compass_access_negotiator"
 require "erp_tech_svcs/extensions"
@@ -21,8 +16,9 @@ require 'erp_tech_svcs/file_support'
 require 'erp_tech_svcs/sms_wrapper'
 require "erp_tech_svcs/config"
 require "erp_tech_svcs/engine"
-require 'erp_tech_svcs/sessions/delete_expired_sessions_job'
-require 'erp_tech_svcs/sessions/delete_expired_sessions_service'
 require 'erp_tech_svcs/erp_tech_svcs_audit_log'
+require 'erp_tech_svcs/delayed_jobs/notification_job'
+require 'erp_tech_svcs/delayed_jobs/delete_expired_sessions_job'
+
 module ErpTechSvcs
 end

data/lib/erp_tech_svcs/config.rb

@@ -16,7 +16,7 @@ module ErpTechSvcs
                     :file_storage,
                     :s3_cache_expires_in_minutes,
                     :session_expires_in_hours,
-                    :compass_logger_path
+                    :notification_job_delay
 
       def init!
         @defaults = {
@@ -33,7 +33,7 @@ module ErpTechSvcs
           :@s3_protocol => 'https', # Can be either 'http' or 'https'
           :@file_storage => :filesystem, # Can be either :s3 or :filesystem
           :@session_expires_in_hours => 12, # this is used by DeleteExpiredSessionsJob to purge inactive sessions from database
-          :@compass_logger_path => "#{Rails.root}/log"
+          :@notification_job_delay => '2 minutes from now'
         }
       end
 
@@ -50,6 +50,11 @@ module ErpTechSvcs
       def configure!
         @configure_blk.call(self) if @configure_blk
       end
+
+      def installation_url
+        "#{self.file_protocol}://#{self.installation_domain}"
+      end
+
     end
     init!
     reset!

data/lib/erp_tech_svcs/delayed_jobs/delete_expired_sessions_job.rb

@@ -0,0 +1,49 @@
+require "benchmark"
+
+module ErpTechSvcs
+  module DelayedJobs
+    # Delayed Job to Reset Daily Assignments to Forecast
+    class DeleteExpiredSessionsJob  
+
+      def initialize
+        @priority = 1
+      end
+  
+      def perform
+        unless Dir.exists?(File.join(Rails.root, 'log/delayed_jobs'))
+          Dir.mkdir(File.join(Rails.root, 'log/delayed_jobs'))
+        end
+
+        logger = Logger.new(File.join(Rails.root,"log/delayed_jobs/#{Rails.env}-delete_expired_sessions_job.log"), "weekly")
+        logger.level = Logger::INFO
+
+        time = Benchmark.measure do
+          begin
+            ActiveRecord::SessionStore::Session.delete_all ['updated_at < ?', ErpTechSvcs::Config.session_expires_in_hours.hours.ago]
+          rescue => ex
+            logger.error("#{Time.now}**************************************************")
+            logger.error("Job Error: #{ex.message}")
+            logger.error("Trace: #{ex.backtrace.join("\n")}")
+            logger.error("*************************************************************")
+
+            # email notification
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+          end
+        end #benchmark
+        
+        # Run once per day
+        start_time = Time.now + 1.day
+        
+        Delayed::Job.enqueue(DeleteExpiredSessionsJob.new, @priority, start_time)
+        
+        # Update job tracker
+        JobTracker.job_ran('Delete Expired Sessions', self.class.name, ("(%.4fs)" % time.real), start_time)
+      end
+
+      def self.schedule_job(schedule_dt)
+        Delayed::Job.enqueue(DeleteExpiredSessionsJob.new, @priority, schedule_dt)
+      end
+  
+    end # DeleteExpiredSessionsJob
+  end # DelayedJobs
+end # ErpTechSvcs

data/lib/erp_tech_svcs/delayed_jobs/notification_job.rb

@@ -0,0 +1,50 @@
+require 'benchmark'
+require 'chronic'
+
+module ErpTechSvcs
+  module DelayedJobs
+    class NotificationJob
+
+      def initialize
+        @priority = 1
+      end
+
+      def perform
+        unless Dir.exists?(File.join(Rails.root, 'log/delayed_jobs'))
+          Dir.mkdir(File.join(Rails.root, 'log/delayed_jobs'))
+        end
+
+        logger = Logger.new(File.join(Rails.root,"log/delayed_jobs/#{Rails.env}-notifications_job.log"), "weekly")
+        logger.level = Logger::INFO
+
+        time = Benchmark.measure do
+          begin
+            Notification.where('current_state = ?', 'pending').each do |notification|
+              notification.deliver_notification
+            end
+
+          rescue Exception => ex
+            logger.error("#{Time.now}**************************************************")
+            logger.error("Job Error: #{ex.message}")
+            logger.error("Trace: #{ex.backtrace.join("\n")}")
+            logger.error("*************************************************************")
+
+            # email notification
+            ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+          end
+        end
+
+        start_time = Chronic.parse(ErpTechSvcs::Config.notification_job_delay)
+        Delayed::Job.enqueue(ErpTechSvcs::DelayedJobs::NotificationJob.new, @priority, start_time)
+
+        #update job tracker
+        JobTracker.job_ran('Notification Job', self.class.name, ("(%.4fs)" % time.real), start_time)
+      end
+
+      def self.schedule_job(schedule_at)
+        Delayed::Job.enqueue(ErpTechSvcs::DelayedJobs::NotificationJob.new, @priority, schedule_at)
+      end
+
+    end # NotificationJob
+  end # DelayedJobs
+end # ErpTechSvcs

data/lib/erp_tech_svcs/engine.rb

@@ -9,7 +9,6 @@ module ErpTechSvcs
       include ErpTechSvcs::Extensions::ActiveRecord::HasFileAssets
       include ErpTechSvcs::Extensions::ActiveRecord::ProtectedByCapabilities
       include ErpTechSvcs::Extensions::ActiveRecord::HasCapabilityAccessors
-      include ErpTechSvcs::Extensions::ActiveRecord::HasUserDefinedData
       include ErpTechSvcs::Extensions::ActiveRecord::IsJson
       include ErpTechSvcs::Extensions::ActiveRecord::ScopedBy
     end

data/lib/erp_tech_svcs/erp_tech_svcs_audit_log.rb

@@ -3,23 +3,29 @@ module ErpTechSvcs
     class << self
 
       #log when a user logs out
-      def successful_logout(user_id)
-        user = User.find(user_id)
-        AuditLog.create(
+      def successful_logout(user)
+
+        if user.is_a? Integer
+          user = User.find(user)
+        end
+
+        AuditLog.create!(
             :party_id => user.party.id,
             :event_record => user,
             :audit_log_type => AuditLogType.find_by_type_and_subtype_iid('application','successful_logout'),
-            :description => "User #{user.username} successfully logged out."
+            :description => "User #{user.username} successfully logged out.",
+            :tenant_id => user.party.dba_organization.id
         )
       end
 
       #log when a user logs out
       def successful_login(user)
-        AuditLog.create(
+        AuditLog.create!(
             :party_id => user.party.id,
             :event_record => user,
             :audit_log_type => AuditLogType.find_by_type_and_subtype_iid('application','successful_login'),
-            :description => "User #{user.username} successfully logged in."
+            :description => "User #{user.username} successfully logged in.",
+            :tenant_id => user.party.dba_organization.id
         )
       end
 

data/lib/erp_tech_svcs/extensions.rb

@@ -8,7 +8,6 @@ require 'erp_tech_svcs/extensions/active_record/has_security_roles'
 require 'erp_tech_svcs/extensions/active_record/protected_with_capabilities'
 require 'erp_tech_svcs/extensions/active_record/has_capability_accessors'
 require 'erp_tech_svcs/extensions/active_record/acts_as_versioned'
-require 'erp_tech_svcs/extensions/active_record/has_user_defined_data'
 require 'erp_tech_svcs/extensions/active_record/is_json'
 require 'erp_tech_svcs/extensions/active_record/scoped_by'
 

data/lib/erp_tech_svcs/extensions/active_record/has_capability_accessors.rb

@@ -12,23 +12,21 @@ module ErpTechSvcs
           def has_capability_accessors
             extend HasCapabilityAccessors::SingletonMethods
             include HasCapabilityAccessors::InstanceMethods
-            
+
             has_many :capability_accessors, :as => :capability_accessor_record
           end
-
         end
-        
+
         module SingletonMethods
-          
         end
 
-        module InstanceMethods        
+        module InstanceMethods
 
           # method to get capabilities this instance does NOT have
           def capabilities_not
             Capability.joins(:capability_type).
-                      joins("LEFT JOIN capability_accessors ON capability_accessors.capability_id = capabilities.id AND capability_accessors.capability_accessor_record_type = '#{self.class.name}' AND capability_accessors.capability_accessor_record_id = #{self.id}").
-                      where("capability_accessors.id IS NULL")
+              joins("LEFT JOIN capability_accessors ON capability_accessors.capability_id = capabilities.id AND capability_accessors.capability_accessor_record_type = '#{self.class.name}' AND capability_accessors.capability_accessor_record_id = #{self.id}").
+              where("capability_accessors.id IS NULL")
           end
 
           def scope_capabilities_not(scope_type_iid)
@@ -47,7 +45,7 @@ module ErpTechSvcs
 
           def capabilities
             Capability.joins(:capability_type).joins(:capability_accessors).
-                      where(:capability_accessors => { :capability_accessor_record_type => self.class.name, :capability_accessor_record_id => self.id })
+              where(:capability_accessors => { :capability_accessor_record_type => self.class.name, :capability_accessor_record_id => self.id })
           end
 
           def scope_capabilities(scope_type_iid)
@@ -75,19 +73,6 @@ module ErpTechSvcs
             scope_capabilities('instance')
           end
 
-          # pass in (capability_type_iid, klass) or (capability) object
-          def add_capability(*capability)
-            capability_type_iid = capability.first.is_a?(Symbol) ? capability.first.to_s : capability.first
-            capability = capability_type_iid.is_a?(String) ? get_or_create_capability(capability_type_iid, capability.second) : capability.first
-            ca = CapabilityAccessor.find_or_create_by_capability_accessor_record_type_and_capability_accessor_record_id_and_capability_id(get_superclass, self.id, capability.id)
-            self.reload
-            ca
-          end
-
-          def grant_capability(*capability)
-            add_capability(*capability)
-          end
-
           def get_or_create_capability(capability_type_iid, klass)
             capability_type = convert_capability_type(capability_type_iid)
             if klass.is_a?(String)
@@ -104,6 +89,32 @@ module ErpTechSvcs
             Capability.find_by_capability_resource_type_and_capability_type_id_and_scope_type_id(klass, capability_type.id, scope_type.id)
           end
 
+          def has_capabilities?
+            !capability_accessors.empty?
+          end
+
+          # Add multiple capabilities
+          #
+          # @param _capabilities [Array] Array of Capbilities
+          def add_capabilities(_capabilities)
+            _capabilities.each do |capability|
+              add_capability(capability)
+            end
+          end
+
+          alias :grant_capabilities :add_capabilities
+
+          # pass in (capability_type_iid, klass) or (capability) object
+          def add_capability(*capability)
+            capability_type_iid = capability.first.is_a?(Symbol) ? capability.first.to_s : capability.first
+            capability = capability_type_iid.is_a?(String) ? get_or_create_capability(capability_type_iid, capability.second) : capability.first
+            ca = CapabilityAccessor.find_or_create_by_capability_accessor_record_type_and_capability_accessor_record_id_and_capability_id(get_superclass, self.id, capability.id)
+            self.reload
+            ca
+          end
+
+          alias :grant_capability :add_capability
+
           # pass in (capability_type_iid, klass) or (capability) object
           def remove_capability(*capability)
             capability_type_iid = capability.first.is_a?(Symbol) ? capability.first.to_s : capability.first
@@ -114,15 +125,31 @@ module ErpTechSvcs
             ca
           end
 
-          def revoke_capability(*capability)
-            remove_capability(*capability)
+          alias :revoke_capability :remove_capability
+
+          # Remove multiple capabilities
+          #
+          # @param _capabilities [Array] Array of Capbilities
+          def remove_capabilities(_capabilities)
+            _capabilities.each do |capability|
+              remove_capability(capability)
+            end
           end
 
-          def has_capabilities?
-            !capability_accessors.empty?
+          alias :revoke_capabilities :remove_capabilities
+
+          # Remove all current capabilities
+          #
+          def remove_all_capabilities
+            capabilities.each do |capability|
+              remove_capability(capability)
+            end
           end
 
+          alias :revoke_all_capabilities :remove_all_capabilities
+
           private
+
           def convert_capability_type(type)
             return type if type.is_a?(CapabilityType)
             return nil unless (type.is_a?(String) || type.is_a?(Symbol))
@@ -131,7 +158,8 @@ module ErpTechSvcs
             CapabilityType.create(:internal_identifier => type.to_s, :description => type.to_s.titleize)
           end
         end
-      end
-    end
-  end
-end
+
+      end # HasCapabilityAccessors
+    end # ActiveRecord
+  end # Extensions
+end # ErpTechSvcs