ecom_core 1.2.13 → 1.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 785564a6c5e451baa829ed1114ec89b5fb0247a3894a09fd2683b2967e1ae49b
-  data.tar.gz: d0dbc33358d5759b276f0d92575efc6e2333f2bac15674deb81a40c6b5cb850a
+  metadata.gz: 556990381397a6b8767f5e0b8f169a9f3ec26fe4ca86f3511f2c032e87980b36
+  data.tar.gz: 519d394938acc41e78d25cbab80b720347686cb14c059dd9b5d742316d69bb8a
 SHA512:
-  metadata.gz: be05151af2bb4f6117929e9a220ee1a466629464704ba24054f1be4da8ac1b67f03b8fb8affcea5958d8d6e6f18681f0783dce2744d2f01ef00be6af2479fa0d
-  data.tar.gz: 87f31a859e9e3c2aaa26af4ae2627a425883e4ab3a8c555bbf3a0ed80b30b754fd9ca0ecce920bee1a78fc69f8ab9f266c5878bea6f3fb6814595e8a0e28290c
+  metadata.gz: fdf6100d006de268f4dd92f9ee2583e02067f8a88e0c231cb67ea8939fff986e56cf5f121c94efcd14980016067e394469a46e3b9379369200e72c87e91c8ed4
+  data.tar.gz: 46dfdcef2f8300fd34fc89f81beced4d313ef6c63207392290e87457d4d00e236c97d1a1b8f5fdb6ab23709dd86555a75c53ba10de2c2a22caf2bc59452aed65

data/app/models/ecom/core/{booked_equipment_item.rb → booked_item.rb}

@@ -1,6 +1,6 @@
 module Ecom
   module Core
-    class BookedEquipmentItem < ApplicationRecord
+    class BookedItem < ApplicationRecord
       belongs_to :booking
       belongs_to :requested_item
       belongs_to :equipment_item

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

@@ -8,7 +8,7 @@ module Ecom
 
       belongs_to :equipment_request
       belongs_to :booked_by, class_name: 'Ecom::Core::User'
-      belongs_to :booked_for, class_name: 'Ecom::Core::User'
+      has_many :booked_items
 
       validates :status, presence: true, inclusion: STATUSES
     end

data/db/migrate/20200602830603_create_ecom_core_bookings.rb

@@ -9,10 +9,6 @@ class CreateEcomCoreBookings < ActiveRecord::Migration[6.0]
                    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
 

data/db/migrate/{20200603115317_create_ecom_core_booked_equipment_items.rb → 20200603115317_create_ecom_core_booked_items.rb}

@@ -1,6 +1,6 @@
-class CreateEcomCoreBookedEquipmentItems < ActiveRecord::Migration[6.0]
+class CreateEcomCoreBookedItems < ActiveRecord::Migration[6.0]
   def change
-    create_table :ecom_core_booked_equipment_items do |t|
+    create_table :ecom_core_booked_items do |t|
       t.references :booking,
                    null: false,
                    index: { name: 'bei_on_booking_indx' },
@@ -8,7 +8,7 @@ class CreateEcomCoreBookedEquipmentItems < ActiveRecord::Migration[6.0]
       t.references :requested_item,
                   null: false,
                   index: { name: 'bei_on_ri_indx' },
-                   foreign_key: { to_table: :ecom_core_bookings }
+                  foreign_key: { to_table: :ecom_core_requested_items }
       t.references :equipment_item,
                    null: false,
                    index: { name: 'be_on_ei_indx' },

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.13'.freeze
+    VERSION = '1.2.14'.freeze
   end
 end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :booked_equipment_item, class: Ecom::Core::BookedEquipmentItem do
+  factory :booked_item, class: Ecom::Core::BookedItem do
     association :booking
     association :requested_item
     association :equipment_item

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

@@ -2,7 +2,6 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.13
+  version: 1.2.14
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-06 00:00:00.000000000 Z
+date: 2020-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -205,7 +205,7 @@ 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/booked_item.rb
 - app/models/ecom/core/booking.rb
 - app/models/ecom/core/company.rb
 - app/models/ecom/core/component_type.rb
@@ -302,7 +302,7 @@ files:
 - 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
+- db/migrate/20200603115317_create_ecom_core_booked_items.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
@@ -311,7 +311,7 @@ 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/booked_items.rb
 - spec/factories/ecom/core/bookings.rb
 - spec/factories/ecom/core/companies.rb
 - spec/factories/ecom/core/component_types.rb