cats_core 1.3.1 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d4aec729abe0584f124c74a2a86fbcfa0d068b6c5b968a847a4a040595e19a8
-  data.tar.gz: 8b880262cb1ffcb7f92d1e7f2de5039feafac1805f3d9434122abd448c5dc6ea
+  metadata.gz: 0c3d4ff631edb9b8c8b84475b5dbc38866a8dc7ee2e6b91d1ae7d0e986ae22c1
+  data.tar.gz: ffb3251702f63bba57a7f3c89f960b175b1d341d03ce35468fef4a5b660531e7
 SHA512:
-  metadata.gz: 07e042748a002c29d571ec68788ac3ae3369569b41aa60affafeaa0236270bb28a64f5aebb0a48a43eb52b14beb0483b8d72b14f92649d1856b8b77496b53075
-  data.tar.gz: 387e10b63ecdc87555742a4aad7f505324aa06d569bdf7a7358efc57820886674dd0983673f9fefc5304ed697be276baefef5f63e7961f35134c3d0181f407a6
+  metadata.gz: 11f445e39c09484942cd571ec81bf78b23a182dac03f37f89270c359902f75103e2ce0ca0240b9954c5fc580b7af34ac16686d2eaf05ea7dcd9193172abfba60
+  data.tar.gz: 9b0dc2b6d6eded7d43aec38c7c9742e4bf10c2f33be48315f172fdb3b278ef697e0e00a2febd5451bb9fbb0d096b2f8977fa2a31fbd7723721813ab5725bd48e

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

@@ -3,6 +3,11 @@ module Cats
     class RoutesController < ApplicationController
       include Common
 
+      def filter
+        query = Cats::Core::Route.ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
       private
 
       def model_params

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

@@ -6,7 +6,7 @@ module Cats
       DONATION_TYPES = [CASH, KIND].freeze
 
       belongs_to :donor
-      belongs_to :plan
+      belongs_to :plan, optional: true
       belongs_to :currency, optional: true
       belongs_to :commodity_category, optional: true
       belongs_to :unit_of_measure, optional: true

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

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class GiftCertificate < ApplicationRecord
-      belongs_to :donation
+      belongs_to :donation, optional: true
       belongs_to :commodity_category
       belongs_to :unit_of_measure
 

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

@@ -0,0 +1,26 @@
+module Cats
+  module Core
+    class RegionalRequest < ApplicationRecord
+      belongs_to :plan
+
+      validates :reference_no, presence: true, uniqueness: true
+      validates :beneficiaries, :no_of_days, :month, presence: true, numericality: { greater_than: 0 }
+      validate :validate_month, :validate_beneficiaries
+
+      def validate_month
+        return unless month
+
+        errors.add(:month, 'cannot be greater than 12.') if month > 12
+      end
+
+      def validate_beneficiaries
+        return unless beneficiaries
+
+        return unless plan
+
+        total = plan.plan_items.sum(:beneficiaries)
+        errors.add(:beneficiaries, "cannot be higher than #{total}.") if total < beneficiaries
+      end
+    end
+  end
+end

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

@@ -10,6 +10,8 @@ module Cats
       validates :source_id, uniqueness: { scope: :destination_id }
       validate :validate_region, :validate_source, :validate_destination
 
+      delegate(:name, to: :region, prefix: true)
+
       def set_name
         return unless source && destination
 

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

@@ -11,6 +11,7 @@ module Cats
       has_many :transport_bid_items
       has_many :transport_offers
       has_many :offer_items, through: :transport_offers
+      has_many :tenderers
       belongs_to :region, class_name: 'Cats::Core::Location', optional: true
       belongs_to :transport_plan
 

data/app/serializers/cats/core/route_serializer.rb

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class RouteSerializer < ActiveModel::Serializer
-      attributes :id, :name, :source_id, :destination_id
+      attributes :id, :name, :source_id, :destination_id, :region_id, :region_name
     end
   end
 end

data/config/routes.rb

@@ -66,6 +66,8 @@ Cats::Core::Engine.routes.draw do
   end
   resources :currencies, except: %i[destroy]
   resources :unit_of_measures, except: %i[destroy]
+
+  post '/routes/filter', controller: :routes, action: :filter
   resources :routes, except: %i[destroy]
 
   post '/dispatch_plans/filter', controller: :dispatch_plans, action: :filter

data/db/migrate/20210717032330_create_cats_core_donations.rb

@@ -2,6 +2,7 @@ class CreateCatsCoreDonations < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_donations do |t|
       t.string :reference_no, unique: true
+      t.string :description
       t.string :donation_type, null: false
       t.date :donated_on, null: false
       t.references :donor,
@@ -9,7 +10,7 @@ class CreateCatsCoreDonations < ActiveRecord::Migration[6.1]
                    index: { name: 'donor_on_donation_indx' },
                    foreign_key: { to_table: :cats_core_donors }
       t.references :plan,
-                   null: false,
+                   null: true,
                    index: { name: 'plan_on_donation_indx' },
                    foreign_key: { to_table: :cats_core_plans }
       t.float :amount, null: false

data/db/migrate/20210717032602_create_cats_core_gift_certificates.rb

@@ -5,10 +5,10 @@ class CreateCatsCoreGiftCertificates < ActiveRecord::Migration[6.1]
       t.date :gift_date, null: false
 
       t.references :donation,
-                   null: false,
+                   null: true,
                    index: { name: 'gc_on_donation_indx' },
                    foreign_key: { to_table: :cats_core_donations }
-      
+
       t.string :vessel
       t.string :port
       t.string :customs_declaration_no

data/db/migrate/20211215124452_create_cats_core_transport_bid_items.rb

@@ -14,6 +14,6 @@ class CreateCatsCoreTransportBidItems < ActiveRecord::Migration[6.1]
       t.timestamps
     end
 
-    add_index :cats_core_transport_bid_items, :transport_plan_item_id, unique: true
+    add_index :cats_core_transport_bid_items, :transport_plan_item_id, unique: true, name: 'tbi_on_tpi_uniq_indx'
   end
 end

data/db/migrate/20220105084347_create_cats_core_regional_requests.rb

@@ -0,0 +1,16 @@
+class CreateCatsCoreRegionalRequests < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_regional_requests do |t|
+      t.string :reference_no, unique: true
+      t.integer :beneficiaries, null: false
+      t.integer :month, null: false
+      t.integer :no_of_days, null: false
+      t.references :plan,
+                   null: false,
+                   index: { name: 'plan_on_rr_indx' },
+                   foreign_key: { to_table: :cats_core_plans }
+
+      t.timestamps
+    end
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.1'.freeze
+    VERSION = '1.3.5'.freeze
   end
 end

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

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :donation, class: 'Cats::Core::Donation' do
     reference_no { FFaker::Name.name }
+    description { FFaker::Name.name }
     donation_type { Cats::Core::Donation::KIND }
     donated_on { Date.today }
     donor

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

@@ -0,0 +1,13 @@
+FactoryBot.define do
+  factory :regional_request, class: 'Cats::Core::RegionalRequest' do
+    plan do
+      pl = create(:plan)
+      3.times { create(:plan_item, plan: pl, beneficiaries: 100) }
+      pl
+    end
+    reference_no { FFaker::Name.name }
+    beneficiaries { 100 }
+    month { 1 }
+    no_of_days { 30 }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.5
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-03 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -282,6 +282,7 @@ files:
 - app/models/cats/core/ration_item.rb
 - app/models/cats/core/receipt.rb
 - app/models/cats/core/receipt_transaction.rb
+- app/models/cats/core/regional_request.rb
 - app/models/cats/core/rhn_request.rb
 - app/models/cats/core/role.rb
 - app/models/cats/core/role_menu.rb
@@ -380,6 +381,7 @@ files:
 - db/migrate/20211229160128_create_cats_core_contract_items.rb
 - db/migrate/20211229160129_create_cats_core_commodity_substitutions.rb
 - db/migrate/20220103152802_create_cats_core_tenderers.rb
+- db/migrate/20220105084347_create_cats_core_regional_requests.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -416,6 +418,7 @@ files:
 - spec/factories/cats/core/rations.rb
 - spec/factories/cats/core/receipt_transactions.rb
 - spec/factories/cats/core/receipts.rb
+- spec/factories/cats/core/regional_requests.rb
 - spec/factories/cats/core/rhn_requests.rb
 - spec/factories/cats/core/role_menus.rb
 - spec/factories/cats/core/roles.rb