cats_core 1.0.30 → 1.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e916c12f4c3ac194aee51c1692ddba4484e234e64f020565d72e4bea7081c4e
-  data.tar.gz: 28e582506d6bbbca6e33bc3f84bc698f9652e3f57684b4c14f15722e0f65ff7f
+  metadata.gz: 5f642691ce490f46cc23534f368644b7bd6cc2069736cae534994aafb8018d40
+  data.tar.gz: a3967aca1998cf19cbfa55af249e8023c664bb4066bb0c40224a209225584485
 SHA512:
-  metadata.gz: d3baf1a07032560ee3136ff454fb4ab21db27d17afdd8eeabe826b4d49c811d261f0a7880c4ae80bafabe03d66ab8a0b699a49fe66fd123a5618b1d3c9dcd285
-  data.tar.gz: f2633626ae8ba4c082618c0406657e0b4378af44d97c5416b329326aaf3dd77584b095541cd257b12698df525ab235b165f147a814dcbf3ca2049869e07a30e0
+  metadata.gz: 8147dfe37fbe8ad5c1ae9e3945b71936e5c0c135a00633fba2c9e3f1a6aeac4ce482d3f4d81e965c0a3cb00d8ac9bec58033b2d8c418a750f9b68b63c61c4788
+  data.tar.gz: d501edb9668b0372c6c6a91092619d467379083cc7c7ef3201856a43f1a53abcb5dcd0a97411d7e083ba8771f9ea66235213b283f5cdac64d870142bc1635840

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

@@ -0,0 +1,49 @@
+module Cats
+  module Core
+    class UnitOfMeasuresController < ApplicationController
+      before_action :set_unit_of_measure, only: %i[show update]
+
+      def index
+        data = ActiveModelSerializers::SerializableResource.new(Cats::Core::UnitOfMeasure.all)
+        render json: { success: true, data: data }
+      end
+
+      def show
+        data = ActiveModelSerializers::SerializableResource.new(@unit_of_measure)
+        render json: { success: true, data: data }
+      end
+
+      def create
+        obj = Cats::Core::UnitOfMeasure.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 @unit_of_measure.update(model_params)
+          data = ActiveModelSerializers::SerializableResource.new(@unit_of_measure)
+          render json: { success: true, data: data }
+        else
+          render json: {
+            success: false,
+            error: @unit_of_measure.errors.full_messages[0]
+          }, status: :unprocessable_entity
+        end
+      end
+
+      private
+
+      def set_unit_of_measure
+        @unit_of_measure = Cats::Core::UnitOfMeasure.find(params[:id])
+      end
+
+      def model_params
+        params.require(:payload).permit(:abbreviation, :name, :unit_type)
+      end
+    end
+  end
+end

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

@@ -6,12 +6,14 @@ module Cats
       belongs_to :source, class_name: 'Cats::Core::Location'
 
       validates :commodity_status, presence: true
+      validates :reference_no, presence: true, uniqueness: true
       validates :quantity, presence: true, numericality: { greater_than: 0 }
       validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
 
       delegate(:reference_no, to: :rhn_request, prefix: :rhn, allow_nil: true)
       delegate(:batch_no, to: :commodity, prefix: true)
       delegate(:name, to: :source, prefix: true)
+      delegate(:location_type, to: :source, prefix: true)
     end
   end
 end

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

@@ -13,6 +13,10 @@ module Cats
 
         errors.add(:base, 'source and destination cannot be the same') if allocation.source == destination
       end
+
+      delegate(:name, to: :destination, prefix: true)
+      delegate(:reference_no, to: :allocation, prefix: true)
+      delegate(:location_type, to: :destination, prefix: true)
     end
   end
 end

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

@@ -5,6 +5,8 @@ module Cats
 
       validates :reference_no, :request_date, presence: true
       validates :reference_no, uniqueness: true
+
+      delegate(:batch_no, to: :commodity, prefix: true)
     end
   end
 end

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

@@ -22,6 +22,8 @@ module Cats
       validate :validate_coordinates, :validate_dimensions, :validate_distance_from_wall, :validate_overlap,
                :validate_space_between_stack
 
+      after_save :update_store_space
+
       def validate_coordinates
         return unless store.present? && length.present? && width.present? && start_x.present? && start_y.present?
 
@@ -99,6 +101,21 @@ module Cats
 
         true
       end
+
+      def update_store_space
+        return unless length_previously_changed? || width_previously_changed? || stack_status_previously_changed?
+
+        old_area = if length_previously_was.nil? && width_previously_was.nil?
+                     0
+                   else
+                     length_previously_was * width_previously_was
+                   end
+
+        store.available_space += old_area
+        store.available_space -= length * width unless stack_status == DESTROYED
+
+        store.save
+      end
     end
   end
 end

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

@@ -15,6 +15,7 @@ module Cats
                 allow_nil: true
       validate :validate_location
 
+      before_create :update_usable_space
       after_save :update_store_keeper
 
       def validate_location
@@ -27,6 +28,12 @@ module Cats
         "#{store_keeper.first_name} #{store_keeper.last_name}"
       end
 
+      def update_usable_space
+        self.usable_space = (length - 2) * (width - 2)
+        self.usable_space -= (gangway_length * gangway_width) if has_gangway
+        self.available_space = self.usable_space
+      end
+
       def update_store_keeper
         return unless store_keeper_id_previously_changed?
 

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

@@ -0,0 +1,3 @@
+class UnitOfMeasureSerializer < ActiveModel::Serializer
+  attributes :id, :abbreviation, :name, :unit_type
+end

data/config/routes.rb

@@ -34,4 +34,5 @@ Cats::Core::Engine.routes.draw do
     end
   end
   resources :currencies, except: %i[destroy]
+  resources :unit_of_measures, except: %i[destroy]
 end

data/db/migrate/20210717140855_create_cats_core_stores.rb

@@ -5,6 +5,8 @@ class CreateCatsCoreStores < ActiveRecord::Migration[6.1]
       t.float :length, null: false
       t.float :width, null: false
       t.float :height, null: false
+      t.float :usable_space, null: false
+      t.float :available_space, null: false
       t.boolean :temporary, null: false, default: false
       t.boolean :has_gangway, null: false, default: false
       t.float :gangway_length

data/db/migrate/20210718042823_create_cats_core_allocations.rb

@@ -1,6 +1,7 @@
 class CreateCatsCoreAllocations < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_allocations do |t|
+      t.string :reference_no, unique: true
       t.references :rhn_request,
                    null: true,
                    index: { name: 'rr_on_allocation_indx' },

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.30'.freeze
+    VERSION = '1.0.34'.freeze
   end
 end

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

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :allocation, class: 'Cats::Core::Allocation' do
+    reference_no { FFaker::Name.name }
     rhn_request { nil }
     commodity
     source factory: :location

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.30
+  version: 1.0.34
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -224,6 +224,7 @@ files:
 - app/controllers/cats/core/menus_controller.rb
 - app/controllers/cats/core/notifications_controller.rb
 - app/controllers/cats/core/roles_controller.rb
+- app/controllers/cats/core/unit_of_measures_controller.rb
 - app/controllers/cats/core/users_controller.rb
 - app/jobs/cats/core/application_job.rb
 - app/models/cats/core/allocation.rb
@@ -267,6 +268,7 @@ files:
 - app/serializers/cats/core/currency_serializer.rb
 - app/serializers/cats/core/location_serializer.rb
 - app/serializers/cats/core/role_menu_serializer.rb
+- app/serializers/cats/core/unit_of_measure_serializer.rb
 - app/services/cats/core/menu_service.rb
 - app/services/cats/core/notification_service.rb
 - app/services/cats/core/token_auth_service.rb