From 4ba8296298e98ca477f60ab7b36c56bc850f5da8 Mon Sep 17 00:00:00 2001 From: Araslanov Evgeny Date: Thu, 16 Aug 2018 00:01:43 +0300 Subject: [PATCH] API: Fix find tags by name (#359) --- app/controllers/api/v0/tags_controller.rb | 36 ++--------------------- app/models/tag.rb | 7 +++++ 2 files changed, 9 insertions(+), 34 deletions(-) diff --git a/app/controllers/api/v0/tags_controller.rb b/app/controllers/api/v0/tags_controller.rb index 753a14dc0..f526c8f98 100644 --- a/app/controllers/api/v0/tags_controller.rb +++ b/app/controllers/api/v0/tags_controller.rb @@ -9,43 +9,11 @@ module Api def index @page = params[:page] - @tags = Tag.all.order("taggings_count DESC").page(@page).per(10) + @tags = Tag.order(taggings_count: :desc).page(@page).per(10) end def onboarding - tag_names = %w[ - beginners - career - computerscience - git - go - java - javascript - linux - productivity - python - security - webdev - css - php - opensource - ruby - cpp - dotnet - swift - testing - devops - vim - kotlin - rust - elixir - scala - ] - @tags = [] - tag_names.each do |tag_name| - @tags.push(Tag.find_by(name: tag_name)) - end - @tags = @tags.reject(&:nil?) + @tags = Tag.where(name: Tag::NAMES) end end end diff --git a/app/models/tag.rb b/app/models/tag.rb index f81a3866c..e22f744e3 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -3,6 +3,13 @@ class Tag < ActsAsTaggableOn::Tag acts_as_followable resourcify + NAMES = %w( + beginners career computerscience git go java javascript + linux productivity python security webdev css php opensource + ruby cpp dotnet swift testing devops vim kotlin rust elixir + scala + ).freeze + mount_uploader :profile_image, ProfileImageUploader mount_uploader :social_image, ProfileImageUploader