cats_core 1.3.40 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8791c0f14b18ed18bfdf1cfec2d9b16b7909f9992470b13343a65a841aec6fac
-  data.tar.gz: 896aed01d613d3325b1b37103d03df781fd4351309a58a6b3b6b8409e5074101
+  metadata.gz: b1563c8d3250c1cda415de5081c46f445a82f593c727be676c3f9a7041f28fa7
+  data.tar.gz: b614991a9f6a2a4046c7c4e54af584d59a33478c62b5a0c6dee77ddbbdad2e6b
 SHA512:
-  metadata.gz: 6a0557c322d36efa4d843def05f22e857293e63590d7976e505c993933bb6199f2c7eb73ec44aa28d959d1e33f0528e6106ce435d959e1059aa42812696f65b4
-  data.tar.gz: 5b6d7d296ec99ab60c9456c566616593dd11a7c0281c0f03bac39441ca97ab90e5cbd9e39acb13c7d6a5895d71a5d8371da53445712dbda01c409a8259f1667e
+  metadata.gz: ff00ffac606dfa2136aaaed05a6825238b5ae38f737f4a3790db2b94193f0108b6d394097c0828339af8aab226acf871d65ddefa68c54ad929a47e7069d9d49b
+  data.tar.gz: fd1b163787f8fc21ba49f79929f027143f1a45d74425518536d9adc4369eb33ea6ab9b96a30fb34b7cba6e9f8ba11e2f9f191acd83200debf91589cc9be490e3

data/app/controllers/cats/core/dispatch_plan_items_controller.rb

@@ -16,7 +16,8 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:dispatch_plan_id, :source_id, :destination_id, :quantity, :commodity_status)
+        params.require(:payload).permit(:dispatch_plan_id, :source_id, :destination_id, :quantity, :commodity_status,
+                                        :status)
       end
     end
   end

data/app/notifications/cats/core/allocation_notification.rb

@@ -12,15 +12,17 @@ module Cats
 
       def message
         allocation_item = params[:allocation_item]
-        commodity = allocation_item.allocation.commodity.name
+        commodity = allocation_item.dispatch_plan.commodity.name
+        source = allocation_item.source.name
+        destination = allocation_item.destination.name
         title = "Allocation Notification - #{commodity}"
         date = Date.today
         body = <<~BODY
           Commodity with the following specification has been allocated to you:
-              Batch No. = #{allocation_item.allocation.commodity.batch_no}
+              Batch No. = #{allocation_item.dispatch_plan.commodity.batch_no}
               Commodity = #{commodity}
               Quantity = #{allocation_item.quantity}
-          The commodity is expected to be delivered from #{allocation_item.from} to #{allocation_item.to}
+          The commodity is expected to be delivered from #{source} to #{destination}
         BODY
         { title: title, date: date, body: body }
       end

data/app/services/cats/core/dispatch_plan_service.rb

@@ -25,7 +25,7 @@ module Cats
           plan.dispatch_plan_items.update_all(status: DispatchPlanItem::SOURCE_AUTHORIZED)
           plan.dispatchable.allocate
         end
-        # send_notification(plan)
+        send_notification(plan)
         plan
       end
 
@@ -37,6 +37,28 @@ module Cats
       rescue ActiveRecord::RecordInvalid
         raise(StandardError, plan.errors.full_messages[0])
       end
+
+      def send_notification(allocation)
+        notification_rule = Cats::Core::NotificationRule.find_by(code: 'allocation')
+        raise(StandardError, 'Notification rule not found for allocation notification.') unless notification_rule
+
+        users = Cats::Core::User.joins(:roles).where(cats_core_roles: { name: notification_rule.roles })
+        allocation.dispatch_plan_items.each do |item|
+          location_id = item.destination_id
+
+          recipients = users.map do |user|
+            details = user.details
+            if (details.key?('warehouse') && details['warehouse'] == location_id) ||
+               (details.key?('hub') && details['hub'] == location_id)
+              user
+            end
+          end.compact
+          unless recipients.empty?
+            notification = Cats::Core::AllocationNotification.with(allocation_item: item)
+            notification.deliver(recipients)
+          end
+        end
+      end
     end
   end
 end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.40'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.40
+  version: 1.4.0
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-12 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers