cats_core 1.1.24 → 1.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e1e8fc9828a237ea12abdb6c0cf964aa9e0801ea7c5cb95c638071363c728b6
-  data.tar.gz: 2bc4c46c50608f1c12e99f4dbb50562bde3d255922bfb09fa905e15e24ed277e
+  metadata.gz: 3babdd4703726f7863d05d4b939af06ede31f1b6a0a5a715ad0f13286ea8343a
+  data.tar.gz: 44ed3f59a6099ba17094b8d81232c9e8cf72c6ac95118da99e1e8a23286bebf7
 SHA512:
-  metadata.gz: d66571c610864eda20aea1815fef61697bf83d8cba9063de6623914cdbfdd66d9160bc36575d8e4e688076c813f5982ad6623b8cbc0302340cc42fa35f0eaccc
-  data.tar.gz: 2e2205cfc0c14723a269dc4e7d9f4e0d09c67234ab8375a403c05c35ec05c37ec2027acff491b82df87b85c93aa0c5993f4352ea2988d9efc28f5cd28a3a242b
+  metadata.gz: 82195965fd9917d53ff286e1d2822302f87c9ecf836b292dc8d647eef5f307a9f84d692b4dd5ff4d6a16dc1c21e9c52109966c39d459052f918cd9ad73c6914b
+  data.tar.gz: f7c58b63d4e6f66b9ba3011a7066175052b5e6aa92c13339d5d975cf3567108c405e5bfb571bd527c8d12f3b24b6d8ba8924f67134c2f28d5941958a9ba2fb89

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/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/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.24'.freeze
+    VERSION = '1.1.25'.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.25
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers