cats_core 1.3.0 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 023c32016bdf9ca32dc84e1b1742df1baa1a3ed44748115551c8d2ca493d01e2
-  data.tar.gz: 912fd8caf76f4543c5c611aa6f5845914c4f03cd08eab74ba3ee8355f3be3ee4
+  metadata.gz: c44a1c208dbd4626ab5eb07ff44c2282e62d37f9ed2023f192de81f948db2b1b
+  data.tar.gz: aaad5e4d7d06b00d6277b60abd7b04e398e01122599f225c99fdfe2d777ddad3
 SHA512:
-  metadata.gz: 6066a9c4cf2a68e1c352afa61f6e8d592723e57dc8f0786e65c697743863b9d200cee5bd0f41f06012cef1d73f368c58940fa1e5d15c42d8a78234426f8a3cd2
-  data.tar.gz: 57f4fb61c65e1dcad1815d76f23234f7b58a38f0678ceb60f72b561bec5ac03c014e8a5c5ba7bf8c161fcfae2664865eb96cf1e0d3c29dd56f97caa5c8af5336
+  metadata.gz: adde6b14c19da6ea4f651351f42249804a5fe4404293f9a7f80e860c3e11527821016859372307a0b4be13d2b007ffdc5171efd87bdb8a397567db468f12acd8
+  data.tar.gz: f28db6afdbab5f01ad463293132d697bbb94870b841833fb795ff6af0a771ca6bf61bc75df9c3067495001055bb50ecb5749ec9dcbaa8e3f9619d4f28f1553dc

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/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/offer_item.rb

@@ -8,6 +8,8 @@ module Cats
       validates :rank, numericality: { greater_than: 0 }, allow_nil: true
       validate :validate_rank_is_set_for_winner
 
+      delegate(:route, to: :transport_bid_item)
+
       def mark_as_winner(rank)
         raise(StandardError, 'Offer item already marked as winner.') if winner
 

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

@@ -10,6 +10,10 @@ module Cats
       validates :transport_plan_item_id, uniqueness: true
 
       delegate(:reference_no, to: :transport_bid, prefix: true)
+
+      def route
+        transport_plan_item.route.name
+      end
     end
   end
 end

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/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/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.3.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.4
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-03 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers