cats_core 1.1.24 → 1.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e1e8fc9828a237ea12abdb6c0cf964aa9e0801ea7c5cb95c638071363c728b6
-  data.tar.gz: 2bc4c46c50608f1c12e99f4dbb50562bde3d255922bfb09fa905e15e24ed277e
+  metadata.gz: 3bb7f4884a8008cb1804e3b27f2dd5794209ea373d7a417a97efba3e4999fd2c
+  data.tar.gz: d584449483c92b6c6b012de61fbeb89f330544fd1bba69737ff4bbc0fff5acae
 SHA512:
-  metadata.gz: d66571c610864eda20aea1815fef61697bf83d8cba9063de6623914cdbfdd66d9160bc36575d8e4e688076c813f5982ad6623b8cbc0302340cc42fa35f0eaccc
-  data.tar.gz: 2e2205cfc0c14723a269dc4e7d9f4e0d09c67234ab8375a403c05c35ec05c37ec2027acff491b82df87b85c93aa0c5993f4352ea2988d9efc28f5cd28a3a242b
+  metadata.gz: 354676867bc3fa31abb3e368791e70e3ef97af8efe4900e55aa38200b0a3ca5cefb6c0b53ecd937df97eccbf90f86e3611956027505e954f9dd94436356cd382
+  data.tar.gz: d804eb6c6735fc5179d3a48408a1b25be1b04a3e7fa9f323648a34051f2c1d64ed9f41fe09a7f7e7b9accc1eaf6de544a32f74bfe8f4e768a8cf865d7d144a4e

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

@@ -8,6 +8,27 @@ module Cats
         render json: { success: true, data: serialize(transactions) }
       end
 
+      def create
+        p = model_params
+
+        # Look for a transaction with the same destination as incoming
+        transaction = Cats::Core::ReceiptTransaction.find_by(
+          source_id: p[:source_id],
+          destination_id: p[:destination_id]
+        )
+        if transaction
+          transaction.quantity += p[:quantity]
+        else
+          transaction = Cats::Core::ReceiptTransaction.new(p)
+        end
+
+        if transaction.save
+          render json: { success: true, data: serialize(transaction) }, status: :created
+        else
+          render json: { success: false, error: transaction.errors.full_messages[0] }, status: :unprocessable_entity
+        end
+      end
+
       private
 
       def model_params

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

@@ -49,9 +49,11 @@ module Cats
       def assign_role
         role = Cats::Core::Role.find(params[:role_id])
         @user.roles << role
-        if role.name == 'warehouse_manager'
+
+        case role.name
+        when 'warehouse_manager'
           @user.add_detail(:warehouse, params[:warehouse_id])
-        elsif role.name =='hub_manager'
+        when 'hub_manager'
           @user.add_detail(:hub, params[:hub_id])
         end
 
@@ -62,7 +64,7 @@ module Cats
       def revoke_role
         role = Cats::Core::Role.find(params[:role_id])
         @user.roles.delete(role)
-        @user.remove_detail(role.name) if ['warehouse_manager', 'hub_manager'].include?(role.name)
+        @user.remove_detail(role.name) if %w[warehouse_manager hub_manager].include?(role.name)
         data = ActiveModelSerializers::SerializableResource.new(role)
         render json: { success: true, data: data }
       end

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

@@ -5,6 +5,16 @@ module Cats
       belongs_to :destination, class_name: 'Cats::Core::Stack'
 
       delegate(:code, to: :destination, prefix: true)
+
+      def commit
+        ReceiptTransaction.transaction do
+          destination.quantity += quantity
+          destination.stack_status = Cats::Core::Stack::ALLOCATED
+          destination.save
+          self.status = COMMITTED
+          save!
+        end
+      end
     end
   end
 end

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

@@ -18,6 +18,9 @@ module Cats
         return unless quantity.present? && source.present?
 
         total = self.class.where(source: source).sum(:quantity)
+
+        total -= quantity_was if id
+
         diff = source.quantity - total
         errors.add(:quantity, "total is higher than source quantity (Max = #{diff}).") if quantity > diff
       end

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

@@ -1,3 +1,7 @@
-class CommodityCategorySerializer < ActiveModel::Serializer
-  attributes :id, :code, :name, :description, :parent_id
+module Cats
+  module Core
+    class CommodityCategorySerializer < ActiveModel::Serializer
+      attributes :id, :code, :name, :description, :parent_id
+    end
+  end
 end

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

@@ -1,3 +1,7 @@
-class CurrencySerializer < ActiveModel::Serializer
-  attributes :id, :code, :name
+module Cats
+  module Core
+    class CurrencySerializer < ActiveModel::Serializer
+      attributes :id, :code, :name
+    end
+  end
 end

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

@@ -1,8 +1,12 @@
-class DispatchSerializer < ActiveModel::Serializer
-  attributes :id, :reference_no, :allocation_item_id, :transporter_id, :transporter_name, :plate_no, :driver_name,
-             :driver_phone, :quantity, :remark, :prepared_by_id, :prepared_by_email, :dispatch_status, :destination
+module Cats
+  module Core
+    class DispatchSerializer < ActiveModel::Serializer
+      attributes :id, :reference_no, :allocation_item_id, :transporter_id, :transporter_name, :plate_no, :driver_name,
+                 :driver_phone, :quantity, :remark, :prepared_by_id, :prepared_by_email, :dispatch_status, :destination
 
-  def destination
-    object.allocation_item.destination.name
+      def destination
+        object.allocation_item.destination.name
+      end
+    end
   end
 end

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

@@ -1,4 +1,8 @@
-class DispatchTransactionSerializer < ActiveModel::Serializer
-  attributes :id, :source_id, :source_code, :destination_id, :destination_reference_no, :quantity, :transaction_date,
-             :status
+module Cats
+  module Core
+    class DispatchTransactionSerializer < ActiveModel::Serializer
+      attributes :id, :source_id, :source_code, :destination_id, :destination_reference_no, :quantity, :transaction_date,
+                 :status
+    end
+  end
 end

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

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

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

@@ -1,4 +1,8 @@
-class ReceiptSerializer < ActiveModel::Serializer
-  attributes :id, :dispatch_id, :dispatch_reference_no, :commodity_status, :quantity, :status, :remark,
-             :prepared_by_id, :prepared_by_email
+module Cats
+  module Core
+    class ReceiptSerializer < ActiveModel::Serializer
+      attributes :id, :dispatch_id, :dispatch_reference_no, :commodity_status, :quantity, :status, :remark,
+                 :prepared_by_id, :prepared_by_email
+    end
+  end
 end

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

@@ -1,8 +1,12 @@
-class ReceiptTransactionSerializer < ActiveModel::Serializer
-  attributes :id, :source_id, :dispatch_reference, :destination_id, :destination_code, :quantity, :transaction_date,
-             :status
+module Cats
+  module Core
+    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
+      def dispatch_reference
+        object.source.dispatch.reference_no
+      end
+    end
   end
 end

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

@@ -1,3 +1,7 @@
-class RoleSerializer < ActiveModel::Serializer
-  attributes :id, :name, :application_module_id
+module Cats
+  module Core
+    class RoleSerializer < ActiveModel::Serializer
+      attributes :id, :name, :application_module_id
+    end
+  end
 end

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

@@ -1,3 +1,7 @@
-class UnitOfMeasureSerializer < ActiveModel::Serializer
-  attributes :id, :abbreviation, :name, :unit_type
+module Cats
+  module Core
+    class UnitOfMeasureSerializer < ActiveModel::Serializer
+      attributes :id, :abbreviation, :name, :unit_type
+    end
+  end
 end

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

@@ -1,3 +1,7 @@
-class UserSerializer < ActiveModel::Serializer
-  attributes :id, :first_name, :last_name, :email, :phone_number, :active, :details, :application_module_id
+module Cats
+  module Core
+    class UserSerializer < ActiveModel::Serializer
+      attributes :id, :first_name, :last_name, :email, :phone_number, :active, :details, :application_module_id
+    end
+  end
 end

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

@@ -17,14 +17,7 @@ module Cats
         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.receipt_transactions.each(&:commit)
         receipt
       end
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.24'.freeze
+    VERSION = '1.1.28'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.24
+  version: 1.1.28
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -409,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Core module for CATS applications