ecom_core 1.3.8 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94e3027df94f50f9f3c06ccd90f7db0656503d24548f9ba4f13a5e08f64d4bfa
-  data.tar.gz: f322acc0c157ceb5b7e2e39a80bde80cf8b94c6fb6cee08fb3fedf60b918e01d
+  metadata.gz: ca77271970adb2814972aed13aa5e7b5e0c04040179bf594b0e6c858a2fff74b
+  data.tar.gz: e67ec2ed2362fd9df15c6ac38edf698b5e09b0f5251b2ab37926ca1c1b8080e6
 SHA512:
-  metadata.gz: 6c722a056f2070704bac09ffc3fe964d38216de5d172609898697a25f6be90f98a280dbaa53a80d29c7457d81318849b8b05dbc997425c9addd169fa48b9b6b2
-  data.tar.gz: 44603efa47b064f655e000080a954df972ddc3125389b143343f95f3c9127588130b1de450978d39530b886a18ac37598072e7c3f946667cbb9bcd457852e662
+  metadata.gz: 6f62042c5aa8366ec5edd0a019f75cac5538eb79037dd142fa297bd0d3cb40dd7a37223b1baad87492b88ad0ecb11abe8c98a7e22cabe1521a21eb1b3008407f
+  data.tar.gz: 761979e88a1dd53ce7ae0c4723b266e9c5bbe6442b39d961d111b0e29887c4e1263a34fc821a9d049acd55b6fbe65846b1e6bd8802665a179d8eb999f00e04c2

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

@@ -7,6 +7,11 @@ module Ecom
         render json: User.all
       end
 
+      def lookup
+        data = ActiveModelSerializers::SerializableResource.new(User.all, each_serializer: UserLookupSerializer)
+        render json: { success: true, data: data }
+      end
+
       def active
         render json: User.active
       end

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

@@ -1,7 +1,6 @@
 module Ecom
   module Core
     class Crew < ApplicationRecord
-      mount_base64_uploader :photo, PhotoUploader
       PERMANENT = 'Permanent'.freeze
       SUPERVISOR = 'Supervisor'.freeze
       TEMPORARY = 'Temporary'.freeze
@@ -13,6 +12,7 @@ module Ecom
       after_save :set_employee_id
 
       belongs_to :crew_type
+      has_one_attached :photo
 
       validates :name, :address, :qualification, :employment, :wage, :guarantor_name, :guarantor_phone, presence: true
       validates :employment, inclusion: EMPLOYMENT_TYPES

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

@@ -14,6 +14,9 @@ module Ecom
 
       validates :title, :status, presence: true
       validates :status, inclusion: STATUSES
+
+      scope :approved, -> { where(approved: true) }
+      scope :unapproved, -> { where(approved: false) }
     end
   end
 end

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

@@ -1,6 +1,11 @@
 module Ecom
   module Core
     class MaintenanceStatus < Lookup
+      EQUIPMENT_NOT_RECEIVED = 'Equipment not received'.freeze
+      RECEIVED_EQUIPMENT = 'Received equipment'.freeze
+      IN_PROGRESS = 'In progress'.freeze
+      WAITING_FOR_PARTS = 'Waiting for parts'.freeze
+      MAINTENANCE_COMPLETED = 'Maintenance completed'.freeze
     end
   end
 end

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

@@ -13,8 +13,8 @@ module Ecom
       validates :crew_id, :crew, :site_id, :site, :start_date, :site_crew_type, :status, presence: true
 
       validates_uniqueness_of :site_id,
-                              scope: :crew_id,
-                              if: -> { status == 'Active' },
+                              scope: %i[crew_id status],
+                              if: :active_site_crew_exists?,
                               message: 'There can only be one record with status `Active` for a given site and crew'
 
       validates :site_crew_type, inclusion: SITE_CREW_TYPES
@@ -22,6 +22,14 @@ module Ecom
 
       belongs_to :crew
       belongs_to :site
+
+      def active_site_crew_exists?
+        active_site_crew = Ecom::Core::SiteCrew.where(site_id: site_id, crew_id: crew_id, status: ACTIVE)
+
+        return true if !active_site_crew.count.zero? && status == ACTIVE
+
+        false
+      end
     end
   end
 end

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

@@ -1,9 +1,8 @@
 module Ecom
   module Core
     class TaskAttachment < ApplicationRecord
-      mount_base64_uploader :file, TaskAttachmentUploader
-
       belongs_to :task
+      has_one_attached :file
 
       validates :title, presence: true
     end

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

@@ -14,6 +14,7 @@ module Ecom
 
       validates :status, presence: true, inclusion: STATUSES
 
+      belongs_to :work_package
       belongs_to :assigned_to, class_name: 'Ecom::Core::Crew'
       belongs_to :generated_by, class_name: 'Ecom::Core::User'
       has_many :tasks

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

@@ -10,6 +10,7 @@ module Ecom
       validates :budget, numericality: true, unless: proc { budget.nil? }
 
       has_many :tasks
+      has_many :work_orders
     end
   end
 end

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

@@ -0,0 +1,11 @@
+module Ecom
+  module Core
+    class UserLookupSerializer < ActiveModel::Serializer
+      attributes :id, :name
+
+      def name
+        "#{object.first_name} #{object.last_name}"
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -6,6 +6,7 @@ Ecom::Core::Engine.routes.draw do
   resources :menus, only: %i[index]
   resources :users, only: %i[index create update]
   get '/users/active', controller: :users, action: :active
+  get '/users/lookup', controller: :users, action: :lookup
 
 
   resources :crew_types

data/db/migrate/20191207103731_create_ecom_core_work_orders.rb

@@ -3,6 +3,10 @@ class CreateEcomCoreWorkOrders < ActiveRecord::Migration[6.0]
     create_table :ecom_core_work_orders do |t|
       t.string :name
       t.string :reference_number
+      t.references :work_package,
+                   null: false,
+                   index: { name: 'wo_on_wp_indx' },
+                   foreign_key: { to_table: :ecom_core_work_packages }
       t.references :assigned_to,
                    null: false,
                    index: { name: 'wo_on_at_indx' },

data/db/migrate/20210417095657_rename_photo_fields.rb

@@ -0,0 +1,6 @@
+class RenamePhotoFields < ActiveRecord::Migration[6.1]
+  def change
+    rename_column :ecom_core_crews, :photo, :photo_url
+    rename_column :ecom_core_task_attachments, :file, :file_url
+  end
+end

data/db/migrate/20210417120215_create_active_storage_tables.active_storage.rb

@@ -0,0 +1,36 @@
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+  def change
+    create_table :active_storage_blobs do |t|
+      t.string   :key,          null: false
+      t.string   :filename,     null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.string   :service_name, null: false
+      t.bigint   :byte_size,    null: false
+      t.string   :checksum,     null: false
+      t.datetime :created_at,   null: false
+
+      t.index [ :key ], unique: true
+    end
+
+    create_table :active_storage_attachments do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false
+      t.references :blob,     null: false
+
+      t.datetime :created_at, null: false
+
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: "index_active_storage_attachments_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+
+    create_table :active_storage_variant_records do |t|
+      t.belongs_to :blob, null: false, index: false
+      t.string :variation_digest, null: false
+
+      t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.3.8'.freeze
+    VERSION = '1.3.13'.freeze
   end
 end

data/lib/ecom_core.rb

@@ -3,5 +3,3 @@ require 'ecom/core/engine'
 require 'ancestry'
 require 'aasm'
 require 'active_model_serializers'
-require 'carrierwave'
-require 'carrierwave/base64'

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

@@ -10,7 +10,7 @@ FactoryBot.define do
     wage_in_words { FFaker::Name.name }
     employment_date { Date.today - 1 }
     sub_contracted { false }
-    photo { FFaker::Name.name }
+    photo_url { FFaker::Name.name }
     guarantor_name { FFaker::Name.name }
     guarantor_phone { FFaker::Name.name }
     active { true }

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

@@ -2,7 +2,6 @@ FactoryBot.define do
   factory :task_attachment, class: Ecom::Core::TaskAttachment do
     title { FFaker::Name.name }
     description { FFaker::Name.name }
-    file { FFaker::Name.name }
     association :task
   end
 end

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

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :work_order, class: Ecom::Core::WorkOrder do
     name { FFaker::Name.unique.name }
+    association :work_package
     association :assigned_to, factory: :crew
     association :generated_by, factory: :user
     start_date { (Time.now + 1.day).to_s }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.13
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -38,26 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: after_commit_everywhere
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: ancestry
   requirement: !ruby/object:Gem::Requirement
@@ -86,34 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: carrierwave
-  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: carrierwave-base64
-  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: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -134,42 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.1
-- !ruby/object:Gem::Dependency
-  name: json-schema
-  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: fog-google
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 6.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 6.1.3
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -372,6 +296,7 @@ files:
 - app/serializers/ecom/core/lookup_serializer.rb
 - app/serializers/ecom/core/resource_type_serializer.rb
 - app/serializers/ecom/core/unit_cost_serializer.rb
+- app/serializers/ecom/core/user_lookup_serializer.rb
 - app/serializers/ecom/core/user_role_serializer.rb
 - app/serializers/ecom/core/user_serializer.rb
 - app/services/ecom/core/crew_contract_transaction_service.rb
@@ -379,11 +304,8 @@ files:
 - app/services/ecom/core/menu_service.rb
 - app/services/ecom/core/site_crew_service.rb
 - app/services/ecom/core/token_auth_service.rb
-- app/uploaders/ecom/core/photo_uploader.rb
-- app/uploaders/ecom/core/task_attachment_uploader.rb
 - app/validators/ecom/core/date_range_validator.rb
 - config/database.ci.yml
-- config/initializers/carrierwave.rb
 - config/routes.rb
 - db/migrate/20190101085530_create_ecom_core_companies.rb
 - db/migrate/20190101112620_create_ecom_core_lookups.rb
@@ -462,6 +384,8 @@ files:
 - db/migrate/20201125191158_create_ecom_core_work_item_resource_requirement_templates.rb
 - db/migrate/20201126191334_create_ecom_core_resource_requisitions.rb
 - db/migrate/20201126191349_create_ecom_core_resource_requisition_items.rb
+- db/migrate/20210417095657_rename_photo_fields.rb
+- db/migrate/20210417120215_create_active_storage_tables.active_storage.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
@@ -572,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Core engine for construction management application.

data/app/uploaders/ecom/core/photo_uploader.rb

@@ -1,30 +0,0 @@
-module Ecom
-  module Core
-    class PhotoUploader < CarrierWave::Uploader::Base
-      if Rails.env.production?
-        storage :fog
-      else
-        storage :file
-      end
-
-      def store_dir
-        "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
-      end
-
-      def extension_whitelist
-        %w[jpg jpeg gif png]
-      end
-
-      def filename
-        "#{secure_token}.#{file.extension}" if original_filename.present?
-      end
-
-      protected
-
-      def secure_token
-        var = :"@#{mounted_as}_secure_token"
-        model.instance_variable_get(var) || model.instance_variable_set(var, SecureRandom.uuid)
-      end
-    end
-  end
-end

data/app/uploaders/ecom/core/task_attachment_uploader.rb

@@ -1,11 +0,0 @@
-module Ecom
-  module Core
-    class TaskAttachmentUploader < CarrierWave::Uploader::Base
-      storage :file
-
-      def store_dir
-        "#{ENV.fetch('UPLOAD_PREFIX')}uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
-      end
-    end
-  end
-end

data/config/initializers/carrierwave.rb

@@ -1,8 +0,0 @@
-CarrierWave.configure do |config|
-    config.fog_credentials = {
-      provider:                         'Google',
-      google_storage_access_key_id:     ENV["GOOGLE_STORAGE_ACCESS_KEY"],
-      google_storage_secret_access_key: ENV["GOOGLE_STORAGE_SECRETE_KEY"]
-    }
-    config.fog_directory = ENV["GOOGLE_STORAGE_BUCKET_NAME"]
-end