cats_core 1.0.16 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38525dbc996619fc301d108816acab2e97b65362a5feca9251a6c112b53dc3c6
-  data.tar.gz: 465da29b3725b9f51bd9b9b34857e5b4edfefeaaf24f7d8b7b3cffbd485067c7
+  metadata.gz: 1e43803d54552bb7ba268834f78d698a473b0228e72d84f368840376b455c676
+  data.tar.gz: f66be9d90ee324a3b986534137e68010c47451fcbf7a64143afa15b369b0a979
 SHA512:
-  metadata.gz: 02b4f3b1693f0eb5a1e4108861a65f0a27a8852682a80a9ee62060cdc58d28849258e9c518909a850157eec2bd963a50bd7cedd6a6439ffbb9dc3e62c175b761
-  data.tar.gz: e6a6d7d6d7af63671e28ae6f48d8128811e5bc04125a70c2027aae0d5604478ff3c0ea056cb33a12b8c0e6105b7db1eea762f2fbd187365c55e3be0738c60b7c
+  metadata.gz: fca03d960014c11e58d50b5feb9448e8225bf0ff669e55c851d30b2673ec9aa68bdf9be47274a7c0b04b705108e5fce20d6e17806f2e9b287d2c3411548155cd
+  data.tar.gz: c2e9e3fc5caf396c90091e246cd235acfaad8991ff0345d24aec4e568319d2202e73e4b726cd52c866b8fb98c62bea98fc5b8d7d619512a73bb13cb855a64fd9

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

@@ -1,9 +1,9 @@
 module Cats
   module Core
     class Donation < ApplicationRecord
-      FUND = 'Fund'.freeze
+      CASH = 'Cash'.freeze
       KIND = 'Kind'.freeze
-      DONATION_TYPES = [FUND, KIND].freeze
+      DONATION_TYPES = [CASH, KIND].freeze
 
       belongs_to :donor
       belongs_to :hrp
@@ -12,7 +12,7 @@ module Cats
       validates :reference_no, :donation_type, :donated_on, presence: true
       validates :reference_no, uniqueness: true
       validates :donation_type, inclusion: { in: DONATION_TYPES }
-      validates :currency, :amount, presence: true, if: -> { donation_type == FUND }
+      validates :currency, :amount, presence: true, if: -> { donation_type == CASH }
     end
   end
 end

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

@@ -5,10 +5,15 @@ module Cats
       APPROVED = 'Approved'.freeze
       STATUSES = [DRAFT, APPROVED].freeze
 
-      belongs_to :program
+      BELG = 'Belg'.freeze
+      MEHER = 'Meher'.freeze
+      SEASONS = [BELG, MEHER].freeze
+
       belongs_to :ration
+      has_many :hrp_items
 
-      validates :reference_no, :year, :season, :status, presence: true
+      validates :reference_no, :year, :status, presence: true
+      validates :season, presence: true, inclusion: { in: SEASONS }
       validates :reference_no, uniqueness: true
       validates :status, inclusion: { in: STATUSES }
     end

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

@@ -7,6 +7,7 @@ module Cats
 
       validates :beneficiaries, presence: true, numericality: { greater_than: 0 }
       validates :commodity_amount, presence: true, numericality: { greater_than: 0 }
+      validates :hrp_id, uniqueness: { scope: :woreda_id }
     end
   end
 end

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

@@ -5,7 +5,6 @@ module Cats
       rolify role_cname: 'Cats::Core::Role'
 
       belongs_to :application_module
-      has_and_belongs_to_many :roles, join_table: :cats_core_users_cats_core_roles
       has_many :notifications, as: :recipient
 
       validates :password, length: { minimum: 6 }, if: proc { |u| u.password.present? }, on: :update

data/db/migrate/20210717031810_create_cats_core_hrps.rb

@@ -5,10 +5,7 @@ class CreateCatsCoreHrps < ActiveRecord::Migration[6.1]
       t.integer :year, null: false
       t.string :season, null: false
       t.string :status, null: false, default: 'Draft'
-      t.references :program,
-                   null: false,
-                   index: { name: 'program_on_hrp_indx' },
-                   foreign_key: { to_table: :cats_core_programs }
+
       t.references :ration,
                    null: false,
                    index: { name: 'ration_on_hrp_indx' },

data/db/migrate/20210717032024_create_cats_core_hrp_items.rb

@@ -18,5 +18,7 @@ class CreateCatsCoreHrpItems < ActiveRecord::Migration[6.1]
 
       t.timestamps
     end
+
+    add_index :cats_core_hrp_items, [:hrp_id, :woreda_id], unique: true
   end
 end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.16'.freeze
+    VERSION = '1.0.20'.freeze
   end
 end

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

@@ -2,9 +2,8 @@ FactoryBot.define do
   factory :hrp, class: 'Cats::Core::Hrp' do
     reference_no { FFaker::Name.name }
     year { 1 }
-    season { FFaker::Name.name }
+    season { Cats::Core::Hrp::BELG }
     status { Cats::Core::Hrp::DRAFT }
-    program
     ration
   end
 end

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

@@ -4,5 +4,6 @@ FactoryBot.define do
     program
     commodity_category
     amount { 1.5 }
+    current { false }
   end
 end

metadata

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