optimize for dashboards

app/views/origami/addorders/_menu_item.json.jbuilder

@@ -1,53 +1,20 @@
 # Format for attributes json
 attr_format = []
-# Format for attributes json 
-if item.item_attributes.count > 0   
-  item.item_attributes.each do|attr_id|      
-    menu_attr = MenuItemAttribute.find(attr_id)
-    if attr_format.count == 0
-      attr_format.push({ type: menu_attr.attribute_type, values: [menu_attr.name] })
-      next
-    end
-
-    attr_format.each do |af|
-      if menu_attr.attribute_type.in? attr_format.map {|k| k[:type]}
-        if menu_attr.attribute_type == af[:type]
-          af[:values].push(menu_attr.name)
-        end
-      else 
-        new_attr = {type: menu_attr.attribute_type, values: [ menu_attr.name ] }
-        attr_format.push(new_attr) 
-        break      
-      end          
-    end
-  end
+# Format for attributes json
+if item.item_attributes.count > 0
+  item_attributes = MenuItemAttribute.where(id: item.item_attributes)
+  attr_format = item_attributes.group_by {|att| att.attribute_type }.map { |type, values| {type: type, values: values.map(&:name)} }
 end
 
 # Format for option json
 opt_format = []
-# Format for attributes json 
-if item.item_options.count > 0   
-  item.item_options.each do|opt|      
-    menu_opt = MenuItemOption.find(opt)
-    if opt_format.count == 0
-      opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] })
-      next
-    end
-
-    opt_format.each do |of|
-      if menu_opt.option_type.in? opt_format.map {|k| k[:type]}
-        if menu_opt.option_type == of[:type]
-          of[:values].push(menu_opt.name)
-        end
-      else 
-        new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] }
-        opt_format.push(new_opt) 
-        break
-      end
-    end         
-  end
+# Format for attributes json
+if item.item_options.count > 0
+  item_options = MenuItemOption.where(id: item.item_options)
+  opt_format = item_options.group_by {|opt| opt.option_type }.map { |type, values| {type: type, values: values.map(&:name)} }
 end
 
+
 #Menu Item Information
 json.id           item.id
 json.code    item.item_code
@@ -63,8 +30,8 @@ json.is_available item.is_available
 json.is_sub_item  item.is_sub_item
 json.unit         item.unit
 
-# Item Sets of Menu Item 
-json.item_sets item.item_sets do |its|
+# Item Sets of Menu Item
+json.item_sets item.item_sets.includes(:menu_item_instances) do |its|
   json.id                 its.id
   json.name               its.name
   json.alt_name           its.alt_name
@@ -73,7 +40,7 @@ json.item_sets item.item_sets do |its|
   json.instances its.menu_item_instances do |i|
     json.id  i.id
   end
-end 
+end
 
 json.attributes attr_format
 json.options opt_format
@@ -92,22 +59,17 @@ json.options opt_format
 json.instances item.menu_item_instances do |is|
   if is.is_available
     # Convert id to name for attributes
-    instance_attr = []
-    is.item_attributes.each do |ia|
-       mItemAttr = MenuItemAttribute.find(ia).name
-      instance_attr.push(mItemAttr)
-    end
-    
-      json.id is.id
-      json.code is.item_instance_code
-      json.name is.item_instance_name
-      json.price is.price
-      json.is_available is.is_available
-      json.is_default is.is_default
-      json.is_on_promotion is.is_on_promotion
-      json.promotion_price is.promotion_price
-      json.values instance_attr
-      # json.item_sets is.item_sets
+    instance_attr = MenuItemAttribute.where(id: item.item_attributes).pluck(:name)
+
+    json.id is.id
+    json.code is.item_instance_code
+    json.name is.item_instance_name
+    json.price is.price
+    json.is_available is.is_available
+    json.is_default is.is_default
+    json.is_on_promotion is.is_on_promotion
+    json.promotion_price is.promotion_price
+    json.values instance_attr
   end
 end
 
@@ -116,4 +78,4 @@ end
 #   json.set_items item.children.each do |item|
 #     json.partial! 'api/restaurant/menu/menu_item', item: item
 #   end
-# end
+# end

app/views/origami/dashboard/_menu.json.jbuilder

@@ -12,11 +12,11 @@ if (menu.menu_categories)
   # else
   #   categories = menu.menu_categories
   # end
-   categories = menu.menu_categories
+  categories = menu.menu_categories
   json.categories  categories do |category|
     if category.is_available
-      menu_category = MenuCategory.find_by_menu_category_id(category.id)
-      if !menu_category.nil?
+      parent_category = category.parent
+      if !parent_category.nil?
         json.sub_category "true"
       else
         json.sub_category "false"
@@ -34,7 +34,7 @@ if (menu.menu_categories)
       json.is_available category.is_available
 
       if !order_by.nil? && order_by.value == "name"
-        menu_items = MenuItem.unscoped.where("menu_category_id = ?",category.id).order("name asc")
+        menu_items = category.menu_items.sort_by(&:name)
       else
         menu_items = category.menu_items
       end
@@ -42,7 +42,68 @@ if (menu.menu_categories)
       if category.menu_items
         json.items menu_items do |item|
           if item.is_available
-            json.partial! 'origami/addorders/menu_item', item: item
+            # Format for attributes json
+            attr_format = []
+            # Format for attributes json
+            if item.item_attributes.count > 0
+              item_attributes = @item_attributes.select{ |x| item.item_attributes.include?(x.id.to_s) }
+              attr_format = item_attributes.group_by {|att| att.attribute_type }.map { |type, values| {type: type, values: values.map(&:name)} }
+            end
+
+            # Format for option json
+            opt_format = []
+            # Format for attributes json
+            if item.item_options.count > 0
+              item_options = @item_options.select{ |x| item.item_options.include?(x.id.to_s) }
+              opt_format = item_options.group_by {|opt| opt.option_type }.map { |type, values| {type: type, values: values.map(&:name)} }
+            end
+
+            #Menu Item Information
+            json.id           item.id
+            json.code    item.item_code
+            json.name         item.name
+            json.alt_name     item.alt_name
+            json.image        item.image_path.url
+            json.description  item.description
+            json.information  item.information
+            json.type         item.type
+            json.account_id   item.account_id
+            json.min_qty      item.min_qty
+            json.is_available item.is_available
+            json.is_sub_item  item.is_sub_item
+            json.unit         item.unit
+
+            # Item Sets of Menu Item
+            json.item_sets item.item_sets.map { |its|
+              { id: its.id,
+                name: its.name,
+                alt_name: its.alt_name,
+                min_selectable_qty: its.min_selectable_qty,
+                max_selectable_qty: its.max_selectable_qty,
+                instances: its.menu_item_instances.pluck(:id).map { |id| {id: id}}
+              }
+            }
+
+            json.attributes attr_format
+            json.options opt_format
+
+            json.instances item.menu_item_instances do |is|
+              if is.is_available
+                # Convert id to name for attributes
+                instance_attr = @item_attributes.select{ |x| item.item_attributes.include?(x.id) }.pluck(:name)
+
+                json.id is.id
+                json.code is.item_instance_code
+                json.name is.item_instance_name
+                json.price is.price
+                json.is_available is.is_available
+                json.is_default is.is_default
+                json.is_on_promotion is.is_on_promotion
+                json.promotion_price is.promotion_price
+                json.values instance_attr
+              end
+            end
+
           end
         end
       end