cats_core 1.1.22 → 1.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7535241fdd71214b07a61f4bde93042bf22673e3cddf8819686da1a7ac2b277
-  data.tar.gz: 5b7b01689834652de56c72f5bf836cf2b8e1b476d432beb72f691c634b38ce8f
+  metadata.gz: afdbac967f01ac249e5b68e57337f3e4ff94c491af3ea4f8b01ea7761fbbba20
+  data.tar.gz: '05598d3a0b3384d757332bb182519b5b15e592009abdeba5175b258dc6de4678'
 SHA512:
-  metadata.gz: 12fb00d72b5c265e1ea938fed3ec613ead395a7f34cdc78e0bf814159167eafa04d4343f1a02b3b8ffbcd840fcbb8524dcdb0bae29804a832cb0345ae61304e4
-  data.tar.gz: 9460758729591b77bc7108fe3f891f23ac4fed319c3c78a47dd9bb11a9fc349059cadb17ae6b511e2aa36ffc241c2a077042b6e8bfead949f12156dc199bb9dc
+  metadata.gz: 57ec66d9b4a9ad69a10652462abaaff539a7812a668b99604dedb1377de777f87082825a210922ae201e00b23feec70f75274cd3856a94f6b81d32e854a4658c
+  data.tar.gz: f3c98be6168dea48fa9d20d9e192a9784df76d277a648c00a549f2b0fdb7a587b61296700e3062dfde73c77f98c93b2907b4dee473594d15477ed7dc0108d83c

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,6 +49,14 @@ module Cats
       def assign_role
         role = Cats::Core::Role.find(params[:role_id])
         @user.roles << role
+
+        case role.name
+        when 'warehouse_manager'
+          @user.add_detail(:warehouse, params[:warehouse_id])
+        when 'hub_manager'
+          @user.add_detail(:hub, params[:hub_id])
+        end
+
         data = ActiveModelSerializers::SerializableResource.new(role)
         render json: { success: true, data: data }
       end
@@ -56,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/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

@@ -31,6 +31,16 @@ module Cats
         Cats::Core::Location.find_by(id: details['hub'], location_type: Cats::Core::Location::HUB)
       end
 
+      def add_detail(key, value)
+        details[key] = value
+        save!
+      end
+
+      def remove_detail(key)
+        details.delete(key)
+        save!
+      end
+
       def validate_phone_number
         return unless phone_number.present?
 

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.22'.freeze
+    VERSION = '1.1.26'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.22
+  version: 1.1.26
 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