ecom_core 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a0c28baf17d2c00ff282fba227a6cf7c10d4c6f11507e773214d3d82df2477e
-  data.tar.gz: 00e5b91dd8f598b92353923d80750deb193f627cec91e5563a85de6c770e25a5
+  metadata.gz: f15cdff1527a5033ba32892a8a9455198666e4ed2939b696dcfeb336f0c02388
+  data.tar.gz: 2ccc62d0759644c52dc80a63b4d0b940aae6e69a7a077502fd708592e5b99cc4
 SHA512:
-  metadata.gz: e7ea275f8bc129cc1490ca5f2b6a4f90d7e631dabb4d6fb0e9af31f625f1e8fa4538caa6362dac463cd86db86ee3e2304b29a0959e4471cc73578b207bf6f003
-  data.tar.gz: 39d5157a5bb77483d59124289439d52ac94f2a0d37f53c486727727da1f14b83380bdd0afbffa69fa640150fff80dadf805404fef87583c48a7ca39cb3f3a8f1
+  metadata.gz: 5f3951c2c91370b336a38c0adf0e372230ca7ae7125bbf11dcb4b6fc548921d41d7d356ad1aea7dd72074adfd1e1747086f3587c50c784db28e766c5ec9e33bc
+  data.tar.gz: 5ae92530a31d4bab42850f5cccc70a14a07bd3b720317616c964eceae719ae6e355394f2225cf353c08373d3808435fc6bdb81423483f615350ecc27b61b6559

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/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/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.1.1'.freeze
+    VERSION = '1.1.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -255,6 +255,7 @@ files:
 - 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