ecom_core 1.2.7 → 1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8604bb41df95be804fb66c2ac48f3e1b55b8f776de07f2dee665c4704350858
-  data.tar.gz: 30decab7dc7997c9c4a22bc2a90548c0b72a67b6648e894b6f1234c785739166
+  metadata.gz: 785564a6c5e451baa829ed1114ec89b5fb0247a3894a09fd2683b2967e1ae49b
+  data.tar.gz: d0dbc33358d5759b276f0d92575efc6e2333f2bac15674deb81a40c6b5cb850a
 SHA512:
-  metadata.gz: ac72d68e86a4ff54ee5bf33d3068cf57eb44ab5038873481be623cf1eb1c461c8c65749385536e973a9909c8269e5e06a1125562ff7c14a8c9dba322257fe500
-  data.tar.gz: 44c1ff6ddcbb054bd262ef9a0a75ab2fb6f42d4558a74afe7866c0ee451b45c577003f8c988a60e4a3e8341212451864cb4f633ffa4a6bf5d95bce1615ac7065
+  metadata.gz: be05151af2bb4f6117929e9a220ee1a466629464704ba24054f1be4da8ac1b67f03b8fb8affcea5958d8d6e6f18681f0783dce2744d2f01ef00be6af2479fa0d
+  data.tar.gz: 87f31a859e9e3c2aaa26af4ae2627a425883e4ab3a8c555bbf3a0ed80b30b754fd9ca0ecce920bee1a78fc69f8ab9f266c5878bea6f3fb6814595e8a0e28290c

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/concerns/ecom/core/lookupable.rb

@@ -29,7 +29,6 @@ module Ecom
         end
       end
 
-
       private
 
       def set_clazz
@@ -41,4 +40,4 @@ module Ecom
       end
     end
   end
-end
+end

data/app/controllers/concerns/ecom/core/resource_typeable.rb

@@ -40,4 +40,4 @@ module Ecom
       end
     end
   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
@@ -34,7 +34,6 @@ module Ecom
       def auth_params
         params.require(:auth).permit(:email, :password)
       end
-
     end
   end
-end
+end

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

@@ -14,7 +14,6 @@ module Ecom
         @current_user ||= user if user
       end
 
-
       private
 
       def authenticate

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

@@ -30,4 +30,4 @@ module Ecom
       end
     end
   end
-end
+end

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

@@ -7,4 +7,4 @@ module Ecom
       end
     end
   end
-end
+end

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

@@ -25,7 +25,6 @@ module Ecom
         end
       end
 
-
       private
 
       def set_user_role
@@ -37,4 +36,4 @@ module Ecom
       end
     end
   end
-end
+end

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

@@ -28,7 +28,6 @@ module Ecom
         end
       end
 
-
       private
 
       def set_user
@@ -40,4 +39,4 @@ module Ecom
       end
     end
   end
-end
+end

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,17 @@ 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 +76,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_item.rb

@@ -0,0 +1,12 @@
+module Ecom
+  module Core
+    class BookedEquipmentItem < ApplicationRecord
+      belongs_to :booking
+      belongs_to :requested_item
+      belongs_to :equipment_item
+
+      validates :start_date, :end_date, presence: true
+      validates_with DateRangeValidator
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Ecom
+  module Core
+    class Booking < ApplicationRecord
+      APPROVED = 'Approved'.freeze
+      UNAPPROVED = 'Unapproved'.freeze
+
+      STATUSES = [APPROVED, UNAPPROVED].freeze
+
+      belongs_to :equipment_request
+      belongs_to :booked_by, class_name: 'Ecom::Core::User'
+      belongs_to :booked_for, class_name: 'Ecom::Core::User'
+
+      validates :status, presence: true, inclusion: STATUSES
+    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

@@ -14,6 +14,10 @@ module Ecom
       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
       end

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,9 +7,9 @@ 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')},
-        BOTH => {start: Time.zone.parse('5: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
 
       belongs_to :attendance_sheet_entry
@@ -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,26 @@
 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'
+      has_many :equipment_components
 
       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/equipment_location.rb

@@ -18,7 +18,8 @@ module Ecom
         joins(:location_type).where(
           'ecom_core_lookups.name = ? AND ecom_core_lookups.type = ?',
           LocationType::STORE,
-          Ecom::Core::LocationType)
+          Ecom::Core::LocationType
+        )
       }
     end
   end

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

@@ -0,0 +1,19 @@
+module Ecom
+  module Core
+    class EquipmentRequest < ApplicationRecord
+      DRAFT = 'Draft'.freeze
+      UNDER_REVIEW = 'Under Review'.freeze
+      APPROVED = 'Approved'.freeze
+      REJECTED = 'Rejected'.freeze
+
+      STATUSES = [DRAFT, UNDER_REVIEW, APPROVED, REJECTED].freeze
+      belongs_to :project
+      belongs_to :requested_by, class_name: 'Ecom::Core::User'
+      has_one :booking
+
+      validates :status, presence: true, inclusion: STATUSES
+
+      scope :by_status, ->(status) { where(status: status) }
+    end
+  end
+end

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

@@ -17,4 +17,4 @@ module Ecom
       end
     end
   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/models/ecom/core/requested_item.rb

@@ -0,0 +1,13 @@
+module Ecom
+  module Core
+    class RequestedItem < ApplicationRecord
+      belongs_to :equipment_request
+      belongs_to :equipment
+      belongs_to :country, optional: true
+
+      validates :start_date, :end_date, :quantity, presence: true
+      validates :quantity, numericality: { only_integer: true, greater_than: 0 }
+      validates_with DateRangeValidator
+    end
+  end
+end

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

@@ -12,7 +12,6 @@
 # way as chart of accounts to identify parent and child relationships. Even then,
 # there needs to be a well defined coding scheme developed before using the column
 # field.
-# 
 module Ecom
   module Core
     class WorkProduct < ApplicationRecord

data/app/serializers/ecom/core/lookup_serializer.rb

@@ -4,4 +4,4 @@ module Ecom
       attributes :id, :name, :type
     end
   end
-end
+end

data/app/serializers/ecom/core/resource_type_serializer.rb

@@ -4,4 +4,4 @@ module Ecom
       attributes :id, :code, :name, :base_unit, :type
     end
   end
-end
+end

data/app/serializers/ecom/core/user_role_serializer.rb

@@ -4,4 +4,4 @@ module Ecom
       attributes :id, :name
     end
   end
-end
+end

data/app/services/ecom/core/menu_service.rb

@@ -14,9 +14,7 @@ module Ecom
 
         menu_list.each do |ml|
           ml[:items] = menu.reject { |m| m.parent.nil? }.each_with_object([]) do |item, list|
-            if item.parent_id == ml[:id]
-              list << { id: item.id, text: item.label, iconCss: item.icon, url: item.route }
-            end
+            list << { id: item.id, text: item.label, iconCss: item.icon, url: item.route } if item.parent_id == ml[:id]
           end
         end
         { success: true, data: menu_list }

data/app/services/ecom/core/token_auth_service.rb

@@ -3,7 +3,8 @@ require 'jwt'
 module Ecom
   module Core
     class TokenAuthService
-      AUTH_SECRET = '31a70abfaa57e5e77a3fc9f27aeaaf59b9a9f5355b5e16c842ee172035a8ed40bf82c1c971ecc176e4f0b4c9e6141db07fd4a5af3f7db9265e719fbe340b105a'
+      AUTH_SECRET = '31a70abfaa57e5e77a3fc9f27aeaaf59b9a9f5355b5e16c842ee172035a8ed40bf82c1c971ecc176e4f0b4c9e6141db07'\
+                    'fd4a5af3f7db9265e719fbe340b105a'.freeze
 
       def self.issue(payload)
         JWT.encode(payload, auth_secret, 'HS256')

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/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,7 @@ 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.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/20200601104719_create_ecom_core_equipment_requests.rb

@@ -0,0 +1,18 @@
+class CreateEcomCoreEquipmentRequests < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_equipment_requests do |t|
+      t.references :requested_by,
+                   null: false,
+                   index: { name: 'er_on_rb_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.string :remark
+      t.string :status, null: false
+      t.references :project,
+                   null: false,
+                   index: { name: 'er_on_project_indx' },
+                   foreign_key: { to_table: :ecom_core_projects }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200602130247_create_ecom_core_requested_items.rb

@@ -0,0 +1,26 @@
+class CreateEcomCoreRequestedItems < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_requested_items do |t|
+      t.references :equipment_request,
+                   null: false,
+                   index: { name: 'ri_on_er_indx' },
+                   foreign_key: { to_table: :ecom_core_equipment_requests }
+      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.integer :components, array: true, default: []
+      t.string :remark
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200602830603_create_ecom_core_bookings.rb

@@ -0,0 +1,22 @@
+class CreateEcomCoreBookings < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_bookings do |t|
+      t.references :equipment_request,
+                   null: false,
+                   index: { name: 'booking_on_er_indx' },
+                   foreign_key: { to_table: :ecom_core_equipment_requests }
+      t.references :booked_by,
+                   null: false,
+                   index: { name: 'er_on_bb_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.references :booked_for,
+                   null: false,
+                   index: { name: 'booking_on_bf_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.string :remark
+      t.string :status, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200603115317_create_ecom_core_booked_equipment_items.rb

@@ -0,0 +1,23 @@
+class CreateEcomCoreBookedEquipmentItems < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_booked_equipment_items do |t|
+      t.references :booking,
+                   null: false,
+                   index: { name: 'bei_on_booking_indx' },
+                   foreign_key: { to_table: :ecom_core_bookings }
+      t.references :requested_item,
+                  null: false,
+                  index: { name: 'bei_on_ri_indx' },
+                   foreign_key: { to_table: :ecom_core_bookings }
+      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 :remark
+
+      t.timestamps
+    end
+  end
+end

data/lib/ecom/core/engine.rb

@@ -19,7 +19,6 @@ module Ecom
           app.config.paths['db/migrate'].concat(config.paths['db/migrate'].expanded)
         end
       end
-
     end
   end
 end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.7'.freeze
+    VERSION = '1.2.13'.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_equipment_items.rb

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :booked_equipment_item, class: Ecom::Core::BookedEquipmentItem do
+    association :booking
+    association :requested_item
+    association :equipment_item
+    start_date { Date.yesterday }
+    end_date { Date.today }
+    remark { FFaker::Name.name }
+  end
+end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :booking, class: Ecom::Core::Booking do
+    association :equipment_request
+    association :booked_by, factory: :user
+    association :booked_for, factory: :user
+    remark { FFaker::Name.name }
+    status { Ecom::Core::Booking::UNAPPROVED }
+  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,7 @@ FactoryBot.define do
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     minimum_acquisition_time { 10 }
+    brands { ['Brand I', 'Brand II', 'Brand 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/equipment_requests.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :equipment_request, class: Ecom::Core::EquipmentRequest do
+    association :requested_by, factory: :user
+    remark { FFaker::Name.name }
+    status { Ecom::Core::EquipmentRequest::DRAFT }
+    association :project
+  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/requested_items.rb

@@ -0,0 +1,13 @@
+FactoryBot.define do
+  factory :requested_item, class: Ecom::Core::RequestedItem do
+    association :equipment_request
+    start_date { Date.yesterday }
+    end_date { Date.today }
+    association :equipment
+    quantity { 1 }
+    brand { FFaker::Name.name }
+    association :country
+    components { [] }
+    remark { FFaker::Name.name }
+  end
+end

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

@@ -10,6 +10,5 @@ FactoryBot.define do
         create(:work_product_template, task_template: task_template)
       end
     end
-
   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.7
+  version: 1.2.13
 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_item.rb
+- app/models/ecom/core/booking.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
@@ -230,6 +221,7 @@ files:
 - app/models/ecom/core/equipment_component.rb
 - app/models/ecom/core/equipment_item.rb
 - app/models/ecom/core/equipment_location.rb
+- app/models/ecom/core/equipment_request.rb
 - app/models/ecom/core/equipment_type.rb
 - app/models/ecom/core/equipment_valuation.rb
 - app/models/ecom/core/location_type.rb
@@ -245,6 +237,7 @@ files:
 - app/models/ecom/core/product_type.rb
 - app/models/ecom/core/project.rb
 - app/models/ecom/core/project_crew.rb
+- app/models/ecom/core/requested_item.rb
 - app/models/ecom/core/resource_type.rb
 - app/models/ecom/core/stakeholder.rb
 - app/models/ecom/core/stakeholder_type.rb
@@ -264,6 +257,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 +299,10 @@ 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/20200601104719_create_ecom_core_equipment_requests.rb
+- db/migrate/20200602130247_create_ecom_core_requested_items.rb
+- db/migrate/20200602830603_create_ecom_core_bookings.rb
+- db/migrate/20200603115317_create_ecom_core_booked_equipment_items.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
@@ -313,7 +311,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_equipment_items.rb
+- spec/factories/ecom/core/bookings.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
@@ -325,6 +327,7 @@ files:
 - spec/factories/ecom/core/equipment_components.rb
 - spec/factories/ecom/core/equipment_items.rb
 - spec/factories/ecom/core/equipment_locations.rb
+- spec/factories/ecom/core/equipment_requests.rb
 - spec/factories/ecom/core/equipment_types.rb
 - spec/factories/ecom/core/equipment_valuations.rb
 - spec/factories/ecom/core/location_types.rb
@@ -340,6 +343,7 @@ files:
 - spec/factories/ecom/core/product_types.rb
 - spec/factories/ecom/core/project_crews.rb
 - spec/factories/ecom/core/projects.rb
+- spec/factories/ecom/core/requested_items.rb
 - spec/factories/ecom/core/resource_types.rb
 - spec/factories/ecom/core/stakeholder_types.rb
 - spec/factories/ecom/core/stakeholders.rb