cats_core 1.3.13 → 1.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8384e95d3bf98191d6f0fb04ce96f6180daf53d653d954ef1470282bf3b4782
-  data.tar.gz: 00a0000dba254d8f02dcb8f97fe37b268137d1fe19e03f5c385f2724cb03442b
+  metadata.gz: 551532d2140d05f61a268ef27a1e2b8b9a7abb9f084dc808f161962d7f319b19
+  data.tar.gz: 78e9e7fd69241d39c84542d5160041df4ab2c697c60ea6cd9cd719182d7de43c
 SHA512:
-  metadata.gz: 2d6cdb1dcd812695e16f53ee1a613a834fa7683eb982d54b62cd1662a2082f147b0000ba2fa7453a7fedf5e5a003f94197eadeca05b7768fa104a9fb4655ab53
-  data.tar.gz: 7426544df6c7c89477936e11cff07b9ac047c46617b199e02853822cb67260d5b94e08816b51dd7c881173d85e0700a4ddcc3d3a4ab01523f42b2a6ae4e591a6
+  metadata.gz: a48bca9d45e6cfc5ea41bd5657d8142aafde2cc8fb3da40d37f2ba1a306bf98c3b6f403a15996579c5f4fb0b73d26aee6f92a6ffa30696f5f61f4dec5fa6f13c
+  data.tar.gz: ac88009a158bd3596389611e60e558eaf6bc1f99f7686955b7ae1e1987376d153bd7a21f0c67ae6bfec474907f7a0748f8a5b2636bfbbbb7fe271c0db2d83ba8

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,7 @@ 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_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/controllers/cats/core/dispatches_controller.rb

@@ -57,7 +57,7 @@ module Cats
       end
 
       def commodity
-        data = @dispatch.dispatch_plan_item.commodity
+        data = @dispatch.dispatch_plan_item.dispatch_plan.commodity
         render json: { success: true, data: serialize(data) }
       end
 

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

@@ -8,12 +8,16 @@ 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, :name, :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

@@ -1,16 +1,16 @@
 module Cats
   module Core
     class DispatchPlanItem < ApplicationRecord
-      belongs_to :commodity
       belongs_to :source, class_name: 'Cats::Core::Location'
       belongs_to :destination, class_name: 'Cats::Core::Location'
       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)
-      delegate(:batch_no, to: :commodity, prefix: true)
+      delegate(:commodity_batch_no, :commodity_name, to: :dispatch_plan)
       delegate(:name, to: :source, prefix: true)
       delegate(:name, to: :destination, prefix: true)
       delegate(:location_type, to: :source, prefix: true)

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

@@ -5,6 +5,7 @@ module Cats
       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

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

@@ -7,6 +7,8 @@ module Cats
       has_many :monthly_plan_item_details
 
       validates :beneficiaries, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:reference_no, to: :monthly_plan, prefix: 'plan')
     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/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/notifications/cats/core/dispatch_notification.rb

@@ -7,7 +7,7 @@ module Cats
 
       def message
         dispatch = params[:dispatch]
-        commodity = dispatch.dispatch_plan_item.commodity
+        commodity = dispatch.dispatch_plan_item.dispatch_plan.commodity
         title = "Dispatch Notification - #{commodity.name}"
         date = Date.today
         body = <<~BODY

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
+        plan.request.allocate if plan.request_id
+        # 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
+
+        [result, plan]
+      end
+    end
   end
 end

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

@@ -10,7 +10,7 @@ module Cats
         store = Cats::Core::Store.find_by(code: 'SUP-STORE')
         raise(StandardError, 'Supplier store does not exist.') unless store
 
-        commodity = plan_item.commodity
+        commodity = plan_item.dispatch_plan.commodity
         stack = store.stacks.find_by(commodity: commodity)
 
         raise(StandardError, 'Commodity not found in supplier store.') unless stack

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

@@ -5,10 +5,6 @@ class CreateCatsCoreDispatchPlanItems < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'dpi_on_dp_indx' },
                    foreign_key: { to_table: :cats_core_dispatch_plans }
-      t.references :commodity,
-                   null: false,
-                   index: { name: 'dpi_on_commodity_indx' },
-                   foreign_key: { to_table: :cats_core_commodities }
       t.references :source,
                    null: false,
                    index: { name: 'dpi_on_source_indx' },
@@ -18,6 +14,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/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.13'.freeze
+    VERSION = '1.3.18'.freeze
   end
 end

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

@@ -1,9 +1,9 @@
 FactoryBot.define do
   factory :dispatch_plan_item, class: 'Cats::Core::DispatchPlanItem' do
-    commodity
     source factory: :location
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.18
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -385,9 +385,9 @@ files:
 - db/migrate/20211229160129_create_cats_core_commodity_substitutions.rb
 - db/migrate/20220103152802_create_cats_core_tenderers.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