cats_core 1.1.4 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63d1bc4e2e97985bc79c49007a2d826b43caec3b8fc31eca51fa4f588d22e10f
-  data.tar.gz: d4d08836b88121d75bd29fb711975726285b9ab5f7b64285ed48349cff51e2e3
+  metadata.gz: e88cccfc4e2d6d554ec178e2f7e981462ace4db4fa8e43fb142b617550eadde7
+  data.tar.gz: cb8b5bfe4186b7e2394ca8ed765d6a1c5c7c2694f503a031d42f64fce0d3b4c1
 SHA512:
-  metadata.gz: 6bc9fdab7012e63bcda95512f54f0fe8586c225a8eec25c88dcc3ed6b0634aa21a6a62ba5e6091f21b718f10d9df93eeabdf0a88a62a78891f244dc2c14d3bac
-  data.tar.gz: 9ced66786a2d6303d5ea944366cf9357ff9d3a9ab8e4406d2a6c490d8969e0c6431b2265e321a965a2ab10c503bc51e4cbdd40766581f8af6ccf844405f58527
+  metadata.gz: 49cb848b9e249982677944e85e91305ebb7997237a570ce9f91cfecfedc058ea7f02052e8e8aea79ae7020ee8618998a48f1d97e26886415b807d619c25dcf73
+  data.tar.gz: 6959a9bdb0a8474785fb1a63b6282d0f1030fcf0ed0f182246e310d73681eff892f38f64eb72c24e1d43c47541912f8292694a717676aa56916184fea63c3f47

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

@@ -4,7 +4,7 @@ module Cats
       include Common
 
       before_action :set_service, only: %i[create_receipt_authorization approve start search confirm]
-      before_action :set_dispatch, only: %i[approve start confirm]
+      before_action :set_dispatch, only: %i[approve start confirm commodity]
 
       def index
         dispatches = Cats::Core::Dispatch.where(allocation_item_id: params[:id])
@@ -56,6 +56,11 @@ module Cats
         render json: { success: true, data: serialize(data) }
       end
 
+      def commodity
+        data = @dispatch.allocation_item.allocation.commodity
+        render json: { success: true, data: serialize(data) }
+      end
+
       private
 
       def set_service

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

@@ -17,10 +17,10 @@ module Cats
         render json: { success: false, error: e.message }
       end
 
-      def stack
+      def finish_stacking
         receipt = Cats::Core::Receipt.find(params[:id])
         service = ReceiptService.new
-        result = service.stack(receipt)
+        result = service.finish_stacking(receipt)
         render json: { success: true, data: serialize(result) }
       rescue StandardError => e
         render json: { success: false, error: e.message }

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

@@ -5,6 +5,16 @@ module Cats
 
       validates :reference_no, presence: true, uniqueness: true
       validates :gift_date, presence: true
+
+      after_create :update_donation
+
+      def update_donation
+        donation = self.donation
+        return if donation.active
+
+        donation.active = true
+        donation.save!
+      end
     end
   end
 end

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

@@ -8,6 +8,16 @@ module Cats
       validates :reference_no, uniqueness: true
 
       delegate(:name, to: :commodity_category, prefix: true)
+
+      after_create :update_donation
+
+      def update_donation
+        donation = self.donation
+        return if donation.active
+
+        donation.active = true
+        donation.save!
+      end
     end
   end
 end

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

@@ -0,0 +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,
+                 :source_type, :source_reference_no, :quantity, :best_use_before, :volume_per_metric_ton,
+                 :commodity_category_id, :commodity_category_name, :arrival_status, :approved
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 class LocationSerializer < ActiveModel::Serializer
-  attributes :id, :name, :location_type, :description, :parent_id
+  attributes :id, :code, :name, :location_type, :description, :parent_id
 end

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

@@ -11,7 +11,7 @@ module Cats
         receipt
       end
 
-      def stack(receipt)
+      def finish_stacking(receipt)
         unless receipt.status == Cats::Core::Receipt::STACKING
           raise(StandardError, 'Receipt should be in stacking state.')
         end

data/config/routes.rb

@@ -60,6 +60,7 @@ Cats::Core::Engine.routes.draw do
   resources :dispatches, except: %i[index destroy] do
     member do
       get 'receipts', controller: :receipts, action: :index
+      get 'commodity'
       post 'approve'
       post 'start'
       post 'confirm'
@@ -69,7 +70,7 @@ Cats::Core::Engine.routes.draw do
   resources :receipts, except: %i[index new edit destroy] do
     member do
       post 'start_stacking'
-      post 'stack'
+      post 'finish_stacking'
     end
   end
   resources :receipt_transactions, except: %i[new edit destroy]

data/db/migrate/20210717032330_create_cats_core_donations.rb

@@ -25,6 +25,7 @@ class CreateCatsCoreDonations < ActiveRecord::Migration[6.1]
                    null: true,
                    index: { name: 'uom_on_donation_indx' },
                    foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.boolean :active, null: false, default: false
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.4'.freeze
+    VERSION = '1.1.8'.freeze
   end
 end

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

@@ -9,5 +9,6 @@ FactoryBot.define do
     currency { nil }
     commodity_category
     unit_of_measure
+    active { false }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.8
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-26 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -273,6 +273,7 @@ files:
 - app/models/cats/core/user.rb
 - app/notifications/cats/core/simple_notification.rb
 - app/serializers/cats/core/commodity_category_serializer.rb
+- app/serializers/cats/core/commodity_serializer.rb
 - app/serializers/cats/core/currency_serializer.rb
 - app/serializers/cats/core/dispatch_serializer.rb
 - app/serializers/cats/core/dispatch_transaction_serializer.rb