cats_core 1.1.14 → 1.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 849c78b04184a39a42337994d2cf68e4be874dff4e0420e34a890ce0584658cd
-  data.tar.gz: 85b1a1ff55a91d353329eaebb38e5ff19bb2590bfa8ab2942dd5feb31a7b11c6
+  metadata.gz: eced600b25c5d8bf5d8a0b55ba7a5d116879c5ee3f346f9e5128144066c14d8c
+  data.tar.gz: e88b60c25cd88cba88f0cce8ca83fe4acf6873b99b757c791a9806f3b22569c4
 SHA512:
-  metadata.gz: 18cb896b37d1c7449e8955e7209bcf663e02b0e43d42fe0c7137f9f8a0e4be5ed1f664d8bc2b2f4e777e15b6f8b6c8efb57114cdb283cdffbc8f51dff6c75d7a
-  data.tar.gz: e477156c701bee3b6dfb5c337fb344bcb1e86d16978e0208e8a9616a7721af364ff63862045f85db2ac825dd8fc876b0198ec87f857a4844064cdf7336a8a315
+  metadata.gz: fb400975341e0ee1361e41f9cf93fdd1473af06f0bed0f06d75d36b0622766556110b3a3f75ab8b283776ff2c23a3263b5d493dd0035b27b965d2c31141eca78
+  data.tar.gz: edc3f5744ff0f9b4dde1f0b8d07649927b720540004fc891e357bcba30c9561963e4f3ece3238707496f23eb1fdf0d141fad44adbcf5c4ede25a59129c3e8717

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

@@ -8,6 +8,29 @@ module Cats
         render json: { success: true, data: serialize(receipts) }
       end
 
+      def create
+        p = model_params
+        receipt = Cats::Core::Receipt.find_by(
+          dispatch_id: p[:dispatch_id],
+          commodity_status: p[:commodity_status]
+        )
+        if receipt
+          receipt.quantity += p[:quantity]
+          if receipt.save
+            render json: { success: true, data: serialize(receipt) }
+          else
+            render json: { success: false, error: receipt.errors.full_messages[0] }, status: :unprocessable_entity
+          end
+        else
+          obj = Cats::Core::Receipt.new(model_params)
+          if obj.save
+            render json: { success: true, data: serialize(obj) }, status: :created
+          else
+            render json: { success: false, error: obj.errors.full_messages[0] }, status: :unprocessable_entity
+          end
+        end
+      end
+
       def start_stacking
         receipt = Cats::Core::Receipt.find(params[:id])
         service = ReceiptService.new

data/app/models/cats/core/commodity.rb

@@ -16,7 +16,6 @@ module Cats
 
       belongs_to :unit_of_measure
       belongs_to :source, polymorphic: true
-      belongs_to :commodity_category
 
       validates :best_use_before, presence: true
       validates :batch_no, presence: true, uniqueness: true
@@ -25,7 +24,6 @@ module Cats
       validates :arrival_status, presence: true, inclusion: { in: ARRIVAL_STATUSES }
 
       delegate(:abbreviation, to: :unit_of_measure, prefix: true)
-      delegate(:name, to: :commodity_category, prefix: true)
       delegate(:reference_no, to: :source, prefix: true)
 
       def set_approved
@@ -33,6 +31,10 @@ module Cats
 
         self.approved = false
       end
+
+      def name
+        source.commodity_category.name
+      end
     end
   end
 end

data/app/models/cats/core/gift_certificate.rb

@@ -2,10 +2,17 @@ module Cats
   module Core
     class GiftCertificate < ApplicationRecord
       belongs_to :donation
+      belongs_to :commodity_category
+      belongs_to :unit_of_measure
 
       validates :reference_no, presence: true, uniqueness: true
-      validates :gift_date, presence: true
+      validates :gift_date, :quantity, presence: true
+      validates :quantity, numericality: { greater_than: 0 }
 
+      delegate(:name, to: :commodity_category, prefix: true)
+      delegate(:abbreviation, to: :unit_of_measure, prefix: true)
+
+      before_validation :set_commodity_category
       after_create :update_donation
 
       def update_donation
@@ -15,6 +22,14 @@ module Cats
         donation.active = true
         donation.save!
       end
+
+      def set_commodity_category
+        return unless donation
+
+        return if commodity_category == donation.commodity_category
+
+        self.commodity_category = donation.commodity_category
+      end
     end
   end
 end

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

@@ -0,0 +1,27 @@
+module Cats
+  module Core
+    class DispatchNotification < Noticed::Base
+      deliver_by :database
+
+      param :dispatch
+
+      def message
+        dispatch = params[:dispatch]
+        title = 'Dispatch Notification'
+        date = Date.today
+        body = <<~BODY
+          Commodity with the following details has been dispatched to you:
+              Dispatch Ref. = #{dispatch.reference_no}
+              Batch No. = #{dispatch.allocation_item.allocation.commodity.batch_no}
+              Commodity = #{dispatch.allocation_item.allocation.commodity.name}
+              Allocated Quantity = #{dispatch.allocation_item.quantity}
+              Quantity = #{dispatch.quantity}
+              Truck Plate No. = #{dispatch.plate_no}
+              Driver Name = #{dispatch.driver_name}
+              Driver Phone = #{dispatch.driver_phone}
+        BODY
+        { title: title, date: date, body: body }
+      end
+    end
+  end
+end

data/app/serializers/cats/core/commodity_serializer.rb

@@ -1,9 +1,9 @@
 module Cats
   module Core
     class CommoditySerializer < ActiveModel::Serializer
-      attributes :id, :batch_no, :description, :unit_of_measure_id, :unit_of_measure_abbreviation, :source_id,
+      attributes :id, :name, :batch_no, :description, :unit_of_measure_id, :unit_of_measure_abbreviation, :source_id,
                  :source_type, :source_reference_no, :quantity, :best_use_before, :volume_per_metric_ton,
-                 :commodity_category_id, :commodity_category_name, :arrival_status, :approved
+                 :arrival_status, :approved
     end
   end
 end

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

@@ -109,6 +109,7 @@ module Cats
         dispatch.save
         transactions = Cats::Core::DispatchTransaction.where(destination: dispatch)
         transactions.each(&:commit)
+        send_notification(dispatch)
         dispatch
       end
 
@@ -131,6 +132,25 @@ module Cats
 
         dispatch
       end
+
+      def send_notification(dispatch)
+        notification_rule = Cats::Core::NotificationRule.find_by(code: 'dispatch')
+        raise(StandardError, 'Notification rule not found for dispatch notification.') unless notification_rule
+
+        users = Cats::Core::User.joins(:roles).where(cats_core_roles: { name: notification_rule.roles })
+        location_id = dispatch.allocation_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
+        return if recipients.empty?
+
+        notification = DispatchNotification.with(dispatch: dispatch)
+        notification.deliver(recipients)
+      end
     end
   end
 end

data/db/migrate/20210717032602_create_cats_core_gift_certificates.rb

@@ -15,7 +15,15 @@ class CreateCatsCoreGiftCertificates < ActiveRecord::Migration[6.1]
       t.integer :purchase_year
       t.date :expiry_date
       t.string :bill_of_lading_no
-      t.float :amount, null: false
+      t.float :quantity, null: false
+      t.references :commodity_category,
+                   null: false,
+                   index: { name: 'gc_on_cc_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.references :unit_of_measure,
+                   null: false,
+                   index: { name: 'uom_on_gc_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
       t.float :estimated_price
       t.float :estimated_tax
 

data/db/migrate/20210717033223_create_cats_core_commodities.rb

@@ -6,10 +6,6 @@ class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'uom_on_commodities_indx' },
                    foreign_key: { to_table: :cats_core_unit_of_measures }
-      t.references :commodity_category,
-                   null: false,
-                   index: { name: 'cc_on_commodities_indx' },
-                   foreign_key: { to_table: :cats_core_commodity_categories }
       t.references :source, polymorphic: true
       t.float :quantity, null: false
       t.string :description

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.14'.freeze
+    VERSION = '1.1.18'.freeze
   end
 end

data/spec/factories/cats/core/commodities.rb

@@ -3,7 +3,6 @@ FactoryBot.define do
     batch_no { FFaker::Name.name }
     description { FFaker::Name.name }
     unit_of_measure
-    commodity_category
     source factory: :gift_certificate
     quantity { 100 }
     best_use_before { Date.today + 2.month }

data/spec/factories/cats/core/gift_certificates.rb

@@ -3,13 +3,15 @@ FactoryBot.define do
     reference_no { FFaker::Name.name }
     gift_date { Date.today - 1.month }
     donation
+    commodity_category { donation.commodity_category }
+    unit_of_measure
     vessel { FFaker::Name.name }
     port { FFaker::Name.name }
     customs_declaration_no { FFaker::Name.name }
     purchase_year { 1 }
     expiry_date { Date.today + 6.month }
     bill_of_lading_no { FFaker::Name.name }
-    amount { 1.5 }
+    quantity { 1.5 }
     estimated_price { 1.5 }
     estimated_tax { 1.5 }
   end

data/spec/factories/cats/core/locations.rb

@@ -20,4 +20,9 @@ FactoryBot.define do
     location_type { Cats::Core::Location::WOREDA }
     parent
   end
+
+  factory :zone, parent: :location, class: 'Cats::Core::Location' do
+    location_type { Cats::Core::Location::ZONE }
+    parent
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.18
 platform: ruby
 authors:
 - Henock L.
@@ -286,6 +286,7 @@ files:
 - app/models/cats/core/transporter.rb
 - app/models/cats/core/unit_of_measure.rb
 - app/models/cats/core/user.rb
+- app/notifications/cats/core/dispatch_notification.rb
 - app/notifications/cats/core/simple_notification.rb
 - app/serializers/cats/core/commodity_category_serializer.rb
 - app/serializers/cats/core/commodity_serializer.rb