cats_core 1.0.20 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e43803d54552bb7ba268834f78d698a473b0228e72d84f368840376b455c676
-  data.tar.gz: f66be9d90ee324a3b986534137e68010c47451fcbf7a64143afa15b369b0a979
+  metadata.gz: 42be12240a7c83fb5885cf25ae71c6926078e982975b6b07d9a3b60cc5c355c3
+  data.tar.gz: 7479ddfee27ddc4f2e7de0b4f40b8efd3e218026cb51ba3bbeb9ea77f8b2ade8
 SHA512:
-  metadata.gz: fca03d960014c11e58d50b5feb9448e8225bf0ff669e55c851d30b2673ec9aa68bdf9be47274a7c0b04b705108e5fce20d6e17806f2e9b287d2c3411548155cd
-  data.tar.gz: c2e9e3fc5caf396c90091e246cd235acfaad8991ff0345d24aec4e568319d2202e73e4b726cd52c866b8fb98c62bea98fc5b8d7d619512a73bb13cb855a64fd9
+  metadata.gz: 3640d304c753328131f660578553eda3bfc50fb98e955a86b35eca4fa3efff58fbe069dcddce891001a566069dc2f3da48a361adb577fbf71a9cca96d56b1f60
+  data.tar.gz: 85786685e2667ac62d0f73d793c78efcbe3c5bebe18524d1c6402acc5188cf60670f0dbfabc9f5229ef4bf3941907c918433bb713758b7077bfe21f62dc06123

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

@@ -0,0 +1,55 @@
+module Cats
+  module Core
+    class CommodityCategoriesController < ApplicationController
+      before_action :set_commodity_category, only: %i[show update]
+
+      def index
+        commodity_categories = Cats::Core::CommodityCategory.all.reject(&:has_children?)
+        data = ActiveModelSerializers::SerializableResource.new(commodity_categories)
+        render json: { success: true, data: data }
+      end
+
+      def show
+        data = ActiveModelSerializers::SerializableResource.new(@commodity_category)
+        render json: { success: true, data: data }
+      end
+
+      def children
+        parent = Cats::Core::CommodityCategory.find(params[:id])
+        data = ActiveModelSerializers::SerializableResource.new(parent.children)
+        render json: { success: true, data: data }
+      end
+
+      def create
+        obj = Cats::Core::CommodityCategory.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 @commodity_category.update(model_params)
+          data = ActiveModelSerializers::SerializableResource.new(@commodity_category)
+          render json: { success: true, data: data }
+        else
+          render json: {
+            success: false, error: @commodity_category.errors.full_messages[0]
+          }, status: :unprocessable_entity
+        end
+      end
+
+      private
+
+      def set_commodity_category
+        @commodity_category = Cats::Core::CommodityCategory.find(params[:id])
+      end
+
+      def model_params
+        params.require('payload').permit(:code, :name, :description, :parent_id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+module Cats
+  module Core
+    class LocationsController < ApplicationController
+      before_action :set_location, only: %i[show update]
+
+      def index
+        locations = Cats::Core::Location.where(location_type: params[:location_type])
+        data = ActiveModelSerializers::SerializableResource.new(locations)
+        render json: { success: true, data: data }
+      end
+
+      def show
+        data = ActiveModelSerializers::SerializableResource.new(@location)
+        render json: { success: true, data: data }
+      end
+
+      def children
+        parent = Cats::Core::Location.find(params[:id])
+        data = ActiveModelSerializers::SerializableResource.new(parent.children)
+        render json: { success: true, data: data }
+      end
+
+      def create
+        obj = Cats::Core::Location.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 @location.update(model_params)
+          data = ActiveModelSerializers::SerializableResource.new(@location)
+          render json: { success: true, data: data }
+        else
+          render json: { success: false, error: @location.errors.full_messages[0] }, status: :unprocessable_entity
+        end
+      end
+
+      private
+
+      def set_location
+        @location = Cats::Core::Location.find(params[:id])
+      end
+
+      def model_params
+        params.require(:payload).permit(:name, :location_type, :description, :parent_id)
+      end
+    end
+  end
+end

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

@@ -6,12 +6,20 @@ module Cats
       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 }
     end
   end
 end

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

@@ -1,6 +1,8 @@
 module Cats
   module Core
     class CommodityCategory < ApplicationRecord
+      has_ancestry
+
       validates :code, presence: true, uniqueness: true
       validates :name, presence: true
     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/hrp_item.rb

@@ -8,6 +8,9 @@ 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 }
+
+      delegate(:name, to: :woreda, prefix: true)
+      delegate(:name, to: :operator, 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/commodity_category_serializer.rb

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

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

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

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

@@ -0,0 +1,3 @@
+class LocationSerializer < ActiveModel::Serializer
+  attributes :id, :name, :location_type, :description, :parent_id
+end

data/config/routes.rb

@@ -1,4 +1,6 @@
 Cats::Core::Engine.routes.draw do
+  get 'locations/index'
+  get 'locations/children'
   post '/login', controller: :access, action: :login
   get '/notifications/unread', controller: :notifications, action: :unread
   get '/notifications/read', controller: :notifications, action: :read
@@ -21,4 +23,15 @@ Cats::Core::Engine.routes.draw do
       get 'warehouses', controller: :users, action: :warehouses
     end
   end
+  resources :locations, except: %i[destroy] do
+    member do
+      get 'children'
+    end
+  end
+  resources :commodity_categories, except: %i[destroy] do
+    member 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,7 @@ 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.timestamps
     end

data/lib/cats/core/version.rb

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

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

@@ -1,10 +1,12 @@
 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 }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.24
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -218,6 +218,9 @@ files:
 - Rakefile
 - 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
 - app/controllers/cats/core/roles_controller.rb
@@ -258,6 +261,9 @@ files:
 - app/models/cats/core/unit_of_measure.rb
 - 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
 - app/services/cats/core/notification_service.rb