ecom_core 1.2.6 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa793b02a7d9a24882708250c891541910d0f2d4d97c8e713f0226a03da2c7b9
-  data.tar.gz: 102319f9e9313bac6294441dbb4218dc3ed61fd527b4e5fdc81fbf6e3f70032e
+  metadata.gz: 53e6b8c84820dca6b1121f9f33ffdffc3f421c2a7aced743a21bac89c25b7580
+  data.tar.gz: 557e5da2ed61cca47e0e80002469f9798d9eb96f26a8357f897beea42c4a0062
 SHA512:
-  metadata.gz: a80e478986df2a080fc9573565fcbe99bb75313c95a54946d74b731633c2f67877dc9371ddd014c9cbd6b358edeef1319b2e8c00b632a2c404b03479eb4e7c97
-  data.tar.gz: 3bcfcd09666b8847e6d61ae03908a799eb7ce02322fa97f42a78a2d4dbdac81a40aa22d4cf44967a0bd52ecea8587b8120f71248aaf7feb55e0ad6c0b5a5f809
+  metadata.gz: 23b9c88cb223aa6afec885e5937089695952810e383121f9511a94b58fa5c8fe86787aad5573a61d382511d31bb643a40ba1fe0b50dafe1ea9e4ba7bbf82060f
+  data.tar.gz: d35a3ede79f6735372668c8812e2b49f3b6653bdd577f6b95b936f2a23177c2f8467c3d307a42b07363d6d36189e0374e351305c8908bcdc20ccc3ce1453d666

data/app/constants/ecom/core/status_constants.rb

@@ -0,0 +1,11 @@
+module Ecom
+  module Core
+    class StatusConstants
+      OPEN = 'Open'.freeze
+      SUBMITTED = 'Submitted'.freeze
+      APPROVED = 'Approved'.freeze
+
+      STATUSES = [OPEN, SUBMITTED, APPROVED].freeze
+    end
+  end
+end

data/app/controllers/ecom/core/access_controller.rb

@@ -18,7 +18,7 @@ module Ecom
               return
             end
 
-            payload = { id: user.id, email: user.email, name: user.full_name, roles: roles }
+            payload = { id: user.id, email: user.email, name: user.full_name, roles: roles, projects: user.projects }
             jwt = TokenAuthService.issue(payload)
             render json: { token: jwt, user: payload, error: nil }
           else

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

@@ -1,37 +1,43 @@
 module Ecom
   module Core
     class AttendanceSheet < ApplicationRecord
-      OPEN = 'Open'.freeze
-      SUBMITTED = 'Submitted'.freeze
-      APPROVED = 'Approved'.freeze
-
-      validates :date, presence: true, uniqueness: true
-      validates :status, inclusion: [OPEN, SUBMITTED, APPROVED]
+      validates :date, presence: true, uniqueness: { scope: :project_id }
+      validates :status, inclusion: StatusConstants::STATUSES
 
       belongs_to :project
 
       has_many :attendance_sheet_entries
       has_many :crew_times, through: :attendance_sheet_entries
 
-      scope :open, ->(id) { where(status: OPEN, project_id: id) }
-      scope :submitted, ->(id) { where(status: SUBMITTED, project_id: id) }
-      scope :current, ->(id) { where(date: Date.today, project_id: id) }
-      scope :current_open, ->(id) { where(date: Date.today, project_id: id, status: OPEN) }
+      scope :by_project, ->(id) { where(project_id: id) }
+      scope :by_date, ->(date) { where(date: date) }
+      scope :by_status, ->(status) { where(status: status) }
+      scope :by_date_between, ->(from, to) { where('date BETWEEN ? AND ?', from, to) }
 
       def self.open_for_date(date, project_id)
-        AttendanceSheet.find_by(status: OPEN, date: date, project_id: project_id)
+        AttendanceSheet.find_by(status: StatusConstants::OPEN, date: date, project_id: project_id)
       end
 
       def self.open_exists?(project_id)
-        AttendanceSheet.open(project_id).exists?
+        AttendanceSheet
+          .by_project(project_id)
+          .by_status(StatusConstants::OPEN)
+          .exists?
       end
 
       def self.exists_for_today?(project_id)
-        AttendanceSheet.current(project_id).exists?
+        AttendanceSheet
+          .by_project(project_id)
+          .by_date(Date.today)
+          .exists?
       end
 
       def self.open_exists_for_today?(project_id)
-        AttendanceSheet.current_open(project_id).exists?
+        AttendanceSheet
+          .by_project(project_id)
+          .by_date(Date.today)
+          .by_status(StatusConstants::OPEN)
+          .exists?
       end
 
       # Attendance sheet should be created using the
@@ -46,16 +52,16 @@ module Ecom
           raise 'There is an open attendance sheet which needs to be submitted before creating a new one.'
         end
 
-        AttendanceSheet.create(date: Date.today, opened_at: Time.now, status: OPEN, project_id: project_id)
+        AttendanceSheet.create(date: Date.today, opened_at: Time.now, status: StatusConstants::OPEN, project_id: project_id)
       end
 
       def self.submit_current(project_id)
-        sheet = AttendanceSheet.find_by(date: Date.today, status: OPEN, project_id: project_id)
+        sheet = AttendanceSheet.find_by(date: Date.today, status: StatusConstants::OPEN, project_id: project_id)
 
         raise 'There is no open attendance sheet to submit.' if sheet.nil?
 
         sheet.closed_at = Time.now
-        sheet.status = SUBMITTED
+        sheet.status = StatusConstants::SUBMITTED
         sheet.save
         sheet
       end
@@ -69,7 +75,7 @@ module Ecom
         raise 'There is no open attendance sheet to submit for the selected day.' unless sheet
 
         sheet.closed_at = Time.now
-        sheet.status = SUBMITTED
+        sheet.status = StatusConstants::SUBMITTED
         sheet.save
         sheet
       end

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/crew.rb

@@ -2,15 +2,21 @@ module Ecom
   module Core
     class Crew < ApplicationRecord
       PERMANENT = 'Permanent'.freeze
+      SUPERVISOR = 'Supervisor'.freeze
       TEMPORARY = 'Temporary'.freeze
+      EMPLOYMENT_TYPES = [PERMANENT, SUPERVISOR, TEMPORARY].freeze
 
       before_save :set_employment_date,
                   if: proc { |c| c.employment_date.nil? }
 
       belongs_to :crew_type
 
-      validates :name, :qualification, presence: true
-      validates :employment, inclusion: [PERMANENT, TEMPORARY]
+      validates :name, :address, :qualification, :employment, :wage, :wage_in_words, presence: true
+      validates :employment, inclusion: EMPLOYMENT_TYPES
+
+      scope :by_active, ->(active) { where(active: active) }
+      scope :by_qualification, ->(qualification) { where(qualification: qualification) }
+      scope :by_sub_contracted, ->(sub_contracted) { where(sub_contracted: sub_contracted) }
 
       def set_employment_date
         self.employment_date = Date.today

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

@@ -10,6 +10,11 @@ module Ecom
 
       validates :hours, :raw_hours, presence: true
 
+      scope :by_overtime, lambda { |id|
+        joins(:overtime_sheet_entry).where(ecom_core_overtime_sheet_entries: { overtime_sheet_id: id })
+      }
+      scope :revised, ->(revised) { where(revised: revised) }
+
       before_save :calculate_hours
 
       def calculate_hours

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

@@ -7,8 +7,8 @@ module Ecom
       BOTH = 'Both'.freeze
 
       TIME_RANGE = {
-        MORNING => {start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('9:00 AM')},
-        AFTERNOON => {start: Time.zone.parse('10:00 AM'), end: Time.zone.parse('2:00 PM')},
+        MORNING => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('9:00 AM') },
+        AFTERNOON => { start: Time.zone.parse('10:00 AM'), end: Time.zone.parse('2:00 PM') },
         BOTH => {start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('2:00 PM')}
       }.freeze
 
@@ -19,6 +19,11 @@ module Ecom
 
       validates :checkin_time, presence: true, if: :checkout_time
 
+      scope :by_attendance, lambda { |id|
+        joins(:attendance_sheet_entry).where(ecom_core_attendance_sheet_entries: { attendance_sheet_id: id })
+      }
+      scope :revised, ->(revised) { where(revised: revised) }
+
       before_save :calculate_hours
       after_save :calculate_total
 

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/models/ecom/core/overtime_sheet.rb

@@ -1,20 +1,20 @@
 module Ecom
   module Core
     class OvertimeSheet < ApplicationRecord
-      OPEN = 'Open'.freeze
-      SUBMITTED = 'Submitted'.freeze
-      APPROVED = 'Approved'.freeze
-
-      validates :date, :opened_at, presence: true, uniqueness: true
-      validates :status, inclusion: [OPEN, SUBMITTED, APPROVED]
+      validates :date, :opened_at, presence: true, uniqueness: { scope: :project_id }
+      validates :status, inclusion: StatusConstants::STATUSES
 
       belongs_to :project
 
       has_many :overtime_sheet_entries
       has_many :crew_overtimes, through: :overtime_sheet_entries
 
-      scope :open, ->(id) { where(status: OPEN, project_id: id) }
-      scope :submitted, ->(id) { where(status: SUBMITTED, project_id: id) }
+      scope :by_project, ->(id) { where(project_id: id) }
+      scope :by_date, ->(date) { where(date: date) }
+      scope :by_status, ->(status) { where(status: status) }
+      scope :by_date_between, ->(from, to) { where('date BETWEEN ? AND ?', from, to) }
+      scope :open, ->(id) { where(status: StatusConstants::OPEN, project_id: id) }
+      scope :submitted, ->(id) { where(status: StatusConstants::SUBMITTED, project_id: id) }
 
       def self.open_exists?(project_id)
         OvertimeSheet.open(project_id).exists?
@@ -38,7 +38,7 @@ module Ecom
           raise 'There is already an open overtime sheet. It has to be submitted before creating a new one.'
         end
 
-        OvertimeSheet.create(date: date, opened_at: Time.now, status: OPEN, project_id: project_id)
+        OvertimeSheet.create(date: date, opened_at: Time.now, status: StatusConstants::OPEN, project_id: project_id)
       end
     end
   end

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

@@ -5,6 +5,10 @@ module Ecom
 
       has_many :payments, class_name: 'Ecom::Core::Payment'
       belongs_to :project
+
+      scope :by_project, ->(id) { where(project_id: id) }
+      scope :by_month, ->(month) { where(month: month) }
+      scope :by_year, ->(year) { where(year: year) }
     end
   end
 end

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/config/database.ci.yml

@@ -4,6 +4,7 @@ default: &default
   pool: 5
   timeout: 5000
   host: <%= ENV['DB_HOST'] %>
+  port: <%= ENV['DB_PORT'] %>
   username: <%= ENV['POSTGRES_USER'] %>
   password: <%= ENV['POSTGRES_PASSWORD'] %>
   database: <%= ENV['POSTGRES_DB'] %>

data/db/migrate/20191225100054_create_ecom_core_crews.rb

@@ -3,11 +3,13 @@ class CreateEcomCoreCrews < ActiveRecord::Migration[6.0]
     create_table :ecom_core_crews do |t|
       t.string :employee_id
       t.string :name, null: false
+      t.string :address, null: false
       t.string :phone
       t.string :email
       t.string :qualification, null: false
       t.string :employment, null: false
-      t.float :wage
+      t.float :wage, null: false
+      t.string :wage_in_words, null: false
       t.date :employment_date
       t.boolean :sub_contracted, null: false, default: false
       t.string :guarantor_name

data/db/migrate/20191225140433_create_ecom_core_attendance_sheets.rb

@@ -1,7 +1,7 @@
 class CreateEcomCoreAttendanceSheets < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_attendance_sheets do |t|
-      t.date :date, null: false, unique: true
+      t.date :date, null: false
       t.time :opened_at, null: false
       t.time :closed_at
       t.string :remark
@@ -13,5 +13,6 @@ class CreateEcomCoreAttendanceSheets < ActiveRecord::Migration[6.0]
 
       t.timestamps
     end
+    add_index :ecom_core_attendance_sheets, %i[date project_id], unique: true
   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/20200410090701_create_ecom_core_overtime_sheets.rb

@@ -1,9 +1,10 @@
 class CreateEcomCoreOvertimeSheets < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_overtime_sheets do |t|
-      t.date :date, null: false, unique: true
+      t.date :date, null: false
       t.time :opened_at, null: false
       t.time :submitted_at
+      t.string :remark
       t.string :status, null: false, default: 'Open'
       t.references :project,
                    null: false,
@@ -12,5 +13,6 @@ class CreateEcomCoreOvertimeSheets < ActiveRecord::Migration[6.0]
 
       t.timestamps
     end
+    add_index :ecom_core_overtime_sheets, %i[date project_id], unique: true
   end
 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.6'.freeze
+    VERSION = '1.2.12'.freeze
   end
 end

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

@@ -4,7 +4,7 @@ FactoryBot.define do
     opened_at { Time.now }
     closed_at { nil }
     remark { FFaker::Name.name }
-    status { Ecom::Core::AttendanceSheet::OPEN }
+    status { Ecom::Core::StatusConstants::OPEN }
     association :project
   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/crews.rb

@@ -1,11 +1,13 @@
 FactoryBot.define do
   factory :crew, class: Ecom::Core::Crew do
     name { FFaker::Name.name }
+    address { FFaker::Name.name }
     phone { FFaker::Name.name }
     email { FFaker::Name.name }
     qualification { FFaker::Name.name }
     employment { Ecom::Core::Crew::PERMANENT }
     wage { FFaker::Random.rand(1000..5000) }
+    wage_in_words { FFaker::Name.name }
     employment_date { Date.today - 1 }
     sub_contracted { false }
     guarantor_name { FFaker::Name.name }

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/overtime_sheets.rb

@@ -3,7 +3,7 @@ FactoryBot.define do
     date { Date.today }
     opened_at { Time.now }
     submitted_at { Time.now + 1.day }
-    status { Ecom::Core::OvertimeSheet::OPEN }
+    status { Ecom::Core::StatusConstants::OPEN }
     association :project
   end
 end

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

@@ -5,5 +5,6 @@ FactoryBot.define do
     email { FFaker::Internet.email }
     active { true }
     password { FFaker::Internet.password }
+    projects { [{ id: 1, name: 'Sample Project'}] }
   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.6
+  version: 1.2.12
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -178,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: solargraph
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: An engine which contains the core of a construction management app as
   a layer.
 email:
@@ -203,6 +189,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/constants/ecom/core/status_constants.rb
 - app/controllers/concerns/ecom/core/lookupable.rb
 - app/controllers/concerns/ecom/core/resource_typeable.rb
 - app/controllers/ecom/core/access_controller.rb
@@ -218,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
@@ -264,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
@@ -305,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
@@ -313,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