senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added 'order' fields to sections, categories and sub_categories. - moved backoffice migrations to front-api

Browse Source
This commit is contained in:
Edin Dazdarevic
2015-03-19 00:10:24 +01:00
parent a1b9250865
commit 70635ebd1e
9 changed files with 58 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
front-api/controllers/category.rb
View File

@@ -1,10 +1,10 @@
get '/category' do
Category.order(:name).all.to_json(:include => [:section, :sub_categories, :filter_criterias =>{:include => :filter_criteria_values} ])
Category.eager_load(:sub_categories).order('categories.order, sub_categories.order').all.to_json(:include => [:section, :sub_categories, :filter_criterias =>{:include => :filter_criteria_values} ])
end
get '/category/:id' do
id = params[:id].to_i
Category.find(id).to_json(:include => [:section, :sub_categories, :filter_criterias =>{:include => :filter_criteria_values}])
Category.eager_load(:sub_categories).order('sub_categories.order').find(id).to_json(:include => [:section, :sub_categories, :filter_criterias =>{:include => :filter_criteria_values}])
end

6
front-api/controllers/section.rb
View File

@@ -1,9 +1,7 @@
get '/section' do
Section.order(:name).all.to_json(:include =>
[:categories => { :include => :sub_categories }])
Section.eager_load(:categories).order('sections.order, categories.order').to_json(:include => :categories)
end
get '/section/:id' do
Section.find(params[:id].to_i).to_json(:include => [
:categories => { :include => :sub_categories } ])
Section.eager_load(categories: :sub_categories).order('categories.order, sub_categories.order').find(params[:id].to_i).to_json(:include => [:categories => {:include => :sub_categories}])
end