cats_core 1.4.32 → 1.4.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44499bfd42e79fe95a119690cd54c9adbe2e43a3307f80ae97c5f18f33676818
-  data.tar.gz: 8ff508a01a4da75b991c0f1e4da6f4b3cfe15760a62fee0bcaeee4ea37f31e8b
+  metadata.gz: 186d5da451b5abf3212599586408ca925e553e855f185b2ac52038a7cfa7b651
+  data.tar.gz: 7fa1c103c95c8f80d98f75be767bf346b4cb5bfab1cf066776e3ae8880a95621
 SHA512:
-  metadata.gz: 226ca5049ebb2542a12558e405548a8e72dcdd141085fc1627f08c7e531c13322d5ec4d652ee3df1081d82ff4a8f5cdb7ba01b18286e922189bf10aca675351c
-  data.tar.gz: 1558e359924f5260e962096083c98343d590beab1747d6b07ee0fdde47a0b14eb39e86b6a114569371694757fda494c63018f16c3d3f9c5fe12e523aa5462557
+  metadata.gz: cd85c7c41b4a8c7ab65f388969b4e9e6e5a6191c1eaf19c01bcf6cdbef36018d76136ab73c1bcf57b4fe47f81e5ab6062df1da4ca98970aaec7ddef593818bd7
+  data.tar.gz: 885be8ea62166c70ae4bf3e4f900ed12a18ddecd0b9ba712643e3fe1e781b4099f7e2b8010ca5fdc14ef57089956fe2c43e2de0f36eabe343d69689b13c4b233

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

@@ -19,7 +19,7 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:batch_no, :description, :unit_of_measure_id, :source_id,
+        params.require(:payload).permit(:batch_no, :description, :unit_of_measure_id, :source_id, :commodity_grade,
                                         :source_type, :quantity, :best_use_before, :volume_per_metric_ton,
                                         :arrival_status, :shipping_reference)
       end

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

@@ -12,7 +12,8 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:receipt_authorization_id, :commodity_status, :quantity, :remark)
+        params.require(:payload).permit(:receipt_authorization_id, :commodity_status, :commodity_grade, :quantity,
+                                        :remark)
       end
     end
   end

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

@@ -0,0 +1,32 @@
+module Cats
+  module Core
+    class StoresController < ApplicationController
+      include Common
+
+      def index
+        stores = Cats::Core::Store.where(warehouse_id: params[:id])
+        render json: { success: true, data: serialize(stores) }
+      end
+
+      def filter
+        query = Store.ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
+      def stores_for_hub
+        warehouses = Cats::Core::Location.find(params[:id]).children
+        ids = warehouses.map(&:id)
+        stores = Cats::Core::Store.where(warehouse_id: ids)
+        render json: { success: true, data: serialize(stores) }
+      end
+
+      private
+
+      def model_params
+        params.require('payload').permit(:id, :code, :name, :length, :width, :height, :temporary, :has_gangway,
+                                         :gangway_length, :gangway_width, :gangway_corner_dist, :warehouse_id,
+                                         :store_keeper_id)
+      end
+    end
+  end
+end

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

@@ -7,6 +7,12 @@ module Cats
       ALLOCATED = 'Allocated'.freeze
       STATUSES = [DRAFT, APPROVED, ALLOCATED].freeze
 
+      # Grades
+      GRADE1 = 'Grade1'.freeze
+      GRADE2 = 'Grade2'.freeze
+      GRADE3 = 'Grade3'.freeze
+      COMMODITY_GRADES = [GRADE1, GRADE2, GRADE3].freeze
+
       # Commodity statuses
       GOOD = 'Good'.freeze
       DAMAGED = 'Damaged'.freeze
@@ -37,6 +43,7 @@ module Cats
       validates :volume_per_metric_ton, numericality: { greater_than: 0, allow_nil: true }
       validates :arrival_status, presence: true, inclusion: { in: ARRIVAL_STATUSES }
       validates :status, presence: true, inclusion: { in: STATUSES }
+      validates :commodity_grade, inclusion: { in: COMMODITY_GRADES }, allow_nil: true
       validate :validate_updateability, on: :update
 
       delegate(:abbreviation, to: :unit_of_measure, prefix: 'unit')

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

@@ -4,6 +4,7 @@ module Cats
       belongs_to :receipt_authorization
 
       validates :commodity_status, presence: true, inclusion: { in: Commodity::COMMODITY_STATUSES }
+      validates :commodity_grade, inclusion: { in: Commodity::COMMODITY_GRADES }, allow_nil: true
       validates :quantity, presence: true, numericality: { greater_than: 0 }
     end
   end

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

@@ -3,7 +3,7 @@ module Cats
     class CommoditySerializer < ActiveModel::Serializer
       attributes :id, :name, :batch_no, :description, :unit_of_measure_id, :unit_abbreviation, :source_id,
                  :source_type, :source_reference_no, :quantity, :best_use_before, :volume_per_metric_ton,
-                 :arrival_status, :status, :shipping_reference
+                 :arrival_status, :status, :shipping_reference, :commodity_grade
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class ReceiptSerializer < ActiveModel::Serializer
-      attributes :id, :receipt_authorization_id, :commodity_status, :quantity, :remark
+      attributes :id, :receipt_authorization_id, :commodity_status, :commodity_grade, :quantity, :remark
     end
   end
 end

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

@@ -0,0 +1,11 @@
+module Cats
+  module Core
+    class StoreSerializer < ActiveModel::Serializer
+      attributes :id, :code, :name, :store_keeper_name, :store_keeper_phone_number, :length, :width, :height,
+                 :temporary, :has_gangway, :gangway_length, :gangway_width, :gangway_corner_dist, :warehouse_id,
+                 :store_keeper_id
+
+      has_many :stacks
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Cats
 
         raise(StandardError, 'Plan has no plan items.') if round_plan.round_plan_items.count.zero?
 
-        round_plan.round_plan_item_details.delete_all if round_plan.round_plan_item_details.count.positive?
+        clear_needs(round_plan.id)
 
         details = []
         rations = round_plan.round_rations
@@ -32,6 +32,13 @@ module Cats
         round_plan
       end
 
+      def clear_needs(plan_id)
+        Cats::Core::RoundPlanItemDetail
+          .joins(beneficiary_round_plan_item: :round_plan_item)
+          .where(cats_core_beneficiary_round_plan_items: { cats_core_round_plan_items: { round_plan_id: plan_id } })
+          .delete_all
+      end
+
       def generate_round_plan(reference_no, rounds, plan_id, region_id)
         round_plan = Cats::Core::RoundPlan.create!(
           plan_id: plan_id,
@@ -48,12 +55,10 @@ module Cats
             quantity: ration.quantity,
             unit_of_measure_id: ration.unit_of_measure_id,
             round_plan_id: round_plan.id,
-            no_of_days: ration.no_of_days,
-            created_at: Date.today,
-            updated_at: Date.today
+            no_of_days: ration.no_of_days
           }
         end
-        Cats::Core::RoundRation.insert_all!(round_rations)
+        Cats::Core::RoundRation.insert_all!(round_rations, record_timestamps: true)
         plan_items = Cats::Core::PlanItem.where(plan_id: plan_id, region_id: region_id)
         ben_plan_items = Cats::Core::BeneficiaryPlanItem.where(plan_item: plan_items)
         round_plan_items = plan_items.map do |plan_item|

data/config/routes.rb

@@ -169,4 +169,9 @@ Cats::Core::Engine.routes.draw do
   get '/receipts/:id/stacks', controller: :stacks, action: :receipt_stacks, as: :receipt_stacks
   get '/dispatches/:id/stacks', controller: :stacks, action: :dispatch_stacks, as: :dispatch_stacks
   resources :stacks, only: %i[show index create update]
+
+  get '/warehouses/:id/stores', controller: :stores, action: :index, as: :stores_warehouse
+  get '/hubs/:id/stores', controller: :stores, action: :stores_for_hub, as: :stores_hub
+  resources :stores, only: %i[index show create update]
+  post '/stores/filter', controller: :stores, action: :filter
 end

data/db/migrate/20210717033223_create_cats_core_commodities.rb

@@ -14,6 +14,7 @@ class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
       t.string :arrival_status, null: false, default: 'At Source'
       t.boolean :approved, null: false, default: false
       t.string :shipping_reference
+      t.string :commodity_grade
 
       t.timestamps
     end

data/db/migrate/20210727105834_create_cats_core_receipts.rb

@@ -6,6 +6,7 @@ class CreateCatsCoreReceipts < ActiveRecord::Migration[7.0]
                    index: { name: 'ra_on_receipts_indx' },
                    foreign_key: { to_table: :cats_core_receipt_authorizations }
       t.string :commodity_status, null: false
+      t.string :commodity_grade
       t.float :quantity, null: false
       t.string :remark
 

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.32'.freeze
+    VERSION = '1.4.35'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.32
+  version: 1.4.35
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -252,6 +252,7 @@ files:
 - app/controllers/cats/core/routes_controller.rb
 - app/controllers/cats/core/spaces_controller.rb
 - app/controllers/cats/core/stacks_controller.rb
+- app/controllers/cats/core/stores_controller.rb
 - app/controllers/cats/core/transporters_controller.rb
 - app/controllers/cats/core/unit_conversions_controller.rb
 - app/controllers/cats/core/unit_of_measures_controller.rb
@@ -348,6 +349,7 @@ files:
 - app/serializers/cats/core/round_plan_serializer.rb
 - app/serializers/cats/core/route_serializer.rb
 - app/serializers/cats/core/stack_serializer.rb
+- app/serializers/cats/core/store_serializer.rb
 - app/serializers/cats/core/transporter_serializer.rb
 - app/serializers/cats/core/unit_conversion_serializer.rb
 - app/serializers/cats/core/unit_of_measure_serializer.rb