cats_core 1.1.2 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae62c0b230969901c7405d3bdf56b72dc099e77e4e6d9a21ba89243f91a1bd07
-  data.tar.gz: cc0d85257ffb25fc70a890011b1ae670dd18a0ea6938f79e73ec87a757787cd1
+  metadata.gz: dc868538b2dd7c7fc157b0fd2c78c79a38b868c60a12e0e1ce6662a7dac01e3a
+  data.tar.gz: d20518593e2a0bc565a47d2b426794c16790bf45f1650feb2c3a7550fb610637
 SHA512:
-  metadata.gz: 582d0f4d63492a2ce3b3e12a7d6e84088c5c5badab3135cb108fc8876348f3e593f70d0498d6c23e79de143efb04436fd858325c6bac8a5bf29785d3a1d4d899
-  data.tar.gz: 581e221e3dff760e51095cc7094736b0a2c7f7c261d4693c8f811f3b9e2aac1ee5093ba6823895bb910488947f8616cee32b799178b5d1da64905ca40cc7b20c
+  metadata.gz: 5447be874ddfaa36956f09550a313ce4078440e0b0be91ceb0cc5d8f035236c71f823ce6f4adf88efba0e4db44a047595e9a56fa84032fe3f3b7c14f9b602126
+  data.tar.gz: 44ab9de9141a4957e53f7739a761e1127940b0dfa813ea8503a579a4036b71a6e522a86b029facf406354d0d826e007d1260023ea4daa99e5531a15407288567

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 }
@@ -23,19 +24,26 @@ module Cats
       def validate_dispatch_status
         return unless dispatch
 
-        return if dispatch.dispatch_status == Cats::Core::Dispatch::STARTED
+        statuses = [Cats::Core::Dispatch::STARTED, Cats::Core::Dispatch::RECEIVED]
+        return if statuses.include?(dispatch.dispatch_status)
 
-        errors.add(:dispatch, 'Dispatch should be in "Started" state.')
+        errors.add(:dispatch, 'should be in "Started" state.')
       end
 
       def validate_total_quantity
         return unless dispatch && quantity
 
-        received = Cats::Core::Receipt.where(dispatch: dispatch).sum(:quantity)
-        remaining = dispatch.quantity - received
-        return if quantity <= remaining
+        received = dispatch.receipts.sum(:quantity)
+        diff = dispatch.quantity - received
+        if new_record?
+          return if quantity <= diff
 
-        errors.add(:quantity, "Total receipt quantity is higher than dispatch quantity (Max = #{remaining}).")
+          errors.add(:quantity, "total is higher than dispatch quantity (Max = #{diff}).")
+        else
+          return unless diff.negative?
+
+          errors.add(:quantity, "total is higher than dispatch quantity (Max = #{diff.abs}).")
+        end
       end
     end
   end

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

@@ -3,6 +3,8 @@ module Cats
     class ReceiptTransaction < Transaction
       belongs_to :source, class_name: 'Cats::Core::Receipt'
       belongs_to :destination, class_name: 'Cats::Core::Stack'
+
+      delegate(:code, to: :destination, prefix: true)
     end
   end
 end

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

@@ -12,12 +12,14 @@ module Cats
       validates :transaction_date, :quantity, :status, presence: true
       validates :quantity, numericality: { greater_than: 0 }
       validates :status, inclusion: { in: STATUSES }
-      validate :validate_quantity
+      validate :validate_quantity, unless: :skip_quantity_validation
 
       def validate_quantity
         return unless quantity.present? && source.present?
 
-        errors.add(:quantity, 'cannot be more than source quantity') if quantity > source.quantity
+        total = self.class.where(source: source).sum(:quantity)
+        diff = source.quantity - total
+        errors.add(:quantity, "total is higher than source quantity (Max = #{diff}).") if quantity > diff
       end
 
       def commit
@@ -27,10 +29,23 @@ module Cats
           source.save
           destination.save
           self.status = COMMITTED
-          save
+          save!
         end
       end
 
+      def skip_quantity_validation
+        # Quantity validation should be skipped if we are commiting transactions.
+        (
+          instance_of?(Cats::Core::DispatchTransaction) &&
+          destination &&
+          destination.dispatch_status == Cats::Core::Dispatch::STARTED
+        ) || (
+          instance_of?(Cats::Core::ReceiptTransaction) &&
+          source &&
+          source.status == Cats::Core::Receipt::STACKING
+        )
+      end
+
       def set_status
         return unless new_record?
 

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

@@ -126,7 +126,7 @@ module Cats
           dispatch.dispatch_status = Cats::Core::Dispatch::RECEIVED
           dispatch.receipts.each { |r| r.status = Cats::Core::Receipt::CONFIRMED }
           dispatch.save
-          dispatch.receipts.each(&:save)
+          dispatch.receipts.each(&:save!)
         end
 
         dispatch

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.2'.freeze
+    VERSION = '1.1.6'.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

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :receipt_transaction do
+  factory :receipt_transaction, class: 'Cats::Core::ReceiptTransaction' do
     source factory: :receipt
     destination factory: :stack
     transaction_date { Date.today }

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :receipt, class: 'Cats::Core::Receipt' do
     dispatch factory: :dispatch, dispatch_status: Cats::Core::Dispatch::STARTED
-    quantity { 1.5 }
+    quantity { 50 }
     commodity_status { Cats::Core::Commodity::GOOD }
     status { Cats::Core::Receipt::DRAFT }
     remark { FFaker::Name.name }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.6
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-09-26 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
@@ -277,11 +278,13 @@ files:
 - 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