ecom_core 1.2.30 → 1.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af96604702a7c0a83f0567e1a444bc4fa80b8714f7af4da402d2868937f3e2db
-  data.tar.gz: dc7848bedb34f4e898f90f8f0aa5cdc1c2485172332578af2cb748ca3e14fa3e
+  metadata.gz: 1e0b7beafc5d7b2e1a7385f1a01db93b9d3279c41434a3e104a76e58aa0b48ac
+  data.tar.gz: 766cbcb8b998e4725c1afe43f0c28a2a3901d8ce2e9a84fd308c5c88623ef392
 SHA512:
-  metadata.gz: dbe2542e2087c03011bb0e370eba3da5c2c5b2e40b01e0990750f8964f8aac0510d2ae1a71bee8ec107130dc7fed3e8ec04ab4f96a99d61921f56024beeab259
-  data.tar.gz: cd9546c5d8b5796d3f50688dbf202127f942dd838bff0cbcd3a096943efb5037df103d87256f1d6b1cab71b9e7dafcc3b41572b50d185c390990d81a789f5ffa
+  metadata.gz: 6590ea1a50bdc293aa807ed135287cb6c89ecdd83e902898801f758d1d187b5003b31c77117f7d02ab8367e13b06bac4fb0054726c9e1934e8aa4279d6a36f43
+  data.tar.gz: ead89e3cd5136806c9e1ea45fb91c46249604aad30ab6040f902b119307f34c0a34940c491866d04ff8eab5a99b33350dcdbc9a7399a8ce73155ff086d43c802

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

@@ -12,7 +12,7 @@ module Ecom
       has_one :revision, class_name: 'Ecom::Core::CrewTime', foreign_key: :revision_to_id
 
       validates :checkin_time, presence: true, if: :checkout_time
-      validate :checkout_is_greater_than_checkin
+      validate :time_range_validation, :total_time_validation
 
       scope :by_attendance, lambda { |id|
         joins(:attendance_sheet_entry).where(ecom_core_attendance_sheet_entries: { attendance_sheet_id: id })
@@ -22,12 +22,20 @@ module Ecom
       before_save :calculate_hours
       after_save :calculate_total
 
-      def checkout_is_greater_than_checkin
+      def time_range_validation
         return unless checkin_time && checkout_time && checkout_time <= checkin_time
 
         errors.add(:checkout_time, "can't be less than checkin time.")
       end
 
+      def total_time_validation
+        return if checkout_time.nil? || checkin_time.nil?
+
+        return unless attendance_sheet_entry.total_hours + compute_hours > 8
+
+        errors.add(:attendance_sheet_entry, 'has more than 8 hours')
+      end
+
       def calculate_hours
         self.hours = if checkout_time.nil? || checkin_time.nil?
                        0

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.30'.freeze
+    VERSION = '1.2.31'.freeze
   end
 end

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

@@ -2,6 +2,6 @@ FactoryBot.define do
   factory :attendance_sheet_entry, class: Ecom::Core::AttendanceSheetEntry do
     association :attendance_sheet
     association :crew
-    total_hours { FFaker::Random.rand(0..8) }
+    total_hours { 0 }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.30
+  version: 1.2.31
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm