ecom_core 1.2.12 → 1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53e6b8c84820dca6b1121f9f33ffdffc3f421c2a7aced743a21bac89c25b7580
-  data.tar.gz: 557e5da2ed61cca47e0e80002469f9798d9eb96f26a8357f897beea42c4a0062
+  metadata.gz: 785564a6c5e451baa829ed1114ec89b5fb0247a3894a09fd2683b2967e1ae49b
+  data.tar.gz: d0dbc33358d5759b276f0d92575efc6e2333f2bac15674deb81a40c6b5cb850a
 SHA512:
-  metadata.gz: 23b9c88cb223aa6afec885e5937089695952810e383121f9511a94b58fa5c8fe86787aad5573a61d382511d31bb643a40ba1fe0b50dafe1ea9e4ba7bbf82060f
-  data.tar.gz: d35a3ede79f6735372668c8812e2b49f3b6653bdd577f6b95b936f2a23177c2f8467c3d307a42b07363d6d36189e0374e351305c8908bcdc20ccc3ce1453d666
+  metadata.gz: be05151af2bb4f6117929e9a220ee1a466629464704ba24054f1be4da8ac1b67f03b8fb8affcea5958d8d6e6f18681f0783dce2744d2f01ef00be6af2479fa0d
+  data.tar.gz: 87f31a859e9e3c2aaa26af4ae2627a425883e4ab3a8c555bbf3a0ed80b30b754fd9ca0ecce920bee1a78fc69f8ab9f266c5878bea6f3fb6814595e8a0e28290c

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

@@ -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

@@ -52,7 +52,8 @@ 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: StatusConstants::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)

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

@@ -3,4 +3,4 @@ module Ecom
     class ComponentType < Lookup
     end
   end
-end
+end

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

@@ -9,7 +9,7 @@ module Ecom
       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')}
+        BOTH => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('2:00 PM') }
       }.freeze
 
       belongs_to :attendance_sheet_entry

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

@@ -15,6 +15,7 @@ module Ecom
       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

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

@@ -17,4 +17,4 @@ module Ecom
       end
     end
   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/db/migrate/20200315152143_create_ecom_core_equipment.rb

@@ -5,7 +5,6 @@ class CreateEcomCoreEquipment < ActiveRecord::Migration[6.0]
       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/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_booking_requests.rb → 20200602130247_create_ecom_core_requested_items.rb}

@@ -1,6 +1,10 @@
-class CreateEcomCoreBookingRequests < ActiveRecord::Migration[6.0]
+class CreateEcomCoreRequestedItems < ActiveRecord::Migration[6.0]
   def change
-    create_table :ecom_core_booking_requests do |t|
+    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,
@@ -13,16 +17,7 @@ class CreateEcomCoreBookingRequests < ActiveRecord::Migration[6.0]
                    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.integer :components, array: true, default: []
       t.string :remark
 
       t.timestamps

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.12'.freeze
+    VERSION = '1.2.13'.freeze
   end
 end

data/spec/factories/ecom/core/{booked_equipments.rb → booked_equipment_items.rb}

@@ -1,10 +1,10 @@
 FactoryBot.define do
-  factory :booked_equipment, class: Ecom::Core::BookedEquipment do
-    association :booking_request
+  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 }
-    association :booked_to, factory: :user
     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/equipment.rb

@@ -4,7 +4,6 @@ FactoryBot.define do
     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_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/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,6 +5,6 @@ FactoryBot.define do
     email { FFaker::Internet.email }
     active { true }
     password { FFaker::Internet.password }
-    projects { [{ id: 1, name: 'Sample Project'}] }
+    projects { [{ id: 1, name: 'Sample Project' }] }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.2.13
 platform: ruby
 authors:
 - Henock L.
@@ -205,8 +205,8 @@ 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/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
@@ -221,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
@@ -236,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
@@ -297,8 +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/20200602130247_create_ecom_core_booking_requests.rb
-- db/migrate/20200603115317_create_ecom_core_booked_equipments.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
@@ -307,8 +311,8 @@ 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/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
@@ -323,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
@@ -338,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

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

@@ -1,19 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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/db/migrate/20200603115317_create_ecom_core_booked_equipments.rb

@@ -1,24 +0,0 @@
-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/spec/factories/ecom/core/booking_requests.rb

@@ -1,15 +0,0 @@
-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