ecom_core 1.1.18 → 1.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbaba2b0f521af3d18d5636be2e3be40c6de15aa9f3951b5c3d8b57bdc634e83
-  data.tar.gz: 24ab07446617733ce416002684e0565f4bb04e66ad0a30d0b28d1f1cd79cf9a2
+  metadata.gz: 780e3e5446f8c5f8fd0f11d3c526d62862dadec134466a68d288772803904081
+  data.tar.gz: '0478e2c6c16bb601d0fddce8d62c5fee45aafde7d0a97e33ff59939ae7973491'
 SHA512:
-  metadata.gz: 88dc9269297366e77f415c768da3bb457414b57143f3aef34df98cbbc3923ac7a125f4bec6005f0f46ff071a64dfabb2295c91931b1033ad872f02cfc5100e04
-  data.tar.gz: cec52dafb2589e7711300bd0322425be7c670ee83bc440def6f26ee6663f10edf6fd1b4231327e28603e9e6bcea95e09e1635c6ce97dda774f69cdea736f58e7
+  metadata.gz: 6ecf8671c0c71aff50eac948d780a70fdba32c7cf8f785bbb36e25226feec70511c2ef36e341aa9efc79f3c016927a88c1992480da418862304ba3d2eddd34c5
+  data.tar.gz: 4ec0ae3be645dc45929b3107cac0d3340c13df45360fa3ee6cf60c10801fb76ba8b0d0588e672058ae5d56f194f4db12bbcceaa21adba791eac161fbf57907b2

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

@@ -8,13 +8,13 @@ module Ecom
 
       has_one :revision, class_name: 'Ecom::Core::CrewOvertime', foreign_key: :revision_to_id
 
-      validates :hours, :converted_hours, presence: true
+      validates :hours, :raw_hours, presence: true
 
-      before_save :calculate_converted_hours
+      before_save :calculate_hours
 
-      def calculate_converted_hours
+      def calculate_hours
         rate = OvertimeType.find(overtime_type_id).rate
-        self.converted_hours = hours * rate
+        self.hours = raw_hours * rate
       end
     end
   end

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

@@ -1,26 +1,52 @@
 module Ecom
   module Core
     class CrewTime < ApplicationRecord
+      # Time Ranges
+      MORNING = 'Morning'.freeze
+      AFTERNOON = 'Afternoon'.freeze
+      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')}
+      }.freeze
+
       belongs_to :attendance_sheet_entry
-      belongs_to :overtime_type, optional: true
+      belongs_to :revision_to, class_name: 'Ecom::Core::CrewTime', optional: true
+      belongs_to :created_by, class_name: 'Ecom::Core::User'
+      has_one :revision, class_name: 'Ecom::Core::CrewTime', foreign_key: :revision_to_id
+
+      validates :hours, presence: true
 
-      validates :hours, :converted_hours, presence: true
-      # validates_each :date do |record, attr, value|
-      #   if record.crew && value && (value < record.crew.employment_date)
-      #     record.errors.add(attr, 'should be after employment date')
-      #   end
-      # end
+      before_save :calculate_hours
 
-      before_save :calculate_converted_hours
+      def calculate_hours
+        self.hours = checkout_time.nil? ? 0 : compute_hours
+      end
 
-      def calculate_converted_hours
-        if overtime
-          rate = OvertimeType.find(overtime_type_id).rate
-          self.converted_hours = hours * rate
+      # A method to check if checkin and checkout range falls in the morning,
+      # afternoon, or both.
+      def find_range
+        if checkin_time.before?(TIME_RANGE[MORNING][:end]) && checkout_time.before?(TIME_RANGE[AFTERNOON][:start])
+          MORNING
+        elsif checkin_time.after?(TIME_RANGE[MORNING][:end]) && checkout_time.after?(TIME_RANGE[AFTERNOON][:start])
+          AFTERNOON
         else
-          self.converted_hours = hours
+          BOTH
         end
       end
+
+      # A method to adjust time ranges by trimming any time value outside
+      # of the defined morning and afternoon ranges
+      def compute_hours
+        range = find_range
+        left = checkin_time.before?(TIME_RANGE[range][:start]) ? TIME_RANGE[range][:start] : checkin_time
+        right = checkout_time.after?(TIME_RANGE[range][:end]) ? TIME_RANGE[range][:end] : checkout_time
+        time = (right - left) / 1.hour
+        time -= 1 if range == BOTH
+        time
+      end
     end
   end
 end

data/db/migrate/20200413144023_fix_crew_time_columns.rb

@@ -0,0 +1,17 @@
+class FixCrewTimeColumns < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :ecom_core_crew_times, :overtime, :boolean
+    remove_column :ecom_core_crew_times, :overtime_type_id, :integer
+    remove_column :ecom_core_crew_times, :converted_hours, :float
+
+    add_column :ecom_core_crew_times, :revised, :boolean, default: false, null: false
+    add_column :ecom_core_crew_times, :revision_to_id, :integer
+    add_column :ecom_core_crew_times, :created_by_id, :integer
+
+    add_index :ecom_core_crew_times, :revision_to_id, name: 'ct_on_rt_indx'
+    add_index :ecom_core_crew_times, :created_by_id, name: 'cb_on_ct_indx'
+
+    add_foreign_key :ecom_core_crew_times, :ecom_core_crew_times, column: :revision_to_id
+    add_foreign_key :ecom_core_crew_times, :ecom_core_users, column: :created_by_id
+  end
+end

data/db/migrate/20200414044144_adjust_crew_overtime_column_names.rb

@@ -0,0 +1,6 @@
+class AdjustCrewOvertimeColumnNames < ActiveRecord::Migration[6.0]
+  def change
+    rename_column :ecom_core_crew_overtimes, :hours, :raw_hours
+    rename_column :ecom_core_crew_overtimes, :converted_hours, :hours
+  end
+end

data/db/migrate/20200414185248_change_time_columns_to_datetime.rb

@@ -0,0 +1,8 @@
+class ChangeTimeColumnsToDatetime < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :ecom_core_crew_times, :checkin_time, :time
+    add_column :ecom_core_crew_times, :checkin_time, :datetime
+    remove_column :ecom_core_crew_times, :checkout_time, :time
+    add_column :ecom_core_crew_times, :checkout_time, :datetime
+  end
+end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.18'.freeze
+    VERSION = '1.1.23'.freeze
   end
 end

data/lib/ecom_core.rb

@@ -3,4 +3,3 @@ require 'ecom/core/engine'
 require 'ancestry'
 require 'aasm'
 require 'active_model_serializers'
-require 'data_migrate'

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :crew_overtime, class: 'Ecom::Core::CrewOvertime' do
+    raw_hours { 2 }
     hours { 2 }
-    converted_hours { 2 }
     remark { FFaker::Name.name }
     association :overtime_type
     association :overtime_sheet_entry

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

@@ -3,10 +3,10 @@ FactoryBot.define do
     checkin_time { Time.now }
     checkout_time { Time.now + 2 * 60 * 60 }
     hours { 2 }
-    converted_hours { 2 }
     remark { FFaker::Name.name }
-    overtime { false }
-    overtime_type { nil }
     association :attendance_sheet_entry
+    revised { false }
+    revision_to { nil }
+    association :created_by, factory: :user
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.1.18
+  version: 1.1.23
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -25,21 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ancestry
+  name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: bcrypt
+  name: ancestry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active_model_serializers
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.0.2
-- !ruby/object:Gem::Dependency
-  name: data_migrate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -264,7 +250,6 @@ files:
 - app/services/ecom/core/token_auth_service.rb
 - config/database.ci.yml
 - config/routes.rb
-- db/data/20200401064242_move_date_to_attendance_sheet.rb
 - db/migrate/20190101112620_create_ecom_core_lookups.rb
 - db/migrate/20190101112625_create_ecom_core_overtime_types.rb
 - db/migrate/20191119010518_create_ecom_core_task_template_types.rb
@@ -309,6 +294,9 @@ 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/20200413144023_fix_crew_time_columns.rb
+- db/migrate/20200414044144_adjust_crew_overtime_column_names.rb
+- db/migrate/20200414185248_change_time_columns_to_datetime.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb

data/db/data/20200401064242_move_date_to_attendance_sheet.rb

@@ -1,20 +0,0 @@
-class MoveDateToAttendanceSheet < ActiveRecord::Migration[6.0]
-  def up
-    dates = Ecom::Core::CrewTime.pluck('DISTINCT date(date)')
-
-    return if dates.count.zero?
-
-    attendances = []
-    dates.each do |date|
-      attendances << Ecom::Core::AttendanceSheet.new(date: date)
-    end
-
-    Ecom::Core::AttendanceSheet.transaction do
-      attendances.each(&:save)
-    end
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end