ecom_core 1.0.25 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01d8e7ef944890c36d0e47159a59cde1a20e9241cc314f6b89f82a8e1e80ffea
-  data.tar.gz: a153b77b8ee893e88828e0a62626de8dd2017be7ea11c19402b9c62c1dd8b9d9
+  metadata.gz: 4beafc2b03a3dacd53644fba8be9649a06d439ea25d2677111b26c97e3bc30c8
+  data.tar.gz: d94e9c73d9e6ccb06edeb4c8c11c243f53cd32db6104dc7811fbd22812c683de
 SHA512:
-  metadata.gz: 910aa55967736cdb9e243ac7a4a23041e3f6261867e43c280945b7d1775fbccc2f39f86fabc867e09552c2659e67a101a40e7eabdfddf7c8c47d99dfa71d6e77
-  data.tar.gz: 8a62b77e189e60b7f022ca49ec9223bcc7e1dc809bcaa2331d55ed4acbdc8a9f21e0ab8b8250a8f86931fc9ae7d1db4b26aea9b9b5e3e0220011e9a457a40cda
+  metadata.gz: 1fe02e793523d4dfc02b33378838ba56539a3e9b87f04d4464c3b11c4cf3a5447c37d187d8e848820706472ed589973fe987ba714bd402db47afe4483268c77d
+  data.tar.gz: 6239fd035f737e79e4d0fe304d0c360fbf670a57de6f31200aa9b615812350c704b7bd06752f4d9af3e30283e019cbdeea86c12ff20089ba9ac1735b70e2db70

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

@@ -8,13 +8,13 @@ module Ecom
       end
 
       def index
-        render json: ResourceTypeSerializer.new(@clazz.all)
+        render json: ResourceTypeSerializer.new(@clazz.all).serializable_hash
       end
 
       def create
         resource_type = @clazz.new(resource_type_params)
         if resource_type.save
-          render json: ResourceTypeSerializer.new(resource_type), status: :created
+          render json: ResourceTypeSerializer.new(resource_type).serializable_hash, 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)
+          render json: ResourceTypeSerializer.new(resource_type).serializable_hash
         else
           render json: { success: false, errors: resource_type.errors }, status: :unprocessable_entity
         end

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

@@ -4,13 +4,20 @@ module Ecom
       skip_before_action :authenticate, only: [:login]
 
       def login
+        app_code = Rails.configuration.app_code
         user = User.find_by(email: auth_params[:email])
+
         if user
           if user.authenticate(auth_params[:password])
-            roles = user.user_roles.each_with_object([]) do |role, result|
+            roles = user.roles_for_module(app_code).each_with_object([]) do |role, result|
               result << role.name
             end
 
+            if roles.count <= 0
+              render json: { error: 'User has no roles in this application.' }, status: :unprocessable_entity
+              return
+            end
+
             payload = { id: user.id, email: user.email, name: user.full_name, roles: roles }
             jwt = TokenAuthService.issue(payload)
             render json: { token: jwt, user: payload, error: nil }

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

@@ -14,6 +14,7 @@ module Ecom
         @current_user ||= user if user
       end
 
+
       private
 
       def authenticate

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)
+        render json: ApplicationModuleSerializer.new(ApplicationModule.all).serializable_hash
       end
 
       def create
         application_module = ApplicationModule.new(application_module_params)
         if application_module.save
-          render json: ApplicationModuleSerializer.new(application_module), status: :created
+          render json: ApplicationModuleSerializer.new(application_module).serializable_hash, 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)
+          render json: ApplicationModuleSerializer.new(application_module).serializable_hash
         else
           render json: { success: false, errors: application_module.errors }, status: :unprocessable_entity
         end

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

@@ -2,24 +2,8 @@ module Ecom
   module Core
     class MenusController < ApplicationController
       def index
-        user = current_user
-        roles = user.user_roles
-        app_module = roles[0].application_module
-        menus = []
-        roles.each do |role|
-          menu_list = role.menus.where(parent: nil, application_module: app_module)
-          menu_list.each do |menu|
-            children = []
-            menu.children.order(:label).each do |child|
-              if role.menus.include? child
-                children << { label: child.label, icon: child.icon, route: child.route }
-              end
-            end
-            menus << { label: menu.label, icon: menu.icon, children: children }
-          end
-        end
-
-        render json: menus
+        service = MenuService.new
+        render json: service.fetch_menu(current_user)
       end
     end
   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)
+        render json: UserRoleSerializer.new(UserRole.all).serializable_hash
       end
 
       def create
         user_role = UserRole.new(user_role_params)
 
         if user_role.save
-          render json: UserRoleSerializer.new(user_role), status: :created
+          render json: UserRoleSerializer.new(user_role).serializable_hash, 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)
+          render json: UserRoleSerializer.new(@user_role).serializable_hash
         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)
+        render json: UserSerializer.new(User.all).serializable_hash
       end
 
       def active
-        render json: UserSerializer.new(User.active)
+        render json: UserSerializer.new(User.active).serializable_hash
       end
 
       def create
         user = User.new(user_params)
         if user.save
-          render json: UserSerializer.new(user), status: :created
+          render json: UserSerializer.new(user).serializable_hash, 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)
+          render json: UserSerializer.new(@user).serializable_hash
         else
           render json: { success: false, errors: @user.errors }, status: :unprocessable_entity
         end

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

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

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

@@ -9,6 +9,17 @@ module Ecom
 
       validates :name, :status, :serial_number, :purchase_date, :purchase_price, presence: true
       validates :serial_number, uniqueness: true
+
+      def self.search(param)
+        search_term = "%#{param.downcase}%"
+        Ecom::Core::EquipmentItem
+          .joins(:equipment)
+          .where(
+            'lower(ecom_core_equipment_items.name) LIKE ? OR lower(ecom_core_equipment.name) LIKE ?',
+            search_term,
+            search_term
+          )
+      end
     end
   end
 end

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

@@ -15,6 +15,10 @@ module Ecom
       def full_name
         "#{first_name} #{last_name}"
       end
+
+      def roles_for_module(code)
+        user_roles.joins(:application_module).where('ecom_core_application_modules.code = ?', code)
+      end
     end
   end
 end

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

@@ -1,8 +1,6 @@
 module Ecom
   module Core
-    class ApplicationModuleSerializer
-      include FastJsonapi::ObjectSerializer
-
+    class ApplicationModuleSerializer < ApplicationSerializer
       attributes :code, :name
     end
   end

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

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

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

@@ -1,7 +1,6 @@
 module Ecom
   module Core
-    class LookupSerializer
-      include FastJsonapi::ObjectSerializer
+    class LookupSerializer < ApplicationSerializer
       attributes :name, :type
     end
   end

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

@@ -1,7 +1,6 @@
 module Ecom
   module Core
-    class ResourceTypeSerializer
-      include FastJsonapi::ObjectSerializer
+    class ResourceTypeSerializer < ApplicationSerializer
       attributes :code, :name, :base_unit, :type
     end
   end

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

@@ -1,8 +1,6 @@
 module Ecom
   module Core
-    class UserRoleSerializer
-      include FastJsonapi::ObjectSerializer
-
+    class UserRoleSerializer < ApplicationSerializer
       attributes :name
     end
   end

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

@@ -1,8 +1,6 @@
 module Ecom
   module Core
-    class UserSerializer
-      include FastJsonapi::ObjectSerializer
-
+    class UserSerializer < ApplicationSerializer
       attributes :first_name, :last_name, :email, :active
     end
   end

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

@@ -0,0 +1,24 @@
+module Ecom
+  module Core
+    class MenuService
+      def fetch_menu(user)
+        role_ids = user.user_roles.map(&:id)
+        join_sql = <<-SQL
+      INNER JOIN ecom_core_menus_user_roles MUR ON MUR.menu_id = ecom_core_menus.id
+      INNER JOIN ecom_core_user_roles UR ON MUR.user_role_id = UR.id
+        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: [] }
+        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]
+          end
+        end
+        menu_list
+      end
+    end
+  end
+end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.0.25'.freeze
+    VERSION = '1.1.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.0.25
+  version: 1.1.4
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -251,10 +251,12 @@ 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
 - app/serializers/ecom/core/user_serializer.rb
+- app/services/ecom/core/menu_service.rb
 - app/services/ecom/core/token_auth_service.rb
 - config/database.ci.yml
 - config/routes.rb