cats_core 1.0.21 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc104d1c83591c9db1a70f89044e124322826738e56a7803c5ae0487421e3f17
-  data.tar.gz: 4f80cded8f41799a6d77c87f8c920db0eb3ca86f8bad20a230a246ef35a667ca
+  metadata.gz: 3b4daffc3ad671e1f4b955ec649f6186cc8048ffc0a74972292e2b745460b28c
+  data.tar.gz: a75cb602fd8859e7e39f064212cee3daafc6a8dfda04247614d2608058433183
 SHA512:
-  metadata.gz: 067a3510964611f5ab157eb661613082148bbd27b55ce0bd8cf89bea7a6d582099f0f17e44e7b31434acafcff2c68660da58e300c21d381a675a8d38be6c0dec
-  data.tar.gz: b5068dda8fa207fbaa39282fa106c63a84e291777900c660e177b12ca5709059ef2d9c479ed239ea3a08b924b102846d6e5d944bdbe0a69c3d17a53a20c0f04b
+  metadata.gz: 43c85afb0693fb6158597758b1a8399e6490b7fdcaf7291dda9304e02be716aab33e25f02408539a46e5b3c3adddd746e9a94ed14754999ec51048c411408041
+  data.tar.gz: d7dc26e79aafdf1429fc0d1a40a988f9608c6db56c137cc2a46cfdeb630fa957882329fc1cca0df8dd9396651b2dcd372193eb75129d0d743da6df3e10efc961

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

@@ -0,0 +1,46 @@
+module Cats
+  module Core
+    class CurrenciesController < ApplicationController
+      before_action :set_currency, only: %i[show update]
+
+      def index
+        data = ActiveModelSerializers::SerializableResource.new(Cats::Core::Currency.all)
+        render json: { success: true, data: data }
+      end
+
+      def show
+        data = ActiveModelSerializers::SerializableResource.new(@currency)
+        render json: { success: true, data: data }
+      end
+
+      def create
+        obj = Cats::Core::Currency.new(model_params)
+        if obj.save
+          data = ActiveModelSerializers::SerializableResource.new(obj)
+          render json: { success: true, data: data }, status: :created
+        else
+          render json: { success: false, error: obj.errors.full_messages[0] }, status: :unprocessable_entity
+        end
+      end
+
+      def update
+        if @currency.update(model_params)
+          data = ActiveModelSerializers::SerializableResource.new(@currency)
+          render json: { success: true, data: data }
+        else
+          render json: { success: false, error: @currency.errors.full_messages[0] }, status: :unprocessable_entity
+        end
+      end
+
+      private
+
+      def set_currency
+        @currency = Cats::Core::Currency.find(params[:id])
+      end
+
+      def model_params
+        params.require(:payload).permit(:code, :name)
+      end
+    end
+  end
+end

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

@@ -46,7 +46,7 @@ module Cats
       end
 
       def model_params
-        params.require('payload').permit(:name, :location_type, :description, :parent_id)
+        params.require(:payload).permit(:name, :location_type, :description, :parent_id)
       end
     end
   end

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

@@ -1,17 +1,33 @@
 module Cats
   module Core
     class Commodity < ApplicationRecord
+      after_initialize :set_approved
+
       # Commodity statuses
       GOOD = 'Good'.freeze
       DAMAGED = 'Damaged'.freeze
       COMMODITY_STATUSES = [GOOD, DAMAGED].freeze
 
+      # Arrival Statuses
+      AT_SOURCE = 'At Source'.freeze
+      IN_TRANSIT = 'In Transit'.freeze
+      ARRIVED = 'Arrived'.freeze
+      ARRIVAL_STATUSES = [AT_SOURCE, IN_TRANSIT, ARRIVED].freeze
+
       belongs_to :unit_of_measure
       belongs_to :source, polymorphic: true
 
       validates :best_use_before, presence: true
+      validates :batch_no, presence: true, uniqueness: true
       validates :quantity, presence: true, numericality: { greater_than: 0 }
       validates :volume_per_metric_ton, numericality: { greater_than: 0, allow_nil: true }
+      validates :arrival_status, presence: true, inclusion: { in: ARRIVAL_STATUSES }
+
+      def set_approved
+        return unless new_record?
+
+        self.approved = false
+      end
     end
   end
 end

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

@@ -13,6 +13,9 @@ module Cats
       validates :reference_no, uniqueness: true
       validates :donation_type, inclusion: { in: DONATION_TYPES }
       validates :currency, :amount, presence: true, if: -> { donation_type == CASH }
+
+      delegate(:name, to: :donor, prefix: true)
+      delegate(:reference_no, to: :hrp, prefix: true)
     end
   end
 end

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

@@ -6,6 +6,8 @@ module Cats
 
       validates :reference_no, presence: true, uniqueness: true
       validates :gift_date, presence: true
+
+      delegate(:name, to: :commodity_category, prefix: true)
     end
   end
 end

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

@@ -6,6 +6,8 @@ module Cats
 
       validates :reference_no, :order_date, :supplier, presence: true
       validates :reference_no, uniqueness: true
+
+      delegate(:name, to: :commodity_category, prefix: true)
     end
   end
 end

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

@@ -0,0 +1,3 @@
+class CurrencySerializer < ActiveModel::Serializer
+  attributes :id, :code, :name
+end

data/config/routes.rb

@@ -33,4 +33,5 @@ Cats::Core::Engine.routes.draw do
       get 'children'
     end
   end
+  resources :currencies, except: %i[destroy]
 end

data/db/migrate/20210717033223_create_cats_core_commodities.rb

@@ -1,6 +1,7 @@
 class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_commodities do |t|
+      t.string :batch_no, unique: true
       t.references :unit_of_measure,
                    null: false,
                    index: { name: 'uom_on_commodities_indx' },
@@ -10,6 +11,8 @@ class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
       t.string :description
       t.date :best_use_before, null: false
       t.float :volume_per_metric_ton
+      t.string :arrival_status, null: false, default: 'At Source'
+      t.boolean :approved, null: false, default: false
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.21'.freeze
+    VERSION = '1.0.25'.freeze
   end
 end

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

@@ -1,10 +1,13 @@
 FactoryBot.define do
   factory :commodity, class: 'Cats::Core::Commodity' do
+    batch_no { FFaker::Name.name }
     description { FFaker::Name.name }
     unit_of_measure
     source factory: :gift_certificate
     quantity { 100 }
     best_use_before { Date.today + 2.month }
     volume_per_metric_ton { 10 }
+    arrival_status { Cats::Core::Commodity::AT_SOURCE }
+    approved { false }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.25
 platform: ruby
 authors:
 - Henock L.
@@ -219,6 +219,7 @@ files:
 - app/controllers/cats/core/access_controller.rb
 - app/controllers/cats/core/application_controller.rb
 - app/controllers/cats/core/commodity_categories_controller.rb
+- app/controllers/cats/core/currencies_controller.rb
 - app/controllers/cats/core/locations_controller.rb
 - app/controllers/cats/core/menus_controller.rb
 - app/controllers/cats/core/notifications_controller.rb
@@ -261,6 +262,7 @@ files:
 - app/models/cats/core/user.rb
 - app/notifications/cats/core/simple_notification.rb
 - app/serializers/cats/core/commodity_category_serializer.rb
+- app/serializers/cats/core/currency_serializer.rb
 - app/serializers/cats/core/location_serializer.rb
 - app/serializers/cats/core/role_menu_serializer.rb
 - app/services/cats/core/menu_service.rb