cats_core 1.3.11 → 1.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07bfd5b8cfedc80be5973e4c41ab660e71e1cc55dafea9dc3f0ad9669ce54382
-  data.tar.gz: 44265ec189d02cbb4e8553c3f2a837f78275a03a3a82d5c33e1a43f5695592e8
+  metadata.gz: 2ad7f2aaa0c106926140445109463f49c20ef3c4d7336de19a4f99abe4152b48
+  data.tar.gz: ffb46327fe5ab23994d9ada4ab2d8cbdcfba90f7f44436a8f95b87bb8e9fc21d
 SHA512:
-  metadata.gz: c06175c94d4b3a39e011355104a963553d271a296e12f6e72af2e541d94aa2cf53a7898b953416f014012d6dddfa5738ba07d52e268193d7aab4103a692746b3
-  data.tar.gz: a21021e5054816d3ede7ac9ecadb7746bd2f9f62a43f977d90452350989003398fcb807aa59d15ff4a87975a7dd88debbdf7ae3ee1fc992ffbb6604aab77a025
+  metadata.gz: e7ec684441796002b858da2a27ae38eecc14dea715682ea44f361434af24324236ddcd1ecd178dca5b9f44e99442341b6a667e43a0de9afafe12f37b21619628
+  data.tar.gz: 8887e74996a6a483da128576e049b630d20c0deb097d6e309a96be5421e11794b4e2033b8a25ee26f08fcb8de40e0a9e592336f4b97b79a1e71461364c0215bd

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

@@ -15,7 +15,8 @@ module Cats
             end
 
             payload = {
-              id: user.id, email: user.email, first_name: user.first_name, last_name: user.last_name, roles: roles
+              id: user.id, email: user.email, first_name: user.first_name, last_name: user.last_name, roles: roles,
+              details: user.details
             }
             jwt = Cats::Core::TokenAuthService.issue(payload)
             render json: { token: jwt, user: payload }

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

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

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

@@ -14,13 +14,16 @@ module Cats
       end
 
       def create
-        obj = Cats::Core::DispatchPlan.new(model_params)
-        obj.prepared_by = current_user
-        if obj.save
-          render json: { success: true, data: serialize(obj) }, status: :created
+        service = DispatchPlanService.new
+
+        data = service.create(model_params, current_user)
+        if data[0]
+          render json: { success: true, data: serialize(data[1]) }, status: :created
         else
-          render json: { success: false, error: obj.errors.full_messages[0] }, status: :unprocessable_entity
+          render json: { success: false, error: data[1].errors.full_messages[0] }, status: :unprocessable_entity
         end
+      rescue StandardError => e
+        render json: { success: false, error: e.message }
       end
 
       def approve
@@ -34,7 +37,7 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:reference_no, :request_id)
+        params.require(:payload).permit(:reference_no, :request_id, :commodity_id)
       end
     end
   end

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

@@ -8,12 +8,18 @@ module Cats
       belongs_to :request, polymorphic: true, optional: true
       belongs_to :prepared_by, class_name: 'Cats::Core::User'
       belongs_to :approved_by, class_name: 'Cats::Core::User', optional: true
+      belongs_to :commodity
 
       has_many :dispatch_plan_items
 
       validates :reference_no, presence: true, uniqueness: true
       validates :status, inclusion: { in: STATUSES }
 
+      delegate(:batch_no, to: :commodity, prefix: true)
+      delegate(:name, to: :commodity, prefix: true)
+      delegate(:quantity, to: :commodity, prefix: true)
+      delegate(:reference_no, to: :request, prefix: true, allow_nil: true)
+
       def approve
         raise(StandardError, 'Dispatch plan already approved.') if status == APPROVED
 

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

@@ -7,6 +7,7 @@ module Cats
       belongs_to :dispatch_plan
       has_many :dispatches
 
+      validates :commodity_status, presence: true, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
       validates :quantity, presence: true, numericality: { greater_than: 0 }
 
       delegate(:reference_no, to: :dispatch_plan, prefix: :plan, allow_nil: true)

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

@@ -2,15 +2,31 @@ module Cats
   module Core
     class MonthlyPlan < ApplicationRecord
       belongs_to :plan
-      belongs_to :regional_request
+      belongs_to :region, class_name: 'Cats::Core::Location'
 
       has_many :monthly_plan_items
+      has_many :monthly_plan_item_details, through: :monthly_plan_items
       has_many :monthly_rations
 
       validates :reference_no, presence: true, uniqueness: true
       validates :status, presence: true, inclusion: { in: Cats::Core::Plan::STATUSES }
+      validates :no_of_days, :month, presence: true, numericality: { greater_than: 0 }
+      validate :validate_month, :validate_region
 
-      delegate(:reference_no, to: :regional_request, prefix: 'request')
+      delegate(:reference_no, to: :plan, prefix: true)
+      delegate(:name, to: :region, prefix: true)
+
+      def validate_month
+        return unless month
+
+        errors.add(:month, 'cannot be greater than 12.') if month > 12
+      end
+
+      def validate_region
+        return unless region
+
+        errors.add(:region, 'is not valid.') unless region.location_type == Cats::Core::Location::REGION
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Cats
   module Core
     class MonthlyPlanItemDetail < ApplicationRecord
       belongs_to :monthly_plan_item
-      belongs_to :ration_item
+      belongs_to :monthly_ration
 
       validates :amount, presence: true, numericality: { greater_than: 0 }
     end

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

@@ -6,6 +6,10 @@ module Cats
       belongs_to :monthly_plan
 
       validates :amount, :no_of_days, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:name, to: :commodity_category, prefix: true)
+      delegate(:abbreviation, to: :unit_of_measure, prefix: true)
+      delegate(:reference_no, to: :monthly_plan, prefix: true)
     end
   end
 end

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

@@ -9,11 +9,13 @@ module Cats
 
       BELG = 'Belg'.freeze
       MEHER = 'Meher'.freeze
-      SEASONS = [BELG, MEHER].freeze
+      ANNUAL = 'Annual'.freeze
+      SEASONS = [BELG, MEHER, ANNUAL].freeze
 
       belongs_to :program
       belongs_to :ration, optional: true
       has_many :plan_items
+      has_many :plan_item_details, through: :plan_items
 
       validates :reference_no, :year, :status, presence: true
       validates :season, presence: true, inclusion: { in: SEASONS }

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

@@ -3,7 +3,8 @@ module Cats
     class RhnRequest < ApplicationRecord
       DRAFT = 'Draft'.freeze
       APPROVED = 'Approved'.freeze
-      STATUSES = [DRAFT, APPROVED].freeze
+      ALLOCATED = 'Allocated'.freeze
+      STATUSES = [DRAFT, APPROVED, ALLOCATED].freeze
 
       belongs_to :commodity
 
@@ -35,6 +36,11 @@ module Cats
         self.status = APPROVED
         save!
       end
+
+      def allocate
+        self.status = ALLOCATED
+        save!
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Cats
   module Core
     class DispatchPlanItemSerializer < ActiveModel::Serializer
       attributes :id, :dispatch_plan_id, :plan_reference_no, :source_id, :source_name, :destination_id,
-                 :destination_name, :quantity, :source_location_type, :destination_location_type
+                 :destination_name, :quantity, :source_location_type, :destination_location_type, :commodity_status
     end
   end
 end

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

@@ -1,7 +1,8 @@
 module Cats
   module Core
     class DispatchPlanSerializer < ActiveModel::Serializer
-      attributes :id, :reference_no, :status, :request_id, :upstream
+      attributes :id, :reference_no, :status, :request_id, :commodity_id, :commodity_name, :commodity_batch_no,
+                 :commodity_quantity, :request_reference_no, :upstream
     end
   end
 end

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

@@ -1,7 +1,27 @@
-class DispatchPlanService
-  def approve(plan)
-    plan.approve
-    send_notification(plan)
-    plan
+module Cats
+  module Core
+    class DispatchPlanService
+      def approve(plan)
+        plan.approve
+        send_notification(plan)
+        plan
+      end
+
+      def create(params, user)
+        plan = Cats::Core::DispatchPlan.new(params)
+        raise 'Commodity is not assigned for plan.' unless plan.commodity_id || plan.request_id
+
+        unless plan.commodity_id
+          request = Cats::Core::RhnRequest.find(plan.request_id)
+          plan.commodity_id = request.commodity_id
+          plan.request_type = 'Cats::Core::RhnRequest'
+        end
+        plan.prepared_by = user
+        result = plan.save
+        plan.request.allocate if result && plan.request_id
+
+        [result, plan]
+      end
+    end
   end
 end

data/db/migrate/20210718043328_create_cats_core_dispatch_plans.rb

@@ -6,6 +6,10 @@ class CreateCatsCoreDispatchPlans < ActiveRecord::Migration[6.1]
       t.string :status, null: false, default: 'Draft'
       t.references :request, polymorphic: true
       t.boolean :upstream, null: false, default: false
+      t.references :commodity,
+                   null: false,
+                   index: { name: 'commodity_on_dp_indx' },
+                   foreign_key: { to_table: :cats_core_commodities }
 
       t.references :prepared_by,
                    null: false,

data/db/migrate/20210718043401_create_cats_core_dispatch_plan_items.rb

@@ -18,6 +18,7 @@ class CreateCatsCoreDispatchPlanItems < ActiveRecord::Migration[6.1]
                    index: { name: 'dpi_on_destination_indx'},
                    foreign_key: { to_table: :cats_core_locations }
       t.float :quantity, null: false
+      t.string :commodity_status, null: false, default: 'Good'
 
       t.timestamps
     end

data/db/migrate/20220107121752_create_cats_core_monthly_plans.rb

@@ -2,15 +2,17 @@ class CreateCatsCoreMonthlyPlans < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_monthly_plans do |t|
       t.string :reference_no, unique: true
+      t.integer :month, null: false
+      t.integer :no_of_days, null: false
       t.string :status, null: false, default: 'Draft'
       t.references :plan,
                    null: false,
                    index: { name: 'plan_on_mp_indx' },
                    foreign_key: { to_table: :cats_core_plans }
-      t.references :regional_request,
+      t.references :region,
                    null: false,
-                   index: { name: 'rr_on_mp_indx' },
-                   foreign_key: { to_table: :cats_core_regional_requests }
+                   index: { name: 'region_on_mp_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
 
       t.timestamps
     end

data/db/migrate/20220107132433_create_cats_core_monthly_plan_item_details.rb

@@ -5,10 +5,10 @@ class CreateCatsCoreMonthlyPlanItemDetails < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'mpi_on_mpid_indx' },
                    foreign_key: { to_table: :cats_core_monthly_plan_items }
-      t.references :ration_item,
+      t.references :monthly_ration,
                    null: false,
-                   index: { name: 'ri_on_mpid_indx' },
-                   foreign_key: { to_table: :cats_core_ration_items }
+                   index: { name: 'ri_on_mr_indx' },
+                   foreign_key: { to_table: :cats_core_monthly_rations }
       t.float :amount, null: false
 
       t.timestamps

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.11'.freeze
+    VERSION = '1.3.16'.freeze
   end
 end

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

@@ -5,5 +5,6 @@ FactoryBot.define do
     destination factory: :location
     dispatch_plan
     quantity { 100 }
+    commodity_status { Cats::Core::Commodity::GOOD }
   end
 end

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

@@ -4,6 +4,7 @@ FactoryBot.define do
     status { Cats::Core::DispatchPlan::DRAFT }
     request { nil }
     upstream { false }
+    commodity
     prepared_by factory: :user
     approved_by { nil }
   end

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :monthly_plan_item_detail, class: 'Cats::Core::MonthlyPlanItemDetail' do
     monthly_plan_item
-    ration_item
+    monthly_ration
     amount { 150 }
   end
 end

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

@@ -3,6 +3,8 @@ FactoryBot.define do
     reference_no { FFaker::Name.name }
     status { Cats::Core::Plan::DRAFT }
     plan
-    regional_request
+    region factory: :location
+    month { 1 }
+    no_of_days { 30 }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.11
+  version: 1.3.16
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -286,7 +286,6 @@ files:
 - app/models/cats/core/ration_item.rb
 - app/models/cats/core/receipt.rb
 - app/models/cats/core/receipt_transaction.rb
-- app/models/cats/core/regional_request.rb
 - app/models/cats/core/rhn_request.rb
 - app/models/cats/core/role.rb
 - app/models/cats/core/role_menu.rb
@@ -385,11 +384,10 @@ files:
 - db/migrate/20211229160128_create_cats_core_contract_items.rb
 - db/migrate/20211229160129_create_cats_core_commodity_substitutions.rb
 - db/migrate/20220103152802_create_cats_core_tenderers.rb
-- db/migrate/20220105084347_create_cats_core_regional_requests.rb
 - db/migrate/20220107121752_create_cats_core_monthly_plans.rb
+- db/migrate/20220107124630_create_cats_core_monthly_rations.rb
 - db/migrate/20220107125025_create_cats_core_monthly_plan_items.rb
 - db/migrate/20220107132433_create_cats_core_monthly_plan_item_details.rb
-- db/migrate/20220107224630_create_cats_core_monthly_rations.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -430,7 +428,6 @@ files:
 - spec/factories/cats/core/rations.rb
 - spec/factories/cats/core/receipt_transactions.rb
 - spec/factories/cats/core/receipts.rb
-- spec/factories/cats/core/regional_requests.rb
 - spec/factories/cats/core/rhn_requests.rb
 - spec/factories/cats/core/role_menus.rb
 - spec/factories/cats/core/roles.rb

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

@@ -1,36 +0,0 @@
-module Cats
-  module Core
-    class RegionalRequest < ApplicationRecord
-      belongs_to :plan
-      belongs_to :region, class_name: 'Cats::Core::Location'
-
-      validates :reference_no, presence: true, uniqueness: true
-      validates :beneficiaries, :no_of_days, :month, presence: true, numericality: { greater_than: 0 }
-      validate :validate_month, :validate_beneficiaries, :validate_region
-
-      delegate(:reference_no, to: :plan, prefix: true)
-      delegate(:name, to: :region, prefix: true)
-
-      def validate_month
-        return unless month
-
-        errors.add(:month, 'cannot be greater than 12.') if month > 12
-      end
-
-      def validate_beneficiaries
-        return unless beneficiaries
-
-        return unless plan
-
-        total = plan.plan_items.sum(:beneficiaries)
-        errors.add(:beneficiaries, "cannot be higher than #{total}.") if total < beneficiaries
-      end
-
-      def validate_region
-        return unless region
-
-        errors.add(:region, 'is not valid.') unless region.location_type == Cats::Core::Location::REGION
-      end
-    end
-  end
-end

data/db/migrate/20220105084347_create_cats_core_regional_requests.rb

@@ -1,20 +0,0 @@
-class CreateCatsCoreRegionalRequests < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_regional_requests do |t|
-      t.string :reference_no, unique: true
-      t.integer :beneficiaries, null: false
-      t.integer :month, null: false
-      t.integer :no_of_days, null: false
-      t.references :plan,
-                   null: false,
-                   index: { name: 'plan_on_rr_indx' },
-                   foreign_key: { to_table: :cats_core_plans }
-      t.references :region,
-                   null: false,
-                   index: { name: 'region_on_rr_indx' },
-                   foreign_key: { to_table: :cats_core_locations }
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,14 +0,0 @@
-FactoryBot.define do
-  factory :regional_request, class: 'Cats::Core::RegionalRequest' do
-    plan do
-      pl = create(:plan)
-      3.times { create(:plan_item, plan: pl, beneficiaries: 100) }
-      pl
-    end
-    region factory: :location
-    reference_no { FFaker::Name.name }
-    beneficiaries { 100 }
-    month { 1 }
-    no_of_days { 30 }
-  end
-end