ecom_core 1.1.17 → 1.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bdf3745639577dacd60d41eb82831de69cd41040b71411628f17be1a8397b42
-  data.tar.gz: 21fd30d003500d6648d42eb6be7e5d073eff6b7810148cd00aed1fd2496363ec
+  metadata.gz: 1b94415c80a265d838bd9ea7ce3ea2f7ca1993ffeb10dfe30d29462f5cf10c7d
+  data.tar.gz: 8d69cd67d8101909bd6c0a62dd10d296746b0e90a03837bce669e6a82098531b
 SHA512:
-  metadata.gz: 769ccb1b054f0b6faf9421e323e562053d3fe7770fb3abed2af5e0535be3f61f39803deff27b4816d4b58efcb07419b46519c73906ff44c7480ee4b03e9ac099
-  data.tar.gz: 6d852af57207ad9cfbc6f30d7eaadf239c338b6c4796198e5ec8f833b69b16fba2d790d555b64b37279583e87edb8a517a7dfe0811e74b66fc21f1e0659c3b9c
+  metadata.gz: 33126ede6c788eb2eff9665b16df30b53d4ce172bb6e2517546237ac81daf52904414732b2a313760686976d48ffe60111394a9fb2b996cbbc32fe1a9fc76377
+  data.tar.gz: 0c3fa5d8541eeaa4c46234c2a2e4854d1606b0c843e6babcbdcc226f6a7bfa77fc609abba6465a856075abf950917fdd31f7aa2896aed823cb94dbfa289cb6b5

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

@@ -10,19 +10,24 @@ module Ecom
 
       has_many :attendance_sheet_entries
 
-      scope :open, -> { find_by(status: OPEN) }
-      scope :current_open, -> { where(status: OPEN, date: Date.today) }
+      scope :open, -> { where(status: OPEN) }
+      scope :current, -> { where(date: Date.today) }
+      scope :current_open, -> { open.current }
+
+      def self.open_for_date(date)
+        AttendanceSheet.find_by(status: OPEN, date: date)
+      end
 
       def self.open_exists?
-        AttendanceSheet.where(status: OPEN).exists?
+        AttendanceSheet.open.exists?
       end
 
       def self.exists_for_today?
-        AttendanceSheet.where(date: Date.today).exists?
+        AttendanceSheet.current.exists?
       end
 
       def self.open_exists_for_today?
-        where(status: OPEN, date: Date.today).exists?
+        AttendanceSheet.current_open.exists?
       end
 
       # Attendance sheet should be created using the
@@ -53,13 +58,14 @@ module Ecom
       # to submit the attendance sheet after the date has
       # passed. Normally, timekeepers need to open and close
       # an attendance sheet of a date on the specific date.
-      def submit
-        raise 'This attendance sheet is not open. Therefore it cannot be submitted' unless status == OPEN
+      def self.submit(date)
+        sheet = AttendanceSheet.open_for_date(date)
+        raise 'There is no open attendance sheet to submit for the selected day.' unless sheet
 
-        self.closed_at = Time.now
-        self.status = SUBMITTED
-        save
-        self
+        sheet.closed_at = Time.now
+        sheet.status = SUBMITTED
+        sheet.save
+        sheet
       end
     end
   end

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

@@ -6,15 +6,15 @@ module Ecom
       belongs_to :revision_to, class_name: 'Ecom::Core::CrewOvertime', optional: true
       belongs_to :created_by, class_name: 'Ecom::Core::User'
 
-      has_one :revision, class_name: 'Ecom::Core::CrewOvertime'
+      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.parse('8:00 AM'), end: Time.parse('12:00 PM')},
+        AFTERNOON => {start: Time.parse('1:00 PM'), end: Time.parse('5:00 PM')},
+        BOTH => {start: Time.parse('8:00 AM'), end: Time.parse('5: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/app/models/ecom/core/overtime_sheet.rb

@@ -10,10 +10,15 @@ module Ecom
 
       has_many :overtime_sheet_entries
 
-      scope :open, -> { find_by(status: OPEN) }
+      scope :open, -> { where(status: OPEN) }
+      scope :for_date, ->(date) { where(date: date) }
 
       def self.open_exists?
-        OvertimeSheet.where(status: OPEN).exists?
+        OvertimeSheet.open.exists?
+      end
+
+      def self.open_for_date_exists?(date)
+        OvertimeSheet.open.for_date(date).exists?
       end
 
       # Overtime sheet should be created using the
@@ -22,6 +27,10 @@ module Ecom
       # and also that we have only one open overtime
       # sheet at a time.
       def self.create_new(date)
+        if OvertimeSheet.open_for_date_exists?(date)
+          raise 'There is already an open overtime sheet for the selected date.'
+        end
+
         if OvertimeSheet.open_exists?
           raise 'There is already an open overtime sheet. It has to be submitted before creating a new one.'
         end

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

@@ -3,6 +3,7 @@ module Ecom
     class OvertimeSheetEntry < ApplicationRecord
       belongs_to :overtime_sheet
       belongs_to :crew
+      has_many :crew_overtimes
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Ecom
       has_and_belongs_to_many :user_roles, join_table: 'ecom_core_users_user_roles'
 
       VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i.freeze
-      validates :first_name, :last_name, :active, presence: true
+      validates :first_name, :last_name, presence: true
       validates :email, presence: true, format: { with: VALID_EMAIL_REGEX }, uniqueness: { case_sensitive: false }
       validates :password, presence: true, length: { minimum: 6 }, confirmation: true, if: :password
 

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.17'.freeze
+    VERSION = '1.1.22'.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.17
+  version: 1.1.22
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-10 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