cats_core 1.4.38 → 1.4.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9686d605fc55bee82820925cab018c53333b5d35885fddcb98bd211c61f6547
-  data.tar.gz: 938a5caa85d500edde7ae4302293beffc06cea17930cabffd2272e38861227cd
+  metadata.gz: 4084a8e84ceacfb0f4e96ebba6f9c1bfb41cdf64e36341955dfd86131a5de89e
+  data.tar.gz: c091888b5e67a9ecc85e3dce2e5fa33aacab4d617bf31767ded0117329c2f4db
 SHA512:
-  metadata.gz: dd42170550910db72d5056a21e126faebbbb285eadd135ec57acc09f76e1919c1768525eacae9068466472a88ca87dffca1cb33bd8a74533cf48bc6214e83ca5
-  data.tar.gz: be577e0ea6605492474c01825bb12e7a179aeddbb96fc0c6778e3a3c6a19813543715fa7a01b6e28e03e628b504b6f83cc6a37b2f5418039e16e47a037690bc2
+  metadata.gz: ca7b27982330acd7df6ebf118e9412fcca962f6436903f7e48c0f1603b5d1bcc1a04b6bb5a508cd7579aa42bedb0e62ed548495759f7a7291b91f3f064ccaaa7
+  data.tar.gz: dac15feb2a1280d856a5ac280498a4b5e7c1585bccdcf74d4a5f78eb41a8e7562c6bdeebf5f53c150586d964cdd2af5663fc5fa588c6765917118526bd7c57c2

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

@@ -14,6 +14,15 @@ module Cats
         render json: { error: 'Unauthorized' }, status: 401 if current_user.nil?
       end
 
+      # In case we want to disable bullet for specific controller actions
+      def skip_bullet
+        previous_value = Bullet.enable?
+        Bullet.enable = false
+        yield
+      ensure
+        Bullet.enable = previous_value
+      end
+
       private
 
       def serialize(data)

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

@@ -4,6 +4,7 @@ module Cats
       include Common
       skip_before_action :authenticate, only: %i[start_with_pin]
       before_action :set_service, only: %i[create_receipt_authorization approve start start_with_pin search confirm]
+      around_action :skip_bullet, if: -> { defined?(Bullet) }, only: %i[search start_with_pin]
 
       def index
         super do

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

@@ -4,6 +4,7 @@ module Cats
       include Common
 
       before_action :set_service, only: %i[approve generate remove_items generate_round_needs]
+      around_action :skip_bullet, if: -> { defined?(Bullet) }, only: %i[generate generate_round_needs remove_items]
 
       def index
         super do

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

@@ -3,6 +3,8 @@ module Cats
     class UsersController < ApplicationController
       include Common
 
+      around_action :skip_bullet, if: -> { defined?(Bullet) }, only: %i[stores]
+
       def index
         super do
           User.joins(:application_module).where(cats_core_application_modules: { prefix: params[:prefix] })

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

@@ -11,7 +11,7 @@ module Cats
       belongs_to :commodity_category, optional: true
       belongs_to :unit_of_measure, optional: true
 
-      validates :reference_no, :amount, :donation_type, :donated_on, :agency, presence: true
+      validates :reference_no, :amount, :donation_type, :donated_on, presence: true
       validates :reference_no, uniqueness: true
       validates :donation_type, inclusion: { in: DONATION_TYPES }
       validates :currency, presence: true, if: -> { donation_type == CASH }

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

@@ -2,10 +2,14 @@ module Cats
   module Core
     class Project < ApplicationRecord
       belongs_to :source, polymorphic: true
+      belongs_to :program
 
       validates :code, presence: true, uniqueness: true
       validates :year, :implementing_agency, presence: true
       validates :year, numericality: { greater_than: 2000 }
+
+      delegate(:code, to: :program, prefix: true)
+      delegate(:reference_no, to: :source, prefix: true)
     end
   end
 end

data/db/migrate/20210717032330_create_cats_core_donations.rb

@@ -6,7 +6,6 @@ class CreateCatsCoreDonations < ActiveRecord::Migration[6.1]
       t.string :donation_type, null: false
       t.string :shipping_reference
       t.date :donated_on, null: false
-      t.string :agency, null: false
       t.references :donor,
                    null: false,
                    index: { name: 'donor_on_donation_indx' },

data/db/migrate/20210717032927_create_cats_core_projects.rb

@@ -4,6 +4,10 @@ class CreateCatsCoreProjects < ActiveRecord::Migration[7.0]
       t.string :code, unique: true
       t.string :description
       t.references :source, polymorphic: true
+      t.references :program,
+                   null: false,
+                   index: { name: 'program_on_projects_indx' },
+                   foreign_key: { to_table: :cats_core_programs } 
       t.integer :year, null: false
       t.string :implementing_agency, null: false
 

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.38'.freeze
+    VERSION = '1.4.41'.freeze
   end
 end

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

@@ -5,7 +5,6 @@ FactoryBot.define do
     donation_type { Cats::Core::Donation::KIND }
     shipping_reference { FFaker::Name.name }
     donated_on { Date.today }
-    agency { 'WFP' }
     donor
     plan
     amount { 100 }

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     code { FFaker::Name.name }
     description { FFaker::Name.name }
     source factory: :gift_certificate
+    program
     year { 2022 }
     implementing_agency { FFaker::Name.name }
   end

metadata

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