cats_core 1.1.3 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20f6349c8a17610b338d05e2fa64a35d76bf0f3737f898ed9ab4d58d76053085
-  data.tar.gz: 74f16a28eaaf4608b0b2d1935331d8837f49cc805511412df57f902c6d421349
+  metadata.gz: b37b40530cf4eeccf1ae2e3b5c8eb03bd2691196ce628ee9596a855054016de5
+  data.tar.gz: d1e0b7ed6c38bcefcfb3c44e4efa6389de0502de25c677725ac9473cd0eeb414
 SHA512:
-  metadata.gz: 1b3dbbd8c4da02cb692bf9eae19d6e653ced98de74f54a6a9cae9c6c0dddbe2dfd7fb7b5ec4d1881445e0cf159a2e093111b2acc25dd72309b2c183ff6f94c5b
-  data.tar.gz: 05ad4779c0d90d975fc172c4c98c6729e3ff45092953408c31f4cdade4b01dae94eaf655dc857d793e6064770a3a44b93127e62b31ee890633871a509998768a
+  metadata.gz: f3f2d8888ba178611b3b09ac19dc201ee5a7971cfd72171cea12c58e97c0ef4ef65c3713a524e8e712f9495fea15b21edb56d6578a780a9f9b1512808e7dc6f3
+  data.tar.gz: cdef99c802223c7094242ed4781ade0d9dc970b86dabc9ce9d17e9babb0b8c1e232440564a26a23d643c83c30777353f2de9673b90dd7e65f171b213db0b101b

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/locations_controller.rb

@@ -1,50 +1,20 @@
 module Cats
   module Core
     class LocationsController < ApplicationController
-      before_action :set_location, only: %i[show update]
+      include Common
 
       def index
         locations = Cats::Core::Location.where(location_type: params[:location_type])
-        data = ActiveModelSerializers::SerializableResource.new(locations)
-        render json: { success: true, data: data }
-      end
-
-      def show
-        data = ActiveModelSerializers::SerializableResource.new(@location)
-        render json: { success: true, data: data }
+        render json: { success: true, data: serialize(locations) }
       end
 
       def children
         parent = Cats::Core::Location.find(params[:id])
-        data = ActiveModelSerializers::SerializableResource.new(parent.children)
-        render json: { success: true, data: data }
-      end
-
-      def create
-        obj = Cats::Core::Location.new(model_params)
-        if obj.save
-          data = ActiveModelSerializers::SerializableResource.new(obj)
-          render json: { success: true, data: data }, status: :created
-        else
-          render json: { success: false, error: obj.errors.full_messages[0] }, status: :unprocessable_entity
-        end
-      end
-
-      def update
-        if @location.update(model_params)
-          data = ActiveModelSerializers::SerializableResource.new(@location)
-          render json: { success: true, data: data }
-        else
-          render json: { success: false, error: @location.errors.full_messages[0] }, status: :unprocessable_entity
-        end
+        render json: { success: true, data: serialize(parent.children) }
       end
 
       private
 
-      def set_location
-        @location = Cats::Core::Location.find(params[:id])
-      end
-
       def model_params
         params.require(:payload).permit(:code, :name, :location_type, :description, :parent_id)
       end

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

@@ -0,0 +1,13 @@
+module Cats
+  module Core
+    class ReceiptTransactionsController < ApplicationController
+      include Common
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:source_id, :destination_id, :transaction_date, :quantity)
+      end
+    end
+  end
+end

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

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

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/models/cats/core/receipt.rb

@@ -10,6 +10,7 @@ module Cats
 
       belongs_to :dispatch
       belongs_to :prepared_by, class_name: 'Cats::Core::User'
+      has_many :receipt_transactions, foreign_key: :source_id
 
       validates :quantity, :commodity_status, :status, presence: true
       validates :quantity, numericality: { greater_than: 0 }

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/serializers/cats/core/receipt_transaction_serializer.rb

@@ -0,0 +1,8 @@
+class ReceiptTransactionSerializer < ActiveModel::Serializer
+  attributes :id, :source_id, :dispatch_reference, :destination_id, :destination_code, :quantity, :transaction_date,
+             :status
+
+  def dispatch_reference
+    object.source.dispatch.reference_no
+  end
+end

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

@@ -0,0 +1,32 @@
+module Cats
+  module Core
+    class ReceiptService
+      def start_stacking(receipt)
+        raise(StandardError, 'Receipt should be confirmed.') unless receipt.status == Cats::Core::Receipt::CONFIRMED
+
+        raise(StandardError, 'There are no stack assignments in receipt.') if receipt.receipt_transactions.count.zero?
+
+        receipt.status = Cats::Core::Receipt::STACKING
+        receipt.save!
+        receipt
+      end
+
+      def stack(receipt)
+        unless receipt.status == Cats::Core::Receipt::STACKING
+          raise(StandardError, 'Receipt should be in stacking state.')
+        end
+
+        receipt.status = Cats::Core::Receipt::STACKED
+        stacks = receipt.receipt_transactions.map(&:destination)
+        stacks.each { |stack| stack.stack_status = Cats::Core::Stack::ALLOCATED }
+
+        Cats::Core::Receipt.transaction do
+          receipt.receipt_transactions.each(&:commit)
+          stacks.each(&:save!)
+          receipt.save!
+        end
+        receipt
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -60,11 +60,18 @@ 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'
     end
   end
   resources :dispatch_transactions, except: %i[new edit destroy]
-  resources :receipts, except: %i[index new edit destroy]
+  resources :receipts, except: %i[index new edit destroy] do
+    member do
+      post 'start_stacking'
+      post 'stack'
+    end
+  end
+  resources :receipt_transactions, except: %i[new edit destroy]
 end

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.3'.freeze
+    VERSION = '1.1.7'.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.3
+  version: 1.1.7
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -225,6 +225,7 @@ files:
 - app/controllers/cats/core/locations_controller.rb
 - app/controllers/cats/core/menus_controller.rb
 - app/controllers/cats/core/notifications_controller.rb
+- app/controllers/cats/core/receipt_transactions_controller.rb
 - app/controllers/cats/core/receipts_controller.rb
 - app/controllers/cats/core/roles_controller.rb
 - app/controllers/cats/core/spaces_controller.rb
@@ -272,16 +273,19 @@ 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
 - app/serializers/cats/core/location_serializer.rb
 - app/serializers/cats/core/receipt_serializer.rb
+- app/serializers/cats/core/receipt_transaction_serializer.rb
 - app/serializers/cats/core/role_menu_serializer.rb
 - app/serializers/cats/core/unit_of_measure_serializer.rb
 - app/services/cats/core/dispatch_service.rb
 - app/services/cats/core/menu_service.rb
 - app/services/cats/core/notification_service.rb
+- app/services/cats/core/receipt_service.rb
 - app/services/cats/core/space_service.rb
 - app/services/cats/core/token_auth_service.rb
 - config/routes.rb