cats_core 1.1.23 → 1.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4af6924e969566f74cdb292747651afd308688bc78b8ae4a1f984c9899bc17c8
-  data.tar.gz: 78efc6656b32a0455345b69e35d11d0a599707b61da25c68177e77c1184c3598
+  metadata.gz: 2ccbe595a5539e596c53112adcf86365ae6001df0fb47ebd51dad59ce5c3429c
+  data.tar.gz: 85d16f249aaa79b9b6dd84a813f694cf2cfec498932670a21df5b308aae1b207
 SHA512:
-  metadata.gz: 48502a731da0f5ebf90a0497b86a8585a3af825b3905936e4701bb2ec991766028630be363c9ec6d79d585f3156753b77736e4fb53b14c9f78231b1242c69ba3
-  data.tar.gz: 306057c32ef4f4a6636aaf6321a5b80f682465de990cad4c10977928b6dde075b02923bdb4d14195e3bb4774d08843772cb7978cee6b4f1427480ae84c001cd0
+  metadata.gz: f354c929384af4351df0bd1c29286a298ef2ab94eae44571eebe876f3179b7a6975dcef33bda0c66ef0b97169ca640fa065a4fb6e1d88b02af8bc7f57fa15900
+  data.tar.gz: a360e9958396935694d2e4cbd08cca4170105f818b19c29e5cdca6c37ebbee5c5d48395f9ba8588ba782421883565798377e3d5bb2ce0218cd53dda0cffc8089

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,6 +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 %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/models/cats/core/user.rb

@@ -36,6 +36,11 @@ module Cats
         save!
       end
 
+      def remove_detail(key)
+        details.delete(key)
+        save!
+      end
+
       def validate_phone_number
         return unless phone_number.present?
 

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.23'.freeze
+    VERSION = '1.1.27'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.23
+  version: 1.1.27
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers