cats_core 1.1.10 → 1.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad7b5e46d923da177a938b7b5728a731a9ce0dc5368bd3c9acae0670a713cbab
-  data.tar.gz: 07b751a5a1eb18a7a3f9e4f4893ea1b21a9ac74c99c4e975c6fb132861e322b3
+  metadata.gz: 849c78b04184a39a42337994d2cf68e4be874dff4e0420e34a890ce0584658cd
+  data.tar.gz: 85b1a1ff55a91d353329eaebb38e5ff19bb2590bfa8ab2942dd5feb31a7b11c6
 SHA512:
-  metadata.gz: ca48a9753bfcaabe058712978d76f725502f89b3f4cdff386739dc881e3c737dcda23715b0dbb1cbdb7734c85275c5c0c135bb5a53e844a2eb61b4e3a17757eb
-  data.tar.gz: 2f0626ceca03fd6203818f948b5c98ee94161aa6014df76de98836d1a5d8be6c1939df2b23dc0ae7c8f9a9cd9fc6f59c1e5791f0bc6f776ff35e53494dd547f2
+  metadata.gz: 18cb896b37d1c7449e8955e7209bcf663e02b0e43d42fe0c7137f9f8a0e4be5ed1f664d8bc2b2f4e777e15b6f8b6c8efb57114cdb283cdffbc8f51dff6c75d7a
+  data.tar.gz: e477156c701bee3b6dfb5c337fb344bcb1e86d16978e0208e8a9616a7721af364ff63862045f85db2ac825dd8fc876b0198ec87f857a4844064cdf7336a8a315

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

@@ -1,15 +1,20 @@
 module Cats
   module Core
     class UsersController < ApplicationController
-      before_action :set_user, only: %i[stores warehouses]
+      before_action :set_user, only: %i[stores warehouse hub]
 
       def stores
         data = ActiveModelSerializers::SerializableResource.new(@user.stores)
         render json: { success: true, data: data }
       end
 
-      def warehouses
-        data = ActiveModelSerializers::SerializableResource.new(@user.warehouses)
+      def warehouse
+        data = ActiveModelSerializers::SerializableResource.new(@user.warehouse)
+        render json: { success: true, data: data }
+      end
+
+      def hub
+        data = ActiveModelSerializers::SerializableResource.new(@user.hub)
         render json: { success: true, data: data }
       end
 

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

@@ -8,6 +8,7 @@ module Cats
       belongs_to :rhn_request, optional: true
       belongs_to :commodity
       belongs_to :source, class_name: 'Cats::Core::Location'
+      has_many :allocation_items
 
       validates :commodity_status, :allocation_status, presence: true
       validates :reference_no, presence: true, uniqueness: true

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

@@ -0,0 +1,8 @@
+module Cats
+  module Core
+    class NotificationRule < ApplicationRecord
+      validates :code, :roles, presence: true
+      validates :code, uniqueness: true
+    end
+  end
+end

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/models/cats/core/user.rb

@@ -13,10 +13,10 @@ module Cats
       validates :email, uniqueness: true, format: { with: URI::MailTo::EMAIL_REGEXP }
       validate :validate_phone_number
 
-      def warehouses
-        return unless details.key?('warehouses')
+      def warehouse
+        return unless details.key?('warehouse')
 
-        Cats::Core::Location.where(id: details['warehouses'], location_type: Cats::Core::Location::WAREHOUSE)
+        Cats::Core::Location.find_by(id: details['warehouse'], location_type: Cats::Core::Location::WAREHOUSE)
       end
 
       def stores
@@ -25,6 +25,12 @@ module Cats
         Cats::Core::Store.where(id: details['stores'])
       end
 
+      def hub
+        return unless details.key?('hub')
+
+        Cats::Core::Location.find_by(id: details['hub'], location_type: Cats::Core::Location::HUB)
+      end
+
       def validate_phone_number
         return unless phone_number.present?
 

data/config/routes.rb

@@ -20,7 +20,8 @@ Cats::Core::Engine.routes.draw do
   resources :users do
     member do
       get 'stores', controller: :users, action: :stores
-      get 'warehouses', controller: :users, action: :warehouses
+      get 'warehouse', controller: :users, action: :warehouse
+      get 'hub', controller: :users, action: :hub
     end
   end
 

data/db/migrate/20210715114910_create_cats_core_users.rb

@@ -6,7 +6,7 @@ class CreateCatsCoreUsers < ActiveRecord::Migration[6.1]
       t.string :email, unique: true
       t.boolean :active, null: false, default: true
       t.string :password_digest
-      t.jsonb :details
+      t.jsonb :details, null: false, default: {}
       t.string :phone_number
       t.references :application_module,
                    null: false,

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/db/migrate/20211002050739_create_cats_core_notification_rules.rb

@@ -0,0 +1,10 @@
+class CreateCatsCoreNotificationRules < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_notification_rules do |t|
+      t.string :code, unique: true
+      t.string :roles, array: true, null: false
+
+      t.timestamps
+    end
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.10'.freeze
+    VERSION = '1.1.14'.freeze
   end
 end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :notification_rule, class: 'Cats::Core::NotificationRule' do
+    code { FFaker::Name.name }
+    roles { %i[role1 role2] }
+  end
+end

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.10
+  version: 1.1.14
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2021-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -266,6 +266,7 @@ files:
 - app/models/cats/core/menu.rb
 - app/models/cats/core/menu_item.rb
 - app/models/cats/core/notification.rb
+- app/models/cats/core/notification_rule.rb
 - app/models/cats/core/operator.rb
 - app/models/cats/core/program.rb
 - app/models/cats/core/purchase_order.rb
@@ -339,6 +340,7 @@ files:
 - db/migrate/20210727074646_create_cats_core_receipts.rb
 - db/migrate/20210814160628_create_cats_core_receipt_transactions.rb
 - db/migrate/20210814175406_create_cats_core_stack_transactions.rb
+- db/migrate/20211002050739_create_cats_core_notification_rules.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -361,6 +363,7 @@ files:
 - spec/factories/cats/core/locations.rb
 - spec/factories/cats/core/menu_items.rb
 - spec/factories/cats/core/menus.rb
+- spec/factories/cats/core/notification_rules.rb
 - spec/factories/cats/core/notifications.rb
 - spec/factories/cats/core/operators.rb
 - spec/factories/cats/core/programs.rb