cats_core 1.1.7 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b37b40530cf4eeccf1ae2e3b5c8eb03bd2691196ce628ee9596a855054016de5
-  data.tar.gz: d1e0b7ed6c38bcefcfb3c44e4efa6389de0502de25c677725ac9473cd0eeb414
+  metadata.gz: bbc34455b593fd71880ccf827b6d2e3c9aea723471d877780d4f44b18297cb92
+  data.tar.gz: f2867e4a074fe84990e005a845844f06a3433e6fed52d9e56f12eb5943c061ed
 SHA512:
-  metadata.gz: f3f2d8888ba178611b3b09ac19dc201ee5a7971cfd72171cea12c58e97c0ef4ef65c3713a524e8e712f9495fea15b21edb56d6578a780a9f9b1512808e7dc6f3
-  data.tar.gz: cdef99c802223c7094242ed4781ade0d9dc970b86dabc9ce9d17e9babb0b8c1e232440564a26a23d643c83c30777353f2de9673b90dd7e65f171b213db0b101b
+  metadata.gz: 13a7abd31cdaa640da8486fb394b7896e919c79229233fdee4f8fd5ebae5498f55987ba72f30189486812a9273be8efe4e246cd2bd9d410f32996bee1deff037
+  data.tar.gz: e9dafd860e39d9751a6ddade1adf4d6df4373c37c38f4e267ed2056b1eef7e756a1a29b4b44d62907329348e1a8d8e8d7998e4bd92d78baf2564e6ffc0daf7a6

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

@@ -3,6 +3,11 @@ module Cats
     class DispatchTransactionsController < ApplicationController
       include Common
 
+      def index
+        transactions = Cats::Core::DispatchTransaction.where(destination_id: params[:id])
+        render json: { success: true, data: serialize(transactions) }
+      end
+
       private
 
       def model_params

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

@@ -13,6 +13,11 @@ module Cats
         render json: { success: true, data: serialize(parent.children) }
       end
 
+      def filter
+        query = Cats::Core::Location.ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
       private
 
       def model_params

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

@@ -3,6 +3,11 @@ module Cats
     class ReceiptTransactionsController < ApplicationController
       include Common
 
+      def index
+        transactions = Cats::Core::ReceiptTransaction.where(source_id: params[:id])
+        render json: { success: true, data: serialize(transactions) }
+      end
+
       private
 
       def model_params

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

@@ -17,10 +17,10 @@ module Cats
         render json: { success: false, error: e.message }
       end
 
-      def stack
+      def finish_stacking
         receipt = Cats::Core::Receipt.find(params[:id])
         service = ReceiptService.new
-        result = service.stack(receipt)
+        result = service.finish_stacking(receipt)
         render json: { success: true, data: serialize(result) }
       rescue StandardError => e
         render json: { success: false, error: e.message }

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

@@ -3,8 +3,9 @@ module Cats
     class RhnRequest < ApplicationRecord
       belongs_to :commodity
 
-      validates :reference_no, :request_date, presence: true
+      validates :reference_no, :request_date, :quantity, presence: true
       validates :reference_no, uniqueness: true
+      validates :quantity, numericality: { greater_than: 0 }
 
       delegate(:batch_no, to: :commodity, prefix: true)
     end

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

@@ -11,7 +11,7 @@ module Cats
         receipt
       end
 
-      def stack(receipt)
+      def finish_stacking(receipt)
         unless receipt.status == Cats::Core::Receipt::STACKING
           raise(StandardError, 'Receipt should be in stacking state.')
         end

data/config/routes.rb

@@ -23,6 +23,8 @@ Cats::Core::Engine.routes.draw do
       get 'warehouses', controller: :users, action: :warehouses
     end
   end
+
+  post '/locations/filter', controller: :locations, action: :filter
   resources :locations, except: %i[destroy] do
     member do
       get 'children'
@@ -59,6 +61,7 @@ Cats::Core::Engine.routes.draw do
   get '/dispatches/search', controller: :dispatches, action: :search, as: :search_dispatches
   resources :dispatches, except: %i[index destroy] do
     member do
+      get 'transactions', controller: :dispatch_transactions, action: :index
       get 'receipts', controller: :receipts, action: :index
       get 'commodity'
       post 'approve'
@@ -66,12 +69,13 @@ Cats::Core::Engine.routes.draw do
       post 'confirm'
     end
   end
-  resources :dispatch_transactions, except: %i[new edit destroy]
+  resources :dispatch_transactions, except: %i[index new edit destroy]
   resources :receipts, except: %i[index new edit destroy] do
     member do
+      get 'transactions', controller: :receipt_transactions, action: :index
       post 'start_stacking'
-      post 'stack'
+      post 'finish_stacking'
     end
   end
-  resources :receipt_transactions, except: %i[new edit destroy]
+  resources :receipt_transactions, except: %i[index new edit destroy]
 end

data/db/migrate/20210718042755_create_cats_core_rhn_requests.rb

@@ -6,6 +6,7 @@ class CreateCatsCoreRhnRequests < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'commodity_on_rhn_indx' },
                    foreign_key: { to_table: :cats_core_commodities }
+      t.float :quantity, null: false
       t.date :request_date, null: false
       t.string :requested_by
 

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.7'.freeze
+    VERSION = '1.1.11'.freeze
   end
 end

data/lib/cats_core.rb

@@ -5,3 +5,4 @@ require 'rolify'
 require 'jwt'
 require 'noticed'
 require 'active_model_serializers'
+require 'ransack'

data/spec/factories/cats/core/rhn_requests.rb

@@ -2,6 +2,7 @@ FactoryBot.define do
   factory :rhn_request, class: 'Cats::Core::RhnRequest' do
     reference_no { FFaker::Name.name }
     commodity
+    quantity { 100 }
     request_date { Date.today }
     requested_by { FFaker::Name.name }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.11
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.1.4
+- !ruby/object:Gem::Dependency
+  name: ransack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: rolify
   requirement: !ruby/object:Gem::Requirement