cats_core 1.1.40 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2c955101b31607adc7eec1388f6f4c172181ffd78a2e514b5c220130899b4f3
-  data.tar.gz: f99a81794245cd12120a3b5dac7cd04a6f8a89ef7ca96dbce409b341629172c3
+  metadata.gz: 43b3831ade3f11502d3e9077e5d7fdcb6d8b51d5f18294f45427dc94ff018177
+  data.tar.gz: db9049a30b3ca768c64f6648d667bce88912e3500474d547926dcd4465c37627
 SHA512:
-  metadata.gz: b80445e45187d6590c0219cba05d11defbea0d298f79cb0f3c7c8fc82705e17ef6abc1223181c8ae6dca44138aa4b46a4d3aaa9f7732c7efb5d92ba6aeeff76e
-  data.tar.gz: 1a3efcd95681646652dd285f6f96f1ba28da6ba6214f32db735ff8f4571de66c28c68342843c9a347cb4f70e2a6078800ef4eff27898d675cabf79e80037b72e
+  metadata.gz: d53062c841953c930d43f0635e1179203182a9f668fe5ca1ee670698eb510034115eda2304cacc6b740b438f2975843ef8c7633b85463c5eb37a5f14b3715f75
+  data.tar.gz: 788188ba5bf7e9ccc06ff9816ed5c14340eacc978f6cac56e775c5d848b023d0a03bb325c6cf77e6aa99be9ff0a8006996abf43444ac7ac8155ed68ced76f6e7

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

@@ -20,7 +20,7 @@ module Cats
             jwt = Cats::Core::TokenAuthService.issue(payload)
             render json: { token: jwt, user: payload }
           else
-            render json: { error: 'Invalid username or password.' }, status: 400
+            render json: { error: 'Invalid password.' }, status: 400
           end
         else
           render json: { error: 'User does not exist.' }, status: 400

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

@@ -1,43 +1,10 @@
 module Cats
   module Core
     class CurrenciesController < ApplicationController
-      before_action :set_currency, only: %i[show update]
-
-      def index
-        data = ActiveModelSerializers::SerializableResource.new(Cats::Core::Currency.all)
-        render json: { success: true, data: data }
-      end
-
-      def show
-        data = ActiveModelSerializers::SerializableResource.new(@currency)
-        render json: { success: true, data: data }
-      end
-
-      def create
-        obj = Cats::Core::Currency.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 @currency.update(model_params)
-          data = ActiveModelSerializers::SerializableResource.new(@currency)
-          render json: { success: true, data: data }
-        else
-          render json: { success: false, error: @currency.errors.full_messages[0] }, status: :unprocessable_entity
-        end
-      end
+      include Common
 
       private
 
-      def set_currency
-        @currency = Cats::Core::Currency.find(params[:id])
-      end
-
       def model_params
         params.require(:payload).permit(:code, :name)
       end

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

@@ -40,13 +40,14 @@ module Cats
       def approve
         raise(StandardError, 'Commodity already approved.') if status == APPROVED
 
+        result = false
         Cats::Core::Commodity.transaction do
           self.status = APPROVED
           save!
           store = Cats::Core::Store.find_by(code: 'SUP-STORE')
           raise(StandardError, 'Supplier store does not exist.') unless store
 
-          Cats::Core::Stack.create!(
+          stack = Cats::Core::Stack.create!(
             code: batch_no,
             store: store,
             commodity: self,
@@ -59,9 +60,9 @@ module Cats
             start_x: 1,
             start_y: 1
           )
-          true
+          result = stack.id.positive?
         end
-        false
+        result
       end
 
       def allocate(ignore_errors: true)

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

@@ -6,6 +6,15 @@ module Cats
 
       delegate(:code, to: :source, prefix: true)
       delegate(:reference_no, to: :destination, prefix: true)
+
+      def commit
+        Transaction.transaction do
+          source.quantity -= quantity
+          source.save!
+          self.status = COMMITTED
+          save!
+        end
+      end
     end
   end
 end

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

@@ -10,7 +10,7 @@ module Cats
         ReceiptTransaction.transaction do
           destination.quantity += quantity
           destination.stack_status = Cats::Core::Stack::ALLOCATED
-          destination.save
+          destination.save!
           self.status = COMMITTED
           save!
         end

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

@@ -97,9 +97,9 @@ module Cats
       # If both conditions fail, it means an overlap exists b/n the two stacks
 
       def overlaps?(st1, st2)
-        return false if st1.start_x > (st2.start_x + st2.width) || st2.start_x > (st1.start_x + st1.width)
+        return false if st1.start_x > (st2.start_x + st2.length) || st2.start_x > (st1.start_x + st1.length)
 
-        return false if st1.start_y > (st2.start_y + st2.length) || st2.start_y > (st1.start_y + st1.length)
+        return false if st1.start_y > (st2.start_y + st2.width) || st2.start_y > (st1.start_y + st1.width)
 
         true
       end

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

@@ -17,23 +17,16 @@ module Cats
       def validate_quantity
         return unless quantity.present? && source.present?
 
-        total = self.class.where(source: source).sum(:quantity)
+        dispatched = self.class.where(source: source, status: DRAFT).sum(:quantity)
 
-        total -= quantity_was if id
+        available = source.quantity - dispatched
+        available += quantity_was if quantity_was
 
-        diff = source.quantity - total
-        errors.add(:quantity, "total is higher than source quantity (Max = #{diff}).") if quantity > diff
+        errors.add(:quantity, "total is higher than source quantity (Max = #{available}).") if quantity > available
       end
 
       def commit
-        Transaction.transaction do
-          source.quantity -= quantity
-          destination.quantity += quantity
-          source.save
-          destination.save
-          self.status = COMMITTED
-          save!
-        end
+        raise(NotImplementedError, 'Method should be implemented in child classes.')
       end
 
       def skip_quantity_validation

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.40'.freeze
+    VERSION = '1.2.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.40
+  version: 1.2.3
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-31 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: noticed
   requirement: !ruby/object:Gem::Requirement