ecom_core 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa793b02a7d9a24882708250c891541910d0f2d4d97c8e713f0226a03da2c7b9
-  data.tar.gz: 102319f9e9313bac6294441dbb4218dc3ed61fd527b4e5fdc81fbf6e3f70032e
+  metadata.gz: c8604bb41df95be804fb66c2ac48f3e1b55b8f776de07f2dee665c4704350858
+  data.tar.gz: 30decab7dc7997c9c4a22bc2a90548c0b72a67b6648e894b6f1234c785739166
 SHA512:
-  metadata.gz: a80e478986df2a080fc9573565fcbe99bb75313c95a54946d74b731633c2f67877dc9371ddd014c9cbd6b358edeef1319b2e8c00b632a2c404b03479eb4e7c97
-  data.tar.gz: 3bcfcd09666b8847e6d61ae03908a799eb7ce02322fa97f42a78a2d4dbdac81a40aa22d4cf44967a0bd52ecea8587b8120f71248aaf7feb55e0ad6c0b5a5f809
+  metadata.gz: ac72d68e86a4ff54ee5bf33d3068cf57eb44ab5038873481be623cf1eb1c461c8c65749385536e973a9909c8269e5e06a1125562ff7c14a8c9dba322257fe500
+  data.tar.gz: 44c1ff6ddcbb054bd262ef9a0a75ab2fb6f42d4558a74afe7866c0ee451b45c577003f8c988a60e4a3e8341212451864cb4f633ffa4a6bf5d95bce1615ac7065

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

@@ -2,15 +2,17 @@ module Ecom
   module Core
     class Crew < ApplicationRecord
       PERMANENT = 'Permanent'.freeze
+      SUPERVISOR = 'Supervisor'.freeze
       TEMPORARY = 'Temporary'.freeze
+      EMPLOYMENT_TYPES = [PERMANENT, SUPERVISOR, TEMPORARY].freeze
 
       before_save :set_employment_date,
                   if: proc { |c| c.employment_date.nil? }
 
       belongs_to :crew_type
 
-      validates :name, :qualification, presence: true
-      validates :employment, inclusion: [PERMANENT, TEMPORARY]
+      validates :name, :address, :qualification, :employment, :wage, :wage_in_words, presence: true
+      validates :employment, inclusion: EMPLOYMENT_TYPES
 
       def set_employment_date
         self.employment_date = Date.today

data/config/database.ci.yml

@@ -4,6 +4,7 @@ default: &default
   pool: 5
   timeout: 5000
   host: <%= ENV['DB_HOST'] %>
+  port: <%= ENV['DB_PORT'] %>
   username: <%= ENV['POSTGRES_USER'] %>
   password: <%= ENV['POSTGRES_PASSWORD'] %>
   database: <%= ENV['POSTGRES_DB'] %>

data/db/migrate/20191225100054_create_ecom_core_crews.rb

@@ -3,11 +3,13 @@ class CreateEcomCoreCrews < ActiveRecord::Migration[6.0]
     create_table :ecom_core_crews do |t|
       t.string :employee_id
       t.string :name, null: false
+      t.string :address, null: false
       t.string :phone
       t.string :email
       t.string :qualification, null: false
       t.string :employment, null: false
-      t.float :wage
+      t.float :wage, null: false
+      t.string :wage_in_words, null: false
       t.date :employment_date
       t.boolean :sub_contracted, null: false, default: false
       t.string :guarantor_name

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.6'.freeze
+    VERSION = '1.2.7'.freeze
   end
 end

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

@@ -1,11 +1,13 @@
 FactoryBot.define do
   factory :crew, class: Ecom::Core::Crew do
     name { FFaker::Name.name }
+    address { FFaker::Name.name }
     phone { FFaker::Name.name }
     email { FFaker::Name.name }
     qualification { FFaker::Name.name }
     employment { Ecom::Core::Crew::PERMANENT }
     wage { FFaker::Random.rand(1000..5000) }
+    wage_in_words { FFaker::Name.name }
     employment_date { Date.today - 1 }
     sub_contracted { false }
     guarantor_name { FFaker::Name.name }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Henock L.