ecom_core 1.1.5 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb5b6db138db077ae3162b60efbfdee5cabb4b362821364f6855bb64a31c1bc7
-  data.tar.gz: 6f3327caa33dd591ec4d4ee429c4c956035209a0c653f683200ec64faa3f6a68
+  metadata.gz: 21d88a79d247105aca7d954e252af349bcec619aae7f3022a6a8600c87789473
+  data.tar.gz: dde26dadde5937c3038971b740f4c9f3a66d6d7e55f712fde53b2efc6531d427
 SHA512:
-  metadata.gz: 89d2fdcac80008992d68c0b7fde70cc75064d014144875592f141dc8007d46c14ac3cec922f5c9b139d04544d0dc62f3e377ba13116b42c2ff69cbc81c9fc3ad
-  data.tar.gz: aea4236c00a9636d34ff52afccd465bc6b6c238c6bd7cf883d08ab61504fb687432c39243129c877201ea5263b2a0ed140c54a953a484291721277e357660b09
+  metadata.gz: 694ccf565bb676c5bf30b593fe87fce5bb5437687d1e30ebe349f3b93b7dd505c3f87985e2ad45f80bd487f5c0bc7086265a0a6d8a2480fdea6ae95edbb7e9a1
+  data.tar.gz: 7bcd844e8182301b169b43d3bb503a60640f5677223aa91442fe2bf901e99d3572fdd541725a6a6c0bb1137c78591ddb0d6bb8feebf499aa681f2eb20199ca2a

data/app/controllers/concerns/ecom/core/resource_typeable.rb

@@ -8,13 +8,13 @@ module Ecom
       end
 
       def index
-        render json: ResourceTypeSerializer.new(@clazz.all).serializable_hash
+        render json: @clazz.all
       end
 
       def create
         resource_type = @clazz.new(resource_type_params)
         if resource_type.save
-          render json: ResourceTypeSerializer.new(resource_type).serializable_hash, status: :created
+          render json: resource_type, status: :created
         else
           render json: { success: false, errors: resource_type.errors }, status: :unprocessable_entity
         end
@@ -23,7 +23,7 @@ module Ecom
       def update
         resource_type = @clazz.find(params[:id])
         if resource_type.update(resource_type_params)
-          render json: ResourceTypeSerializer.new(resource_type).serializable_hash
+          render json: resource_type
         else
           render json: { success: false, errors: resource_type.errors }, status: :unprocessable_entity
         end

data/app/controllers/ecom/core/application_modules_controller.rb

@@ -2,13 +2,13 @@ module Ecom
   module Core
     class ApplicationModulesController < ApplicationController
       def index
-        render json: ApplicationModuleSerializer.new(ApplicationModule.all).serializable_hash
+        render json: ApplicationModule.all
       end
 
       def create
         application_module = ApplicationModule.new(application_module_params)
         if application_module.save
-          render json: ApplicationModuleSerializer.new(application_module).serializable_hash, status: :created
+          render json: application_module, status: :created
         else
           render json: { success: false, errors: application_module.errors }, status: :unprocessable_entity
         end
@@ -17,7 +17,7 @@ module Ecom
       def update
         application_module = ApplicationModule.find(params[:id])
         if application_module.update(application_module_params)
-          render json: ApplicationModuleSerializer.new(application_module).serializable_hash
+          render json: application_module
         else
           render json: { success: false, errors: application_module.errors }, status: :unprocessable_entity
         end

data/app/controllers/ecom/core/user_roles_controller.rb

@@ -4,14 +4,14 @@ module Ecom
       before_action :set_user_role, only: [:update]
 
       def index
-        render json: UserRoleSerializer.new(UserRole.all).serializable_hash
+        render json: UserRole.all
       end
 
       def create
         user_role = UserRole.new(user_role_params)
 
         if user_role.save
-          render json: UserRoleSerializer.new(user_role).serializable_hash, status: :created
+          render json: user_role, status: :created
         else
           render json: { success: false, errors: user_role.errors }, status: :unprocessable_entity
         end
@@ -19,7 +19,7 @@ module Ecom
 
       def update
         if @user_role.update(user_role_params)
-          render json: UserRoleSerializer.new(@user_role).serializable_hash
+          render json: @user_role
         else
           render json: { success: false, errors: @user_role.errors }, status: :unprocessable_entity
         end

data/app/controllers/ecom/core/users_controller.rb

@@ -4,17 +4,17 @@ module Ecom
       before_action :set_user, only: [:update]
 
       def index
-        render json: UserSerializer.new(User.all).serializable_hash
+        render json: User.all
       end
 
       def active
-        render json: UserSerializer.new(User.active).serializable_hash
+        render json: User.active
       end
 
       def create
         user = User.new(user_params)
         if user.save
-          render json: UserSerializer.new(user).serializable_hash, status: :created
+          render json: user, status: :created
         else
           render json: { success: false, errors: user.errors }, status: :unprocessable_entity
         end
@@ -22,7 +22,7 @@ module Ecom
 
       def update
         if @user.update(user_params)
-          render json: UserSerializer.new(@user).serializable_hash
+          render json: @user
         else
           render json: { success: false, errors: @user.errors }, status: :unprocessable_entity
         end

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

@@ -0,0 +1,58 @@
+module Ecom
+  module Core
+    class AttendanceSheet < ApplicationRecord
+      OPEN = 'Open'.freeze
+      CLOSED = 'Closed'.freeze
+
+      validates :date, :opened_at, presence: true, uniqueness: true
+      validates :status, inclusion: [OPEN, CLOSED]
+
+      has_many :attendance_sheet_entries
+
+      scope :open, -> { find_by(status: OPEN) }
+
+      def self.exists_for_today?
+        AttendanceSheet.where(date: Date.today).exists?
+      end
+
+      def self.open_exists_for_today?
+        where(status: OPEN, date: Date.today).exists?
+      end
+
+      # Attendance sheet should be created using the
+      # method below only. This is because we need to
+      # check if there is an open attendance already,
+      # and also that we have only one attendace sheet
+      # per day.
+      def self.create_current
+        raise 'Attendance sheet already created for the day.' if AttendanceSheet.exists_for_today?
+
+        AttendanceSheet.create(date: Date.today, opened_at: Time.now, status: OPEN)
+      end
+
+      def self.close_current
+        sheet = AttendanceSheet.find_by(date: Date.today, status: OPEN)
+
+        raise 'There is no attendance sheet to close.' if sheet.nil?
+
+        sheet.closed_at = Time.now
+        sheet.status = CLOSED
+        sheet.save
+        sheet
+      end
+
+      # This method should be used by privileged users
+      # to close 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 self.close
+        raise 'There is no attendance sheet to close.' unless AttendanceSheet.open_exists_for_today?
+
+        sheet = AttendanceSheet.open
+        sheet.closed_at = Time.now
+        sheet.save
+        sheet
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Ecom
+  module Core
+    class AttendanceSheetEntry < ApplicationRecord
+      belongs_to :attendance_sheet
+      belongs_to :crew
+    end
+  end
+end

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

@@ -8,7 +8,6 @@ module Ecom
                   if: proc { |c| c.employment_date.nil? }
 
       belongs_to :crew_type
-      has_many :crew_times, class_name: 'Ecom::Core::CrewTime'
 
       validates :name, :qualification, presence: true
       validates :employment, inclusion: [PERMANENT, TEMPORARY]

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

@@ -1,15 +1,15 @@
 module Ecom
   module Core
     class CrewTime < ApplicationRecord
-      belongs_to :crew
+      belongs_to :attendance_sheet_entry
       belongs_to :overtime_type, optional: true
 
-      validates :date, :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
+      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_converted_hours
 

data/app/serializers/ecom/core/application_module_serializer.rb

@@ -1,7 +1,7 @@
 module Ecom
   module Core
-    class ApplicationModuleSerializer < ApplicationSerializer
-      attributes :code, :name
+    class ApplicationModuleSerializer < ActiveModel::Serializer
+      attributes :id, :code, :name
     end
   end
 end

data/app/serializers/ecom/core/lookup_serializer.rb

@@ -1,7 +1,7 @@
 module Ecom
   module Core
-    class LookupSerializer < ApplicationSerializer
-      attributes :name, :type
+    class LookupSerializer < ActiveModel::Serializer
+      attributes :id, :name, :type
     end
   end
 end

data/app/serializers/ecom/core/resource_type_serializer.rb

@@ -1,7 +1,7 @@
 module Ecom
   module Core
-    class ResourceTypeSerializer < ApplicationSerializer
-      attributes :code, :name, :base_unit, :type
+    class ResourceTypeSerializer < ActiveModel::Serializer
+      attributes :id, :code, :name, :base_unit, :type
     end
   end
 end

data/app/serializers/ecom/core/user_role_serializer.rb

@@ -1,7 +1,7 @@
 module Ecom
   module Core
-    class UserRoleSerializer < ApplicationSerializer
-      attributes :name
+    class UserRoleSerializer < ActiveModel::Serializer
+      attributes :id, :name
     end
   end
 end

data/app/serializers/ecom/core/user_serializer.rb

@@ -1,7 +1,7 @@
 module Ecom
   module Core
-    class UserSerializer < ApplicationSerializer
-      attributes :first_name, :last_name, :email, :active
+    class UserSerializer < ActiveModel::Serializer
+      attributes :id, :first_name, :last_name, :email, :active
     end
   end
 end

data/app/services/ecom/core/menu_service.rb

@@ -9,12 +9,12 @@ module Ecom
         SQL
         menu = Menu.joins(join_sql).where('UR.id IN (?)', role_ids).distinct
         menu_list = menu.select { |m| m.parent.nil? }.each_with_object([]) do |item, list|
-          list << { id: item.id, label: item.label, icon: item.icon, route: item.route, children: [] }
+          list << { id: item.id, label: item.label, icon: item.icon, routerLink: item.route, items: [] }
         end
 
         menu_list.each do |ml|
-          ml[:children] = menu.reject { |m| m.parent.nil? }.each_with_object([]) do |item, list|
-            list << { id: item.id, label: item.label, icon: item.icon, route: item.route } if item.parent_id == ml[:id]
+          ml[:items] = menu.reject { |m| m.parent.nil? }.each_with_object([]) do |item, list|
+            list << { id: item.id, label: item.label, icon: item.icon, routerLink: item.route } if item.parent_id == ml[:id]
           end
         end
         menu_list

data/db/data/20200401064242_move_date_to_attendance_sheet.rb

@@ -0,0 +1,20 @@
+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

data/db/migrate/20200401040433_create_ecom_core_attendance_sheets.rb

@@ -0,0 +1,13 @@
+class CreateEcomCoreAttendanceSheets < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_attendance_sheets do |t|
+      t.date :date, null: false, unique: true
+      t.time :opened_at, null: false
+      t.time :closed_at
+      t.string :remark
+      t.string :status, null: false, default: 'Open'
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200401071343_remove_date_column_from_crew_times.rb

@@ -0,0 +1,5 @@
+class RemoveDateColumnFromCrewTimes < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :ecom_core_crew_times, :date
+  end
+end

data/db/migrate/20200401122539_create_ecom_core_attendance_sheet_entries.rb

@@ -0,0 +1,14 @@
+class CreateEcomCoreAttendanceSheetEntries < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_attendance_sheet_entries do |t|
+      t.references :attendance_sheet, null: false, index: { name: 'ase_on_as_indx' }
+      t.references :crew, null: false, index: { name: 'ase_on_crew_indx' }
+      t.float :total_hours
+
+      t.timestamps
+    end
+    add_foreign_key :ecom_core_attendance_sheet_entries, :ecom_core_attendance_sheets,
+                    column: :attendance_sheet_id
+    add_foreign_key :ecom_core_attendance_sheet_entries, :ecom_core_crews, column: :crew_id
+  end
+end

data/db/migrate/20200401142959_relate_crew_time_with_attendance_sheet_entry.rb

@@ -0,0 +1,8 @@
+class RelateCrewTimeWithAttendanceSheetEntry < ActiveRecord::Migration[6.0]
+  def change
+    add_column :ecom_core_crew_times, :attendance_sheet_entry_id, :integer,
+               index: { name: 'ase_on_ct_indx' }
+    add_foreign_key :ecom_core_crew_times, :ecom_core_attendance_sheet_entries,
+                    column: :attendance_sheet_entry_id
+  end
+end

data/db/migrate/20200401144137_remove_crew_time_id_from_crew.rb

@@ -0,0 +1,7 @@
+class RemoveCrewTimeIdFromCrew < ActiveRecord::Migration[6.0]
+  def change
+    remove_foreign_key :ecom_core_crew_times, :ecom_core_crews, column: :crew_id
+    remove_index :ecom_core_crew_times, name: 'ct_on_crew_indx'
+    remove_column :ecom_core_crew_times, :crew_id
+  end
+end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.5'.freeze
+    VERSION = '1.1.10'.freeze
   end
 end

data/lib/ecom_core.rb

@@ -2,4 +2,5 @@ require 'ecom/core'
 require 'ecom/core/engine'
 require 'ancestry'
 require 'aasm'
-require 'fast_jsonapi'
+require 'active_model_serializers'
+require 'data_migrate'

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

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

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :attendance_sheet, class: 'Ecom::Core::AttendanceSheet' do
+    date { Date.today }
+    opened_at { Time.now }
+    closed_at { nil }
+    remark { FFaker::Name.name }
+    status { Ecom::Core::AttendanceSheet::OPEN }
+  end
+end

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

@@ -1,13 +1,12 @@
 FactoryBot.define do
   factory :crew_time, class: 'Ecom::Core::CrewTime' do
-    date { Date.today }
     checkin_time { Time.now }
     checkout_time { Time.now + 2 * 60 * 60 }
     hours { 2 }
     converted_hours { 2 }
-    association :crew
     remark { FFaker::Name.name }
     overtime { false }
     overtime_type { nil }
+    association :attendance_sheet_entry
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.10
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-28 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fast_jsonapi
+  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: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -95,13 +95,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.0.2
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: data_migrate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ffaker
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -216,6 +216,8 @@ files:
 - app/controllers/ecom/core/users_controller.rb
 - app/models/ecom/core/application_module.rb
 - 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/crew.rb
 - app/models/ecom/core/crew_time.rb
 - app/models/ecom/core/crew_type.rb
@@ -251,7 +253,6 @@ files:
 - app/models/ecom/core/work_product.rb
 - app/models/ecom/core/work_product_template.rb
 - app/serializers/ecom/core/application_module_serializer.rb
-- app/serializers/ecom/core/application_serializer.rb
 - app/serializers/ecom/core/lookup_serializer.rb
 - app/serializers/ecom/core/resource_type_serializer.rb
 - app/serializers/ecom/core/user_role_serializer.rb
@@ -260,6 +261,7 @@ 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
@@ -296,12 +298,19 @@ files:
 - db/migrate/20200315153640_create_ecom_core_equipment_items.rb
 - db/migrate/20200315160810_create_ecom_core_equipment_valuations.rb
 - db/migrate/20200316125323_create_ecom_core_equipment_components.rb
+- db/migrate/20200401040433_create_ecom_core_attendance_sheets.rb
+- db/migrate/20200401071343_remove_date_column_from_crew_times.rb
+- db/migrate/20200401122539_create_ecom_core_attendance_sheet_entries.rb
+- db/migrate/20200401142959_relate_crew_time_with_attendance_sheet_entry.rb
+- db/migrate/20200401144137_remove_crew_time_id_from_crew.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
 - lib/ecom_core.rb
 - lib/tasks/ecom_core_tasks.rake
 - 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/crew_times.rb
 - spec/factories/ecom/core/crew_types.rb
 - spec/factories/ecom/core/crews.rb

data/app/serializers/ecom/core/application_serializer.rb

@@ -1,20 +0,0 @@
-module Ecom
-  module Core
-    class ApplicationSerializer
-      include FastJsonapi::ObjectSerializer
-
-      def serializable_hash
-        data = super[:data]
-        if data.is_a? Hash
-          data[:attributes]
-        elsif data.is_a? Array
-          data.map { |d| d[:attributes] }
-        elsif data.nil?
-          nil
-        else
-          data
-        end
-      end
-    end
-  end
-end