dcidev_approval 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 047563f0a296d733db4828b485a0446cd2757bb3f915809808555d44719a5e44
-  data.tar.gz: 2a3fb2c40952698d8ea669a33f67bb503e5a0dfb44d6c900caef2d4ef27e1231
+  metadata.gz: acf499a815402aa955b457d3fa2db0a97a6018135c1c8814ecad4c4894eeaf62
+  data.tar.gz: 12c8dffb9dea52b6d335e0a38194344f780dbf9e7d13259d4c92892d92dbdc60
 SHA512:
-  metadata.gz: b9ef11b07ae7f35c5c21c1a1c93da4565077570d5b277786a87b913d690b9b4885703cbed14337e8ecc9c16c5c0e3f822fd6359776cac2db608069dff51619d2
-  data.tar.gz: '099759cd2d503012da3ac66a22a28fee1b67b2d07e67f0c421ae348477fd7db1898a8fed75087d2365f9dff61cc3c189219fc9184105a0fb8e11990d55684856'
+  metadata.gz: 1cd2869a8e8709375a4b82fde759ab37a7e43a41f1ceedbdf1f563e68a6ac58976c950b8b1088ca8bd7c50ee81e42a8d744bd207d5a5819d23d967fa6be8f242
+  data.tar.gz: 844432fe9092b9918d238ce1ff730dd4028993c087665f26c8361518f49d7c5a189362a7a987c2fc3a92fcb81ecd94cadcd651d3311649fa62e4a79357718e80

data/lib/dcidev_approval.rb

@@ -1,170 +1,150 @@
 # frozen_string_literal: true
 
 module DcidevApproval
-  def self.included(base)
-    base.send :include, InstanceMethods
-    base.extend ClassMethods
-  end
-
-  module InstanceMethods
-    def changes_present?(changes)
-      present = false
-      changes.each do |k, v|
-        if eval("self.#{k}") != v
-          present = true
-          break
-        end
-      rescue StandardError => _e
-      end
-      present
-    end
-
-    def waiting_approval?
-      %w[pending_update pending_delete].include?(change_status) || status == 'waiting'
-    end
-
-    def pending_insert?
-      change_status.nil? && %w[waiting rejected].include?(status)
-    end
-
-    def pending_update?
-      change_status == 'pending_update'
-    end
-
-    def pending_delete?
-      change_status == 'pending_delete'
-    end
-
-    def approved?
-      status == 'approved' || change_status.nil?
-    end
-
-    def rejected?
-      status == 'rejected'
-    end
-
-    def waiting?
-      status == 'waiting'
-    end
-
-    def last_modified_by
-      # p self.audit_trail
-      log = activity_logs.where(activity_type: %w[update delete]).limit(1).order(created_at: :desc).try(:first)
-      {
-        modified_by: log.present? ? log.try(:agent).try(:name).to_s + " (#{log.try(:agent).try(:username)} | #{log.try(:agent).try(:roles).try(:first).try(:name)})" : nil,
-        modified_at: log.present? ? log.try(:created_at) || try(:updated_at) || try(:created_at) : nil
-      }
-    end
-
-    def created_by
-      log = activity_logs.order(created_at: :desc).limit(1).try(:first)
-      {
-        created_by: log.present? && log.try(:agent).try(:name).present? ? log.try(:agent).try(:name).to_s + " (#{log.try(:agent_role).try(:name)})" : 'System',
-        created_at: try(:created_at) || log.try(:created_at)
-      }
-    end
-
-    def last_approved_by
-      last_approve = activity_logs.where(activity_type: 'approve').limit(1).order(created_at: :desc).try(:first)
-      last_entry = activity_logs.limit(1).order(created_at: :desc).try(:first)
-      {
-        approved_by: last_approve.try(:id) == last_entry.try(:id) ? last_approve.try(:agent).try(:name).to_s + " (#{last_approve.try(:agent_role).try(:name)})" : nil,
-        approved_at: last_approve.try(:id) == last_entry.try(:id) ? last_approve.try(:created_at) : nil
-      }
-    end
-
-    def approve_changes
-      if change_status.nil? && %w[waiting rejected].include?(status) && !update(status: :approved, data_changes: nil, change_status: nil)
-        raise errors.full_messages.join(', ')
-        # ActivityLog.write("Approve insert to #{self.class.to_s}", request, agent, menu, self) if params.log
-        # self.delay(queue: "reorder_#{self.id}", priority: 0).reorder if self.class.column_names.include?("view_order")
-
-      end
-
-      case change_status
-      when 'pending_update'
-        raise errors.full_messages.join(', ') unless update_by_params(data_changes, false)
-        raise errors.full_messages.join(', ') unless update(status: :approved, data_changes: nil, change_status: nil)
-      # ActivityLog.write("Approve update to #{self.class.to_s}", request, agent, menu, self) if params.log
-      # self.delay(queue: "reorder_#{self.id}", priority: 0).reorder if self.class.column_names.include?("view_order")
-
-      when 'pending_delete'
-        destroy
-      end
-    end
-
-    def delete_changes
-      # return unless %w[pending_update pending_delete].include? self.change_status
-      raise errors.full_messages.join(', ') unless update(data_changes: nil, change_status: nil, status: status == 'waiting' ? :rejected : :approved)
-      # ActivityLog.write("Reject changes to #{self.class.to_s}", request, agent, menu, self) if params.log
-    end
-
-    def edit_data(params, agent, bypass = true)
-      raise 'data still waiting for approval' if waiting_approval?
-
-      if bypass
-        raise errors.full_messages.join(', ') unless update_by_params(params, false)
-      # ActivityLog.write("Edit #{self.class.to_s}", request, agent, menu, self) if params.log
-      elsif changes_present?(params)
-        ActiveRecord::Base.transaction do
-          data = if agent.is_admin? || status == 'waiting'
-                   params
-                 else
-                   {
-                     change_status: :pending_update, data_changes: agent.is_admin? ? nil : params
-                   }
-                 end
-          raise errors.full_messages.join(', ') unless update_by_params(data, false)
-        end
-        # ActivityLog.write("#{agent.is_admin? ? nil : "Request "}Edit #{self.class.to_s}", request, agent, menu, self) if params.log
-      end
-      yield self
-    end
-
-    def approval(params)
-      case params.status
-      when 'approved'
-        approve_changes
-      when 'rejected'
-        delete_changes
-      end
-      yield self
-    end
-
-    def delete_data(agent, bypass = true)
-      raise 'data still waiting for approval' if waiting_approval?
-
-      if bypass || agent.is_admin?
-        ActiveRecord::Base.transaction do
-          # ActivityLog.write("Delete #{self.class.to_s}", request, agent, menu, self) if params.log
-          raise errors.full_messages.join(', ') unless destroy
-        end
-      else
-        raise errors.full_messages.join(', ') unless update(change_status: :pending_delete)
-        # ActivityLog.write("Request Delete #{self.class.to_s}", request, agent, menu, self) if params.log
-      end
-      yield true
+    def self.included(base)
+        base.send :include, InstanceMethods
+        base.extend ClassMethods
+    end
+    
+    module InstanceMethods
+        def changes_present?(changes)
+            present = false
+            changes.each do |k, v|
+                if eval("self.#{k}") != v
+                    present = true
+                    break
+                end
+            rescue StandardError => _e
+            end
+            present
+        end
+        
+        def waiting_approval?
+            %w[pending_update pending_delete].include?(change_status) || status == 'waiting'
+        end
+        
+        def pending_insert?
+            change_status.nil? && %w[waiting rejected].include?(status)
+        end
+        
+        def pending_update?
+            change_status == 'pending_update'
+        end
+        
+        def pending_delete?
+            change_status == 'pending_delete'
+        end
+        
+        def approved?
+            status == 'approved' || change_status.nil?
+        end
+        
+        def rejected?
+            status == 'rejected'
+        end
+        
+        def waiting?
+            status == 'waiting'
+        end
+        
+        def last_modified_by
+            log = audit_trails.where(activity_type: %w[update delete]).limit(1).try(:first)
+            {
+                modified_by: log.present? ? log.try(:agent).try(:name).to_s + " (#{log.try(:agent).try(:roles).try(:first).try(:name)})" : nil,
+                modified_at: log.present? ? log.try(:created_at) || try(:updated_at) || try(:created_at) : nil
+            }
+        end
+        
+        def created_by
+            log = audit_trails(:asc).where(activity_type: :create).limit(1).try(:first)
+            {
+                created_by: log.present? && log.try(:agent).try(:name).present? ? log.try(:agent).try(:name).to_s + " (#{log.try(:agent_role).try(:name)})" : 'System',
+                created_at: self.try(:created_at) || log.try(:created_at)
+            }
+        end
+        
+        def last_approved_by
+            last_approve = audit_trails.where(activity_type: :approve).limit(1).try(:first)
+            last_entry = audit_trails.limit(1).order(created_at: :desc).try(:first)
+            {
+                approved_by: last_approve.try(:id) == last_entry.try(:id) ? last_approve.try(:agent).try(:name).to_s + " (#{last_approve.try(:agent_role).try(:name)})" : nil,
+                approved_at: last_approve.try(:id) == last_entry.try(:id) ? last_approve.try(:created_at) : nil
+            }
+        end
+        
+        def approve_changes
+            if change_status.nil? && %w[waiting rejected].include?(status) && !update(status: :approved, data_changes: nil, change_status: nil)
+                raise errors.full_messages.join(', ')
+            end
+            
+            case change_status
+            when 'pending_update'
+                raise errors.full_messages.join(', ') unless update_by_params(data_changes, false)
+                raise errors.full_messages.join(', ') unless update(status: :approved, data_changes: nil, change_status: nil)
+            when 'pending_delete'
+                destroy
+            end
+        end
+        
+        def delete_changes
+            raise errors.full_messages.join(', ') unless update(data_changes: nil, change_status: nil, status: status == 'waiting' ? :rejected : :approved)
+        end
+        
+        def edit_data(params, agent, bypass = true)
+            raise 'data still waiting for approval' if waiting_approval?
+            
+            if bypass
+                raise errors.full_messages.join(', ') unless update_by_params(params, false)
+            elsif changes_present?(params)
+                ActiveRecord::Base.transaction do
+                    data = agent.is_admin? || status == 'waiting' ? params : { change_status: :pending_update, data_changes: agent.is_admin? ? nil : params }
+                    raise errors.full_messages.join(', ') unless update_by_params(data, false)
+                end
+            end
+            yield self
+        end
+        
+        def approval(params)
+            case params.status
+            when 'approved'
+                approve_changes
+            when 'rejected'
+                delete_changes
+            end
+            yield self
+        end
+        
+        def delete_data(agent, bypass = true)
+            raise 'data still waiting for approval' if waiting_approval?
+            
+            if bypass || agent.is_admin?
+                ActiveRecord::Base.transaction do
+                    raise errors.full_messages.join(', ') unless destroy
+                end
+            else
+                raise errors.full_messages.join(', ') unless update(change_status: :pending_delete)
+            end
+            yield true
+        end
     end
-  end
-
-  module ClassMethods
-    def create_data(params, agent, bypass = true)
-      if bypass
-        ActiveRecord::Base.transaction do
-          data = params.merge!({ status: :approved })
-          d = new_from_params(data)
-          raise d.errors.full_messages.join(', ') unless d.save
-
-          yield d
-          # ActivityLog.write("#{agent.is_admin? ? nil : "Request "} Add #{self.to_s}", request, agent, menu, d) if params.log
+    
+    module ClassMethods
+        def create_data(params, agent, bypass = true)
+            if bypass
+                ActiveRecord::Base.transaction do
+                    data = params.merge!({ status: :approved })
+                    d = new_from_params(data)
+                    raise d.errors.full_messages.join(', ') unless d.save
+                    
+                    yield d
+                end
+            else
+                d = new_from_params(params)
+                d.status = agent.is_admin? ? :approved : :waiting
+                raise d.errors.full_messages.join(', ') unless d.save
+                
+                yield d
+            end
         end
-      else
-        d = new_from_params(params)
-        d.status = agent.is_admin? ? :approved : :waiting
-        raise d.errors.full_messages.join(', ') unless d.save
-
-        yield d
-      end
     end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcidev_approval
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Punto Damar P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dcidev_active_record
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Logic for implementing record changes approval