cats_core 1.1.12 → 1.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94bf88876f024323ea55e55b6a01fe74af037d2dda21c0c673d969e603d4d3ff
-  data.tar.gz: 865354149f6c009cec575207990fd8c5b47bbf002e5a884f6a2dd717886ba1d8
+  metadata.gz: b5e9151667e330955db4a89a8bf0bdd3d00c297859866ed57aeb763cbcbc48d4
+  data.tar.gz: 903b632addec26d908e48b14b06773fc9757b247c50ea8598dd0932a0714ad8f
 SHA512:
-  metadata.gz: 20da152cd17a483350c82d530d24e09489b0b85a2150752b3bd008902346364cc8cd506dcd8c3c4306558ec47be7a34b5c4215e5bbba7772173b0a1d120ea42f
-  data.tar.gz: 5ef09f36850fcc7a1ce7af5bb5f584d4fe6c1245edc0df3ed1226985fb38e493ac9589036d749b98cdb2db75413fc68356538b1c4035ace11368504dc4bc339d
+  metadata.gz: aab3a1d980859f6660fa0dc49c8d13cf41beb586ea0a74599e2ff94a3ec7be22fe21c65b039c706b37bd79b8b9c0827abe723f59d978a10628e03ad7b26f5d9a
+  data.tar.gz: 6ddf1fbdccd9781098d4ac2f9d3bb42b89d2129bd620c194da91c6508302a19da84aafe3ed2036adee6df36259914cb7e3fa3773c7383cc63fd953436ade2497

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

@@ -16,7 +16,6 @@ module Cats
 
       belongs_to :unit_of_measure
       belongs_to :source, polymorphic: true
-      belongs_to :commodity_category
 
       validates :best_use_before, presence: true
       validates :batch_no, presence: true, uniqueness: true
@@ -25,7 +24,6 @@ module Cats
       validates :arrival_status, presence: true, inclusion: { in: ARRIVAL_STATUSES }
 
       delegate(:abbreviation, to: :unit_of_measure, prefix: true)
-      delegate(:name, to: :commodity_category, prefix: true)
       delegate(:reference_no, to: :source, prefix: true)
 
       def set_approved
@@ -33,6 +31,10 @@ module Cats
 
         self.approved = false
       end
+
+      def name
+        source.commodity_category.name
+      end
     end
   end
 end

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

@@ -2,10 +2,17 @@ module Cats
   module Core
     class GiftCertificate < ApplicationRecord
       belongs_to :donation
+      belongs_to :commodity_category
+      belongs_to :unit_of_measure
 
       validates :reference_no, presence: true, uniqueness: true
-      validates :gift_date, presence: true
+      validates :gift_date, :quantity, presence: true
+      validates :quantity, numericality: { greater_than: 0 }
 
+      delegate(:name, to: :commodity_category, prefix: true)
+      delegate(:abbreviation, to: :unit_of_measure, prefix: true)
+
+      before_save :set_commodity_category
       after_create :update_donation
 
       def update_donation
@@ -15,6 +22,14 @@ module Cats
         donation.active = true
         donation.save!
       end
+
+      def set_commodity_category
+        return unless donation
+
+        return if commodity_category == donation.commodity_category
+
+        self.commodity_category = donation.commodity_category
+      end
     end
   end
 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/app/serializers/cats/core/commodity_serializer.rb

@@ -1,9 +1,9 @@
 module Cats
   module Core
     class CommoditySerializer < ActiveModel::Serializer
-      attributes :id, :batch_no, :description, :unit_of_measure_id, :unit_of_measure_abbreviation, :source_id,
+      attributes :id, :name, :batch_no, :description, :unit_of_measure_id, :unit_of_measure_abbreviation, :source_id,
                  :source_type, :source_reference_no, :quantity, :best_use_before, :volume_per_metric_ton,
-                 :commodity_category_id, :commodity_category_name, :arrival_status, :approved
+                 :arrival_status, :approved
     end
   end
 end

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/20210717032602_create_cats_core_gift_certificates.rb

@@ -15,7 +15,15 @@ class CreateCatsCoreGiftCertificates < ActiveRecord::Migration[6.1]
       t.integer :purchase_year
       t.date :expiry_date
       t.string :bill_of_lading_no
-      t.float :amount, null: false
+      t.float :quantity, null: false
+      t.references :commodity_category,
+                   null: false,
+                   index: { name: 'gc_on_cc_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.references :unit_of_measure,
+                   null: false,
+                   index: { name: 'uom_on_gc_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
       t.float :estimated_price
       t.float :estimated_tax
 

data/db/migrate/20210717033223_create_cats_core_commodities.rb

@@ -6,10 +6,6 @@ class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'uom_on_commodities_indx' },
                    foreign_key: { to_table: :cats_core_unit_of_measures }
-      t.references :commodity_category,
-                   null: false,
-                   index: { name: 'cc_on_commodities_indx' },
-                   foreign_key: { to_table: :cats_core_commodity_categories }
       t.references :source, polymorphic: true
       t.float :quantity, null: false
       t.string :description

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.12'.freeze
+    VERSION = '1.1.16'.freeze
   end
 end

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

@@ -3,7 +3,6 @@ FactoryBot.define do
     batch_no { FFaker::Name.name }
     description { FFaker::Name.name }
     unit_of_measure
-    commodity_category
     source factory: :gift_certificate
     quantity { 100 }
     best_use_before { Date.today + 2.month }

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

@@ -3,13 +3,15 @@ FactoryBot.define do
     reference_no { FFaker::Name.name }
     gift_date { Date.today - 1.month }
     donation
+    commodity_category { donation.commodity_category }
+    unit_of_measure
     vessel { FFaker::Name.name }
     port { FFaker::Name.name }
     customs_declaration_no { FFaker::Name.name }
     purchase_year { 1 }
     expiry_date { Date.today + 6.month }
     bill_of_lading_no { FFaker::Name.name }
-    amount { 1.5 }
+    quantity { 1.5 }
     estimated_price { 1.5 }
     estimated_tax { 1.5 }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.1.16
 platform: ruby
 authors:
 - Henock L.