ecom_core 1.2.11 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 716e8bc10325532735dcdd438b66d8d37929de349af86e8c59b30097b9360116
-  data.tar.gz: 98610a46e22f8defefff9f18be57b45a70187755af5a6eb557c407bba5018de1
+  metadata.gz: 53e6b8c84820dca6b1121f9f33ffdffc3f421c2a7aced743a21bac89c25b7580
+  data.tar.gz: 557e5da2ed61cca47e0e80002469f9798d9eb96f26a8357f897beea42c4a0062
 SHA512:
-  metadata.gz: 42969fb77b55640d97e26f7b673c6b6e5c88109b294778cec2a7a21ac87e4870327b8c2d33d75ed46b8958b4a96039cd9ed8ecdcb5589d8ca0fc0afcabb48021
-  data.tar.gz: d9e39437dfee8379d4b1823fd950ccca8ddd56ecb92bf5d485c99c6b31365aad08e956240b27d4b0c67cb8e670be9aa4bb59e8e18b3f5dbe22438386c7c38d04
+  metadata.gz: 23b9c88cb223aa6afec885e5937089695952810e383121f9511a94b58fa5c8fe86787aad5573a61d382511d31bb643a40ba1fe0b50dafe1ea9e4ba7bbf82060f
+  data.tar.gz: d35a3ede79f6735372668c8812e2b49f3b6653bdd577f6b95b936f2a23177c2f8467c3d307a42b07363d6d36189e0374e351305c8908bcdc20ccc3ce1453d666

data/app/models/ecom/core/booked_equipment.rb

@@ -0,0 +1,19 @@
+module Ecom
+  module Core
+    class BookedEquipment < ApplicationRecord
+      BOOKED = 'Booked'.freeze
+      ON_SITE = 'On Site'.freeze
+      RETURNED = 'Returned'.freeze
+
+      STATUSES = [BOOKED, ON_SITE, RETURNED].freeze
+
+      belongs_to :booking_request
+      belongs_to :equipment_item
+      belongs_to :booked_to, class_name: 'Ecom::Core::User'
+
+      validates :start_date, :end_date, :status, presence: true
+      validates :status, inclusion: STATUSES
+      validates_with DateRangeValidator
+    end
+  end
+end

data/app/models/ecom/core/booking_request.rb

@@ -0,0 +1,26 @@
+module Ecom
+  module Core
+    class BookingRequest < ApplicationRecord
+      DRAFT = 'Draft'.freeze
+      UNDER_REVIEW = 'Under Review'.freeze
+      APPROVED = 'Approved'.freeze
+      REJECTED = 'Rejected'.freeze
+
+      STATUSES = [DRAFT, UNDER_REVIEW, APPROVED, REJECTED].freeze
+      belongs_to :equipment
+      belongs_to :country, optional: true
+      belongs_to :requested_by, class_name: 'Ecom::Core::User'
+      belongs_to :approved_by, class_name: 'Ecom::Core::User', optional: true
+
+      validates :start_date, :end_date, :quantity, :status, presence: true
+      validates :status, inclusion: STATUSES
+      validates_with DateRangeValidator
+
+      scope :by_status, ->(status) { where(status: status) }
+
+      def validate_date_range
+        errors.add(:end_date, 'cannot be before start date') if start_date && end_date && start_date > end_date
+      end
+    end
+  end
+end

data/app/models/ecom/core/component_type.rb

@@ -0,0 +1,6 @@
+module Ecom
+  module Core
+    class ComponentType < Lookup
+    end
+  end
+end

data/app/models/ecom/core/country.rb

@@ -0,0 +1,6 @@
+module Ecom
+  module Core
+    class Country < Lookup
+    end
+  end
+end

data/app/models/ecom/core/equipment_component.rb

@@ -2,6 +2,7 @@ module Ecom
   module Core
     class EquipmentComponent < ApplicationRecord
       belongs_to :equipment_item
+      belongs_to :component_type
 
       validates :name, presence: true
     end

data/app/models/ecom/core/equipment_item.rb

@@ -1,13 +1,25 @@
 module Ecom
   module Core
     class EquipmentItem < ApplicationRecord
-      READY = 'Ready'
-      UNDER_MAINTENANCE = 'Under Maintenance'
+      # Equipment Statuses
+      READY = 'Ready'.freeze
+      UNDER_MAINTENANCE = 'Under Maintenance'.freeze
+      EQUIPMENT_STATUSES = [READY, UNDER_MAINTENANCE].freeze
+
+      # Duty Statuses
+      AVAILABLE = 'Available'.freeze
+      BOOKED = 'Booked'.freeze
+      ON_DUTY = 'On Duty'.freeze
+      DUTY_STATUSES = [AVAILABLE, BOOKED, ON_DUTY].freeze
 
       belongs_to :equipment
+      belongs_to :country
       belongs_to :current_location, class_name: 'Ecom::Core::EquipmentLocation'
 
       validates :name, :status, :serial_number, :purchase_date, :purchase_price, presence: true
+      validates :status, inclusion: EQUIPMENT_STATUSES
+      validates :duty_status, inclusion: DUTY_STATUSES
+
       validates :serial_number, uniqueness: true
 
       def self.search(param)

data/app/validators/ecom/core/date_range_validator.rb

@@ -0,0 +1,11 @@
+module Ecom
+  module Core
+    class DateRangeValidator < ActiveModel::Validator
+      def validate(record)
+        return unless record.start_date && record.end_date && record.start_date > record.end_date
+
+        record.errors.add(:base, 'End date cannot be before start date')
+      end
+    end
+  end
+end

data/db/migrate/20200315152143_create_ecom_core_equipment.rb

@@ -4,6 +4,8 @@ class CreateEcomCoreEquipment < ActiveRecord::Migration[6.0]
       t.string :name, null: false
       t.string :description
       t.float :minimum_acquisition_time, null: false, default: 0
+      t.string :brands, array: true, default: []
+      t.string :components, array: true, default: []
       t.references :equipment_category,
                    null: false,
                    index: { name: 'ec_on_ece_indx' },

data/db/migrate/20200315153640_create_ecom_core_equipment_items.rb

@@ -3,7 +3,8 @@ class CreateEcomCoreEquipmentItems < ActiveRecord::Migration[6.0]
     create_table :ecom_core_equipment_items do |t|
       t.string :name, null: false
       t.string :description
-      t.string :status, null: false
+      t.string :status, null: false, default: 'Ready'
+      t.string :duty_status, null: false, default: 'Available'
       t.string :serial_number, unique: true
       t.string :brand
       t.string :item_model
@@ -11,6 +12,10 @@ class CreateEcomCoreEquipmentItems < ActiveRecord::Migration[6.0]
       t.date :purchase_date, null: false
       t.float :license_fee
       t.float :tax
+      t.references :country,
+                   null: false,
+                   index: { name: 'equipment_on_country_indx' },
+                   foreign_key: { to_table: :ecom_core_lookups }
       t.references :equipment,
                    null: false,
                    index: { name: 'equipment_on_ei_indx' },

data/db/migrate/20200316125323_create_ecom_core_equipment_components.rb

@@ -3,10 +3,15 @@ class CreateEcomCoreEquipmentComponents < ActiveRecord::Migration[6.0]
     create_table :ecom_core_equipment_components do |t|
       t.string :serial_number
       t.string :name, null: false
+      t.references :component_type,
+                   null: false,
+                   index: { name: 'ei_on_ct_indx' },
+                   foreign_key: { to_table: :ecom_core_lookups }
       t.references :equipment_item,
                    null: false,
                    index: { name: 'ei_on_ec_indx' },
                    foreign_key: { to_table: :ecom_core_equipment_items }
+      t.string :remark
 
       t.timestamps
     end

data/db/migrate/20200602130247_create_ecom_core_booking_requests.rb

@@ -0,0 +1,31 @@
+class CreateEcomCoreBookingRequests < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_booking_requests do |t|
+      t.date :start_date, null: false
+      t.date :end_date, null: false
+      t.references :equipment,
+                   null: false,
+                   index: { name: 'br_on_equipment_indx' },
+                   foreign_key: { to_table: :ecom_core_equipment }
+      t.integer :quantity, null: false
+      t.string :brand
+      t.references :country,
+                   null: true,
+                   index: { name: 'br_on_country_indx' },
+                   foreign_key: { to_table: :ecom_core_lookups }
+      t.string :components, array: true, default: []
+      t.string :status, null: false
+      t.references :requested_by,
+                   null: false,
+                   index: { name: 'br_on_rb_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.references :approved_by,
+                   null: true,
+                   index: { name: 'br_on_ab_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.string :remark
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200603115317_create_ecom_core_booked_equipments.rb

@@ -0,0 +1,24 @@
+class CreateEcomCoreBookedEquipments < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_booked_equipments do |t|
+      t.references :booking_request,
+                   null: false,
+                   index: { name: 'be_on_br_indx' },
+                   foreign_key: { to_table: :ecom_core_booking_requests }
+      t.references :equipment_item,
+                   null: false,
+                   index: { name: 'be_on_ei_indx' },
+                   foreign_key: { to_table: :ecom_core_equipment_items }
+      t.date :start_date, null: false
+      t.date :end_date, null: false
+      t.string :status, null: false, default: 'Booked'
+      t.references :booked_to,
+                   null: false,
+                   index: { name: 'be_on_bt_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.string :remark
+
+      t.timestamps
+    end
+  end
+end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.11'.freeze
+    VERSION = '1.2.12'.freeze
   end
 end

data/spec/factories/ecom/core/booked_equipments.rb

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :booked_equipment, class: Ecom::Core::BookedEquipment do
+    association :booking_request
+    association :equipment_item
+    start_date { Date.yesterday }
+    end_date { Date.today }
+    association :booked_to, factory: :user
+    remark { FFaker::Name.name }
+  end
+end

data/spec/factories/ecom/core/booking_requests.rb

@@ -0,0 +1,15 @@
+FactoryBot.define do
+  factory :booking_request, class: Ecom::Core::BookingRequest do
+    start_date { Date.yesterday }
+    end_date { Date.today }
+    association :equipment
+    quantity { 1 }
+    brand { FFaker::Name.name }
+    association :country
+    association :requested_by, factory: :user
+    association :approved_by, factory: :user
+    components { [FFaker::Name.name, FFaker::Name.name] }
+    status { Ecom::Core::BookingRequest::DRAFT }
+    remark { FFaker::Name.name }
+  end
+end

data/spec/factories/ecom/core/component_types.rb

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :component_type, class: Ecom::Core::ComponentType, parent: :lookup do
+    type { 'Ecom::Core::ComponentType' }
+  end
+end

data/spec/factories/ecom/core/countries.rb

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :country, class: Ecom::Core::Country, parent: :lookup do
+    type { 'Ecom::Core::Country' }
+  end
+end

data/spec/factories/ecom/core/equipment.rb

@@ -3,6 +3,8 @@ FactoryBot.define do
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     minimum_acquisition_time { 10 }
+    brands { ['Brand I', 'Brand II', 'Brand III'] }
+    components { ['Component I', 'Component II', 'Component III'] }
     association :equipment_category
   end
 end

data/spec/factories/ecom/core/equipment_components.rb

@@ -2,6 +2,8 @@ FactoryBot.define do
   factory :equipment_component, class: Ecom::Core::EquipmentComponent do
     serial_number { FFaker::Name.name }
     name { FFaker::Name.name }
+    remark { FFaker::Name.name }
     association :equipment_item
+    association :component_type
   end
 end

data/spec/factories/ecom/core/equipment_items.rb

@@ -2,7 +2,8 @@ FactoryBot.define do
   factory :equipment_item, class: Ecom::Core::EquipmentItem do
     name { FFaker::Name.name }
     description { FFaker::Name.name }
-    status { FFaker::Name.name }
+    status { Ecom::Core::EquipmentItem::READY }
+    duty_status { Ecom::Core::EquipmentItem::AVAILABLE }
     serial_number { FFaker::Name.name }
     brand { FFaker::Name.name }
     item_model { FFaker::Name.name }
@@ -11,6 +12,7 @@ FactoryBot.define do
     license_fee { 200 }
     tax { 500 }
     association :equipment
+    association :country
     association :current_location, factory: :equipment_location
   end
 end

data/spec/factories/ecom/core/work_products.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :work_product, class: Ecom::Core::WorkProduct do
-    code { FFaker::Name.unique.name }
+    code { FFaker::Name.name }
     name { FFaker::Name.unique.name }
     description { FFaker::Name.name }
     design_reference_no { FFaker::Name.name }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -205,7 +205,11 @@ files:
 - app/models/ecom/core/application_record.rb
 - app/models/ecom/core/attendance_sheet.rb
 - app/models/ecom/core/attendance_sheet_entry.rb
+- app/models/ecom/core/booked_equipment.rb
+- app/models/ecom/core/booking_request.rb
 - app/models/ecom/core/company.rb
+- app/models/ecom/core/component_type.rb
+- app/models/ecom/core/country.rb
 - app/models/ecom/core/crew.rb
 - app/models/ecom/core/crew_overtime.rb
 - app/models/ecom/core/crew_time.rb
@@ -251,6 +255,7 @@ files:
 - app/serializers/ecom/core/user_serializer.rb
 - app/services/ecom/core/menu_service.rb
 - app/services/ecom/core/token_auth_service.rb
+- app/validators/ecom/core/date_range_validator.rb
 - config/database.ci.yml
 - config/routes.rb
 - db/migrate/20190101085530_create_ecom_core_companies.rb
@@ -292,6 +297,8 @@ files:
 - db/migrate/20200410090701_create_ecom_core_overtime_sheets.rb
 - db/migrate/20200410100035_create_ecom_core_overtime_sheet_entries.rb
 - db/migrate/20200410111827_create_ecom_core_crew_overtimes.rb
+- db/migrate/20200602130247_create_ecom_core_booking_requests.rb
+- db/migrate/20200603115317_create_ecom_core_booked_equipments.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
@@ -300,7 +307,11 @@ files:
 - spec/factories/ecom/core/application_modules.rb
 - spec/factories/ecom/core/attendance_sheet_entries.rb
 - spec/factories/ecom/core/attendance_sheets.rb
+- spec/factories/ecom/core/booked_equipments.rb
+- spec/factories/ecom/core/booking_requests.rb
 - spec/factories/ecom/core/companies.rb
+- spec/factories/ecom/core/component_types.rb
+- spec/factories/ecom/core/countries.rb
 - spec/factories/ecom/core/crew_overtimes.rb
 - spec/factories/ecom/core/crew_times.rb
 - spec/factories/ecom/core/crew_types.rb