Improve resume skills description

Gemfile

@@ -84,6 +84,7 @@ group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
   # Use sqlite3 as the database for Active Record
+  gem 'debug'
   gem 'factory_bot_rails'
   gem 'rubocop-performance'
   gem 'rubocop-rails'

Gemfile.lock

@@ -126,6 +126,9 @@ GEM
       activesupport (>= 4.2)
     crass (1.0.6)
     date (3.3.4)
+    debug (1.9.2)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -574,6 +577,7 @@ DEPENDENCIES
   capybara
   cocoon
   counter_culture
+  debug
   devise
   devise-bootstrap-views
   devise-i18n

app/models/resume.rb

@@ -4,32 +4,33 @@
 #
 # Table name: resumes
 #
-#  id                   :integer          not null, primary key
-#  about_myself         :text
-#  answers_count        :integer          default(0), not null
-#  awards_description   :text
-#  city                 :string
-#  contact              :string
-#  contact_email        :string
-#  contact_phone        :string
-#  contact_telegram     :string
-#  english_fluency      :string
-#  evaluated_ai         :boolean
-#  evaluated_ai_state   :string
-#  github_url           :string
-#  hexlet_url           :string
-#  impressions_count    :integer          default(0)
-#  locale               :string
-#  name                 :string           not null
-#  projects_description :text
-#  relocation           :string
-#  skills_description   :text
-#  state                :string
-#  summary              :text
-#  url                  :string
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
-#  user_id              :integer          not null
+#  id                     :integer          not null, primary key
+#  about_myself           :text
+#  answers_count          :integer          default(0), not null
+#  awards_description     :text
+#  city                   :string
+#  contact                :string
+#  contact_email          :string
+#  contact_phone          :string
+#  contact_telegram       :string
+#  english_fluency        :string
+#  evaluated_ai           :boolean
+#  evaluated_ai_state     :string
+#  github_url             :string
+#  hexlet_url             :string
+#  impressions_count      :integer          default(0)
+#  locale                 :string
+#  name                   :string           not null
+#  projects_description   :text
+#  relocation             :string
+#  skills_description     :text(250)
+#  skills_description_old :text
+#  state                  :string
+#  summary                :text
+#  url                    :string
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#  user_id                :integer          not null
 #
 # Indexes
 #
@@ -43,6 +44,7 @@ class Resume < ApplicationRecord
   include StateConcern
   extend Enumerize
   extend TagResumePresenter
+  include ResumePresenter
 
   mark_as_outdated :hexlet_url, :awards_description
 
@@ -58,10 +60,11 @@ class Resume < ApplicationRecord
   validates :name, presence: true
   validates :github_url, presence: true, unless: :draft?
   validates :summary, length: { minimum: 200 }, presence: true, unless: :draft?
-  validates :skills_description, presence: true, unless: :draft?
+  validates :skills_description, length: { maximum: 250 }, presence: true, unless: :draft?
   validates :contact_email, presence: true, unless: :draft?
   validates :contact_email, 'valid_email_2/email': true
   validates :contact_phone, phone: true
+  validate :skills_description_valid_format, unless: :draft?
 
   belongs_to :user
   has_many :answers, inverse_of: :resume, dependent: :destroy
@@ -128,6 +131,12 @@ def initialize(attribute = nil)
     super(attrs_with_defaults)
   end
 
+  def skills_description_valid_format
+    return unless skills.size > 10 || skills.any? { |element| element.size > 25 }
+
+    errors.add(:skills_description)
+  end
+
   def to_s
     name
   end

app/presenters/resume_presenter.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module ResumePresenter
+  def skills
+    skills_description&.split("\n") || []
+  end
+end

app/views/web/resumes/_information.html.slim

@@ -52,7 +52,14 @@ hr.my-auto
   .col-sm-3
     b = han('resume', 'skills_description')
   .col-sm-9.hexlet-cv-content
-    == markdown2html @resume.skills_description
+    - if @resume.skills_description.nil?
+      == markdown2html @resume.skills_description_old
+    - else
+      .row
+        - @resume.skills.each_slice(5) do |skills_slice|
+          .col-6
+            - skills_slice.each do |skill|
+              li = skill[0..24]
 - if @resume.projects_description
   .row.mb-3
     .col-sm-3

app/views/web/shared/_resume_form.html.slim

@@ -36,8 +36,15 @@
       .mt-3
         .mb-3
           = f.input :summary, input_html: { rows: 10 }
+        - if resume.skills_description.nil? && resume.skills_description_old
+          .row.bg-body-tertiary.rounded-3.border.mb-3.align-items-center
+            .col-3
+              strong = t('.skill_description_new_requirements')
+            .col-9
+              p.fw-bold = t('.skill_description_prev_input')
+              == markdown2html @resume.skills_description_old
         .mb-3
-          = f.input :skills_description, input_html: { rows: 5 }
+          = f.input :skills_description, input_html: { rows: 10 }
         .mb-3
           = f.input :projects_description, as: :text, input_html: { rows: 10 }
 

config/locales/en.activerecord.yml

@@ -145,6 +145,8 @@ en:
       models:
         resume:
           attributes:
+            skills_description:
+              invalid: is not in the correct format
             contact_email:
               invalid: is not in the correct format
             contact_phone:

config/locales/en.views.yml

@@ -70,7 +70,9 @@ en:
         contacts: Contacts
         main: Main
         add: Add
-        additionally: Additionally 
+        additionally: Additionally
+        skill_description_new_requirements: 'To improve the skills readability, we have changed the filling requirements'
+        skill_description_prev_input: 'Your previous input'
       work_fields:
         remove_work: Delete work experience
       education_fields:

config/locales/ru.activerecord.yml

@@ -25,7 +25,7 @@ ru:
       answer/comment: Комментарий
     attributes:
       user:
-        password: пароль
+        password: Пароль
         resume_answer_likes_count: Количество лайков
         first_name: Имя
         last_name: Фамилия
@@ -161,10 +161,12 @@ ru:
       models:
         resume:
           attributes:
+            skills_description:
+              invalid: имеют не верный формат
             contact_email:
               invalid: имеет не верный формат
             contact_phone:
-              invalid: имеет неверное формат
+              invalid: имеет не верный формат
         resume/answer/like:
           attributes:
             user:

config/locales/ru.views.yml

@@ -173,6 +173,8 @@ ru:
         main: Основное
         add: Заполнить
         additionally: Дополнительно
+        skill_description_new_requirements: 'Для повышения читаемости навыков, мы изменили требования по заполнению.'
+        skill_description_prev_input: 'Ваш предыдущий ввод'
       work_fields:
         remove_work: Удалить опыт работы
       education_fields:

config/locales/simple_form.en.yml

@@ -76,7 +76,7 @@ en:
         projects_description: Indicate the projects in which you participated
         summary: *markdown_tips
         about_myself: *markdown_tips
-        skills_description: *markdown_tips
+        skills_description: 'One skill per line, no more than 10, skill length 25 characters max'
         city: Specify the city of your residence
         direction_list: |
           Specify your direction. Here you need to specify only what you can say about the X-developer, for example: Java-developer. The maximum length is 40 characters. Separate tags with commas.

config/locales/simple_form.ru.yml

@@ -75,7 +75,7 @@ ru:
         salary_to: Обязательно к заполнению, если не указан нижний уровень зарплаты и зарплата не по договоренности
       resume:
         summary: *markdown_tips
-        skills_description: *markdown_tips
+        skills_description: 'Один навык - одна строка, не более 10, длинна навыка не более 25 символов'
         city: Укажите город вашего проживания
         direction_list: |
           Укажите ваше направление. Здесь нужно указывать только то, про что можно сказать X-разработчик, например: Java-разработчик. Максимальная длина 40 символов. Тэги разделяйте запятыми.

db/migrate/20240508043924_update_resume_skill_description.rb

@@ -0,0 +1,6 @@
+class UpdateResumeSkillDescription < ActiveRecord::Migration[7.0]
+  def change
+    rename_column :resumes, :skills_description, :skills_description_old
+    add_column :resumes, :skills_description, :text
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2024_01_19_100332) do
+ActiveRecord::Schema[7.0].define(version: 2024_05_08_043924) do
   create_table "career_items", force: :cascade do |t|
     t.integer "order"
     t.integer "career_id", null: false
@@ -215,7 +215,7 @@
     t.datetime "updated_at", null: false
     t.string "url"
     t.text "summary"
-    t.text "skills_description"
+    t.text "skills_description_old"
     t.string "github_url"
     t.text "awards_description"
     t.string "english_fluency"
@@ -233,6 +233,7 @@
     t.string "evaluated_ai_state"
     t.text "projects_description"
     t.text "about_myself"
+    t.text "skills_description", limit: 250
     t.index ["user_id"], name: "index_resumes_on_user_id"
   end
 

test/controllers/web/account/resumes_controller_test.rb

@@ -190,4 +190,28 @@ class Web::Account::ResumesControllerTest < ActionDispatch::IntegrationTest
     resume = Resume.find_by(name: attrs[:name])
     assert { !resume }
   end
+
+  test '#create fail with invalid skills_description format' do
+    attrs = FactoryBot.attributes_for :resume
+    attrs[:skills_description] = "Too_many_skills\n" * 15
+
+    params = {
+      publish: true,
+      resume: attrs
+    }
+
+    post(account_resumes_path, params:)
+    assert_response :unprocessable_entity
+
+    resume = Resume.find_by(name: attrs[:name])
+    assert { !resume }
+
+    attrs[:skills_description] = 'Invalid_skill_lenght' * 2
+
+    post(account_resumes_path, params:)
+    assert_response :unprocessable_entity
+
+    resume = Resume.find_by(name: attrs[:name])
+    assert { !resume }
+  end
 end

test/factories/resumes.rb

@@ -4,32 +4,33 @@
 #
 # Table name: resumes
 #
-#  id                   :integer          not null, primary key
-#  about_myself         :text
-#  answers_count        :integer          default(0), not null
-#  awards_description   :text
-#  city                 :string
-#  contact              :string
-#  contact_email        :string
-#  contact_phone        :string
-#  contact_telegram     :string
-#  english_fluency      :string
-#  evaluated_ai         :boolean
-#  evaluated_ai_state   :string
-#  github_url           :string
-#  hexlet_url           :string
-#  impressions_count    :integer          default(0)
-#  locale               :string
-#  name                 :string           not null
-#  projects_description :text
-#  relocation           :string
-#  skills_description   :text
-#  state                :string
-#  summary              :text
-#  url                  :string
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
-#  user_id              :integer          not null
+#  id                     :integer          not null, primary key
+#  about_myself           :text
+#  answers_count          :integer          default(0), not null
+#  awards_description     :text
+#  city                   :string
+#  contact                :string
+#  contact_email          :string
+#  contact_phone          :string
+#  contact_telegram       :string
+#  english_fluency        :string
+#  evaluated_ai           :boolean
+#  evaluated_ai_state     :string
+#  github_url             :string
+#  hexlet_url             :string
+#  impressions_count      :integer          default(0)
+#  locale                 :string
+#  name                   :string           not null
+#  projects_description   :text
+#  relocation             :string
+#  skills_description     :text(250)
+#  skills_description_old :text
+#  state                  :string
+#  summary                :text
+#  url                    :string
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#  user_id                :integer          not null
 #
 # Indexes
 #
@@ -43,7 +44,7 @@
   factory :resume do
     name { Faker::Job.title }
     summary
-    skills_description
+    skills_description { Array.new(10) { Faker::Hobby.activity }.join("\n") }
     github_url
     contact
     contact_email { 'test@emil.com' }