ecom_core 1.2.13 → 1.2.14

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 785564a6c5e451baa829ed1114ec89b5fb0247a3894a09fd2683b2967e1ae49b
4
- data.tar.gz: d0dbc33358d5759b276f0d92575efc6e2333f2bac15674deb81a40c6b5cb850a
3
+ metadata.gz: 556990381397a6b8767f5e0b8f169a9f3ec26fe4ca86f3511f2c032e87980b36
4
+ data.tar.gz: 519d394938acc41e78d25cbab80b720347686cb14c059dd9b5d742316d69bb8a
5
5
  SHA512:
6
- metadata.gz: be05151af2bb4f6117929e9a220ee1a466629464704ba24054f1be4da8ac1b67f03b8fb8affcea5958d8d6e6f18681f0783dce2744d2f01ef00be6af2479fa0d
7
- data.tar.gz: 87f31a859e9e3c2aaa26af4ae2627a425883e4ab3a8c555bbf3a0ed80b30b754fd9ca0ecce920bee1a78fc69f8ab9f266c5878bea6f3fb6814595e8a0e28290c
6
+ metadata.gz: fdf6100d006de268f4dd92f9ee2583e02067f8a88e0c231cb67ea8939fff986e56cf5f121c94efcd14980016067e394469a46e3b9379369200e72c87e91c8ed4
7
+ data.tar.gz: 46dfdcef2f8300fd34fc89f81beced4d313ef6c63207392290e87457d4d00e236c97d1a1b8f5fdb6ab23709dd86555a75c53ba10de2c2a22caf2bc59452aed65
@@ -1,6 +1,6 @@
1
1
  module Ecom
2
2
  module Core
3
- class BookedEquipmentItem < ApplicationRecord
3
+ class BookedItem < ApplicationRecord
4
4
  belongs_to :booking
5
5
  belongs_to :requested_item
6
6
  belongs_to :equipment_item
@@ -8,7 +8,7 @@ module Ecom
8
8
 
9
9
  belongs_to :equipment_request
10
10
  belongs_to :booked_by, class_name: 'Ecom::Core::User'
11
- belongs_to :booked_for, class_name: 'Ecom::Core::User'
11
+ has_many :booked_items
12
12
 
13
13
  validates :status, presence: true, inclusion: STATUSES
14
14
  end
@@ -9,10 +9,6 @@ class CreateEcomCoreBookings < ActiveRecord::Migration[6.0]
9
9
  null: false,
10
10
  index: { name: 'er_on_bb_indx' },
11
11
  foreign_key: { to_table: :ecom_core_users }
12
- t.references :booked_for,
13
- null: false,
14
- index: { name: 'booking_on_bf_indx' },
15
- foreign_key: { to_table: :ecom_core_users }
16
12
  t.string :remark
17
13
  t.string :status, null: false
18
14
 
@@ -1,6 +1,6 @@
1
- class CreateEcomCoreBookedEquipmentItems < ActiveRecord::Migration[6.0]
1
+ class CreateEcomCoreBookedItems < ActiveRecord::Migration[6.0]
2
2
  def change
3
- create_table :ecom_core_booked_equipment_items do |t|
3
+ create_table :ecom_core_booked_items do |t|
4
4
  t.references :booking,
5
5
  null: false,
6
6
  index: { name: 'bei_on_booking_indx' },
@@ -8,7 +8,7 @@ class CreateEcomCoreBookedEquipmentItems < ActiveRecord::Migration[6.0]
8
8
  t.references :requested_item,
9
9
  null: false,
10
10
  index: { name: 'bei_on_ri_indx' },
11
- foreign_key: { to_table: :ecom_core_bookings }
11
+ foreign_key: { to_table: :ecom_core_requested_items }
12
12
  t.references :equipment_item,
13
13
  null: false,
14
14
  index: { name: 'be_on_ei_indx' },
@@ -1,5 +1,5 @@
1
1
  module Ecom
2
2
  module Core
3
- VERSION = '1.2.13'.freeze
3
+ VERSION = '1.2.14'.freeze
4
4
  end
5
5
  end
@@ -1,5 +1,5 @@
1
1
  FactoryBot.define do
2
- factory :booked_equipment_item, class: Ecom::Core::BookedEquipmentItem do
2
+ factory :booked_item, class: Ecom::Core::BookedItem do
3
3
  association :booking
4
4
  association :requested_item
5
5
  association :equipment_item
@@ -2,7 +2,6 @@ FactoryBot.define do
2
2
  factory :booking, class: Ecom::Core::Booking do
3
3
  association :equipment_request
4
4
  association :booked_by, factory: :user
5
- association :booked_for, factory: :user
6
5
  remark { FFaker::Name.name }
7
6
  status { Ecom::Core::Booking::UNAPPROVED }
8
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ecom_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.13
4
+ version: 1.2.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Henock L.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-06-06 00:00:00.000000000 Z
11
+ date: 2020-06-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aasm
@@ -205,7 +205,7 @@ files:
205
205
  - app/models/ecom/core/application_record.rb
206
206
  - app/models/ecom/core/attendance_sheet.rb
207
207
  - app/models/ecom/core/attendance_sheet_entry.rb
208
- - app/models/ecom/core/booked_equipment_item.rb
208
+ - app/models/ecom/core/booked_item.rb
209
209
  - app/models/ecom/core/booking.rb
210
210
  - app/models/ecom/core/company.rb
211
211
  - app/models/ecom/core/component_type.rb
@@ -302,7 +302,7 @@ files:
302
302
  - db/migrate/20200601104719_create_ecom_core_equipment_requests.rb
303
303
  - db/migrate/20200602130247_create_ecom_core_requested_items.rb
304
304
  - db/migrate/20200602830603_create_ecom_core_bookings.rb
305
- - db/migrate/20200603115317_create_ecom_core_booked_equipment_items.rb
305
+ - db/migrate/20200603115317_create_ecom_core_booked_items.rb
306
306
  - lib/ecom/core.rb
307
307
  - lib/ecom/core/engine.rb
308
308
  - lib/ecom/core/version.rb
@@ -311,7 +311,7 @@ files:
311
311
  - spec/factories/ecom/core/application_modules.rb
312
312
  - spec/factories/ecom/core/attendance_sheet_entries.rb
313
313
  - spec/factories/ecom/core/attendance_sheets.rb
314
- - spec/factories/ecom/core/booked_equipment_items.rb
314
+ - spec/factories/ecom/core/booked_items.rb
315
315
  - spec/factories/ecom/core/bookings.rb
316
316
  - spec/factories/ecom/core/companies.rb
317
317
  - spec/factories/ecom/core/component_types.rb