dcidev_approval 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e97350e7fc396ea5b6badf639f46c97c256de119290e7f4cf209a29b55c13fc2
-  data.tar.gz: 32378050bd803f53adf02652f4d5502b871e2ea6ce7aed380970a395d1562761
+  metadata.gz: 047563f0a296d733db4828b485a0446cd2757bb3f915809808555d44719a5e44
+  data.tar.gz: 2a3fb2c40952698d8ea669a33f67bb503e5a0dfb44d6c900caef2d4ef27e1231
 SHA512:
-  metadata.gz: 59b9cf658199b5dd33f76c3eb22f6d302718a908f220d986a46d9fe90a28f82b490fbc31993a36193f555cadcd5bed77ef91f73c8276a513af210db61aa7f53b
-  data.tar.gz: f800249db88dacaafadfaa400946f602753c558288e6f0671c25c780de21b3fd4660d4e4954472ec8d1264fde3b3214d9c24dee755284224d2cbb146979d85de
+  metadata.gz: b9ef11b07ae7f35c5c21c1a1c93da4565077570d5b277786a87b913d690b9b4885703cbed14337e8ecc9c16c5c0e3f822fd6359776cac2db608069dff51619d2
+  data.tar.gz: '099759cd2d503012da3ac66a22a28fee1b67b2d07e67f0c421ae348477fd7db1898a8fed75087d2365f9dff61cc3c189219fc9184105a0fb8e11990d55684856'

data/lib/dcidev_approval.rb

@@ -1,147 +1,146 @@
+# frozen_string_literal: true
+
 module DcidevApproval
-  def self.included base
+  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|
-        begin
-          if eval("self.#{k}") != v
-            present = true
-            break
-          end
-        rescue => _
+        if eval("self.#{k}") != v
+          present = true
+          break
         end
+      rescue StandardError => _e
       end
-      return present
+      present
     end
 
     def waiting_approval?
-      %w[pending_update pending_delete].include?(self.change_status) || self.status == "waiting"
+      %w[pending_update pending_delete].include?(change_status) || status == 'waiting'
     end
 
     def pending_insert?
-      self.change_status.nil? && %w[waiting rejected].include?(self.status)
+      change_status.nil? && %w[waiting rejected].include?(status)
     end
 
     def pending_update?
-      self.change_status == "pending_update"
+      change_status == 'pending_update'
     end
 
     def pending_delete?
-      self.change_status == "pending_delete"
+      change_status == 'pending_delete'
     end
 
     def approved?
-      self.status == "approved" || self.change_status.nil?
+      status == 'approved' || change_status.nil?
     end
 
     def rejected?
-        self.status == "rejected"
+      status == 'rejected'
     end
 
     def waiting?
-        self.status == "waiting"
+      status == 'waiting'
     end
 
     def last_modified_by
       # p self.audit_trail
-      if self.try(:change_status).present? && self.try(:change_status) == 'pending_delete'
-        log = self.activity_logs.where("activity LIKE '%delete%'").limit(1).order(created_at: :desc).try(:first)
-      else
-        log = self.activity_logs.where("activity LIKE '%edit%'").limit(1).order(created_at: :desc).try(:first)
-      end
+      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).to_s} | #{log.try(:agent).try(:roles).try(:first).try(:name)})" : nil,
-        modified_at: log.present? ? log.try(:created_at) || self.try(:updated_at) || self.try(:created_at) : nil
+        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 = self.activity_logs.try(:first)
+      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).try(:username).to_s} | #{log.try(:agent).try(:roles).try(:first).try(:name)})" : "System",
-        created_at: self.try(:created_at) || log.try(:created_at)
+        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 = self.activity_logs.where("activity LIKE '%approv%'").limit(1).order(created_at: :desc).try(:first)
-      last_entry = self.activity_logs.last
+      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).try(:username).to_s} | #{last_approve.try(:agent).try(:roles).try(:first).try(:name)})"  : nil,
+        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 self.change_status.nil? && %w[waiting rejected].include?(self.status)
-        raise self.errors.full_messages.join(", ") unless self.update(status: :approved, data_changes: nil, change_status: nil)
+      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
-      if self.change_status == "pending_update"
-        raise self.errors.full_messages.join(", ") unless self.update_by_params(self.data_changes, false)
-        raise self.errors.full_messages.join(", ") unless self.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")
 
-      elsif self.change_status == "pending_delete"
-        raise self.errors.full_messages.join(", ") unless self.update(change_status: nil, data_changes: nil)
-        ActiveRecord::Base.transaction do
-          # ActivityLog.write("Approve delete to #{self.class.to_s}", request, agent, menu, self) if params.log
-          self.try(:destroy)
-        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 self.errors.full_messages.join(", ") unless self.update(data_changes: nil, change_status: nil, status: self.status == "waiting" ? :rejected : :approved)
+      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 self.waiting_approval?
+      raise 'data still waiting for approval' if waiting_approval?
+
       if bypass
-        raise self.errors.full_messages.join(", ") unless self.update_by_params(params, false)
-        # ActivityLog.write("Edit #{self.class.to_s}", request, agent, menu, self) if params.log
-      else
-        if self.changes_present?(params)
-          ActiveRecord::Base.transaction do
-            data = (agent.is_admin? || self.status == "waiting") ? params : { change_status: :pending_update, data_changes: agent.is_admin? ? nil : params }
-            raise self.errors.full_messages.join(", ") unless self.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
+        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)
-      if params.status == "approved"
-        self.approve_changes
-      elsif params.status == "rejected"
-        self.delete_changes
+      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 self.waiting_approval?
+      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 self.errors.full_messages.join(", ") unless self.destroy
+          raise errors.full_messages.join(', ') unless destroy
         end
       else
-        raise self.errors.full_messages.join(", ") unless self.update(change_status: :pending_delete)
+        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
@@ -153,18 +152,19 @@ module DcidevApproval
       if bypass
         ActiveRecord::Base.transaction do
           data = params.merge!({ status: :approved })
-          d = self.new_from_params(data)
-          raise d.errors.full_messages.join(", ") unless d.save
+          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
         end
       else
-        d = self.new_from_params(params)
+        d = new_from_params(params)
         d.status = agent.is_admin? ? :approved : :waiting
-        raise d.errors.full_messages.join(", ") unless d.save
+        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.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Punto Damar P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dcidev_active_record