From 44ece088ef45576f13cf2cb43c8ee4868a481174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 20 Jan 2021 19:41:50 +0100 Subject: [PATCH 1/4] Add method to easily access a local target by code Similar to what we do in goals and targets. --- app/models/sdg/local_target.rb | 4 ++++ spec/models/sdg/local_target_spec.rb | 12 ++++++++++++ spec/system/sdg_management/relations_spec.rb | 9 ++++----- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/models/sdg/local_target.rb b/app/models/sdg/local_target.rb index a7328955c7d0..6711519d1f99 100644 --- a/app/models/sdg/local_target.rb +++ b/app/models/sdg/local_target.rb @@ -17,6 +17,10 @@ class SDG::LocalTarget < ApplicationRecord belongs_to :target + def self.[](code) + find_by!(code: code) + end + def <=>(any_target) if any_target.class == self.class [target, numeric_subcode] <=> [any_target.target, any_target.numeric_subcode] diff --git a/spec/models/sdg/local_target_spec.rb b/spec/models/sdg/local_target_spec.rb index 523baa396d1a..6bea1113974d 100644 --- a/spec/models/sdg/local_target_spec.rb +++ b/spec/models/sdg/local_target_spec.rb @@ -82,4 +82,16 @@ expect(local_target).to be < greater_target end end + + describe ".[]" do + it "finds existing local targets by code" do + create(:sdg_local_target, code: "1.1.1") + + expect(SDG::LocalTarget["1.1.1"].code).to eq "1.1.1" + end + + it "raises an exception for non-existing codes" do + expect { SDG::LocalTarget["1.1.99"] }.to raise_exception ActiveRecord::RecordNotFound + end + end end diff --git a/spec/system/sdg_management/relations_spec.rb b/spec/system/sdg_management/relations_spec.rb index 0fdea91a4482..6469df2770a3 100644 --- a/spec/system/sdg_management/relations_spec.rb +++ b/spec/system/sdg_management/relations_spec.rb @@ -168,11 +168,10 @@ end scenario "local target filter" do - schools = create(:sdg_local_target, code: "4.1.1") - teachers = create(:sdg_local_target, code: "4.1.2") - - create(:debate, title: "Rebuild local schools", sdg_local_targets: [schools]) - create(:debate, title: "Hire teachers", sdg_local_targets: [teachers]) + create(:sdg_local_target, code: "4.1.1") + create(:sdg_local_target, code: "4.1.2") + create(:debate, title: "Rebuild local schools", sdg_local_targets: [SDG::LocalTarget["4.1.1"]]) + create(:debate, title: "Hire teachers", sdg_local_targets: [SDG::LocalTarget["4.1.2"]]) visit sdg_management_debates_path select "4.1.1", from: "target_code" From 3a487e35ca59bff67747f54d5167469ddf6607bb Mon Sep 17 00:00:00 2001 From: taitus Date: Sat, 23 Jan 2021 13:45:36 +0100 Subject: [PATCH 2/4] Add relation between Goal and LocalTarget This is similar to what we do with investments, which belong to a heading but also belong to a budget. In our case, the reason is we've been asked to add local targets which belong to a goal but are not related to any existing target. Even though we're not implementing that case right now, we're adding the relation so we don't have to add data migrations in the future. --- app/models/sdg/goal.rb | 1 + app/models/sdg/local_target.rb | 10 ++++++++-- .../20210123100638_add_goals_to_local_targets.rb | 5 +++++ db/schema.rb | 4 +++- spec/factories/sdg.rb | 1 + spec/models/sdg/local_target_spec.rb | 11 ++++++++++- 6 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20210123100638_add_goals_to_local_targets.rb diff --git a/app/models/sdg/goal.rb b/app/models/sdg/goal.rb index c342dde35204..167dc2bf4ef5 100644 --- a/app/models/sdg/goal.rb +++ b/app/models/sdg/goal.rb @@ -4,6 +4,7 @@ class SDG::Goal < ApplicationRecord validates :code, presence: true, uniqueness: true, inclusion: { in: 1..17 } has_many :targets, dependent: :destroy + has_many :local_targets, dependent: :destroy def title I18n.t("sdg.goals.goal_#{code}.title") diff --git a/app/models/sdg/local_target.rb b/app/models/sdg/local_target.rb index 6711519d1f99..1bc9a9a0e5a1 100644 --- a/app/models/sdg/local_target.rb +++ b/app/models/sdg/local_target.rb @@ -2,8 +2,6 @@ class SDG::LocalTarget < ApplicationRecord include Comparable include SDG::Related - delegate :goal, to: :target - translates :title, touch: true translates :description, touch: true include Globalizable @@ -14,8 +12,12 @@ class SDG::LocalTarget < ApplicationRecord validates :code, presence: true, uniqueness: true, format: ->(local_target) { /\A#{local_target.target&.code}\.\d+/ } validates :target, presence: true + validates :goal, presence: true belongs_to :target + belongs_to :goal + + before_validation :set_related_goal def self.[](code) find_by!(code: code) @@ -40,4 +42,8 @@ def numeric_subcode def subcode code.split(".").last end + + def set_related_goal + self.goal ||= target&.goal + end end diff --git a/db/migrate/20210123100638_add_goals_to_local_targets.rb b/db/migrate/20210123100638_add_goals_to_local_targets.rb new file mode 100644 index 000000000000..b74846f3e685 --- /dev/null +++ b/db/migrate/20210123100638_add_goals_to_local_targets.rb @@ -0,0 +1,5 @@ +class AddGoalsToLocalTargets < ActiveRecord::Migration[5.2] + def change + add_reference :sdg_local_targets, :goal + end +end diff --git a/db/schema.rb b/db/schema.rb index c06db2e50367..25e23d4cbbd3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2021_01_07_125458) do +ActiveRecord::Schema.define(version: 2021_01_23_100638) do # These are extensions that must be enabled in order to support this database enable_extension "pg_trgm" @@ -1322,7 +1322,9 @@ t.string "code" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "goal_id" t.index ["code"], name: "index_sdg_local_targets_on_code", unique: true + t.index ["goal_id"], name: "index_sdg_local_targets_on_goal_id" t.index ["target_id"], name: "index_sdg_local_targets_on_target_id" end diff --git a/spec/factories/sdg.rb b/spec/factories/sdg.rb index 42073cf6782f..1f933eb0480b 100644 --- a/spec/factories/sdg.rb +++ b/spec/factories/sdg.rb @@ -13,6 +13,7 @@ sequence(:description) { |n| "Help for Local Target #{n}" } target { SDG::Target[code.rpartition(".").first] } + goal { SDG::Goal[code.split(".")[0]] } end factory :sdg_phase, class: "SDG::Phase" do diff --git a/spec/models/sdg/local_target_spec.rb b/spec/models/sdg/local_target_spec.rb index 6bea1113974d..ecccc2a3d1dc 100644 --- a/spec/models/sdg/local_target_spec.rb +++ b/spec/models/sdg/local_target_spec.rb @@ -18,7 +18,7 @@ end it "is not valid without a code" do - expect(build(:sdg_local_target, code: nil, target: SDG::Target[1.1])).not_to be_valid + expect(build(:sdg_local_target, code: nil, target: SDG::Target[1.1], goal: SDG::Goal[1])).not_to be_valid end it "is not valid when code does not include associated target code" do @@ -47,6 +47,15 @@ expect(build(:sdg_local_target, target: nil)).not_to be_valid end + describe "#set_related_goal" do + it "before validation set related goal" do + local_target = build(:sdg_local_target, code: "1.1.1", target: SDG::Target["1.1"], goal: nil) + + expect(local_target).to be_valid + expect(local_target.goal).to eq(SDG::Goal[1]) + end + end + describe "#goal" do it "returns the target goal" do local_target = create(:sdg_local_target, code: "1.1.1") From b6aeec6d86028810cd901846028559bee0436124 Mon Sep 17 00:00:00 2001 From: taitus Date: Sat, 23 Jan 2021 14:01:20 +0100 Subject: [PATCH 3/4] Allow add local targets to RelatedListSelectorComponent --- .../sdg/related_list_selector_component.rb | 3 +- app/models/concerns/sdg/relatable.rb | 13 +++--- app/models/sdg/goal.rb | 9 ++++ app/models/sdg/local_target.rb | 10 ++--- app/models/sdg/target.rb | 12 +++--- .../related_list_selector_component_spec.rb | 16 ++++++- spec/models/sdg/goal_spec.rb | 28 +++++++++++++ spec/models/sdg/local_target_spec.rb | 8 ++++ spec/models/sdg/relatable_spec.rb | 28 ++++++++++--- spec/models/sdg/target_spec.rb | 8 ++++ spec/system/sdg_management/relations_spec.rb | 42 ++++++++++++------- 11 files changed, 139 insertions(+), 38 deletions(-) diff --git a/app/components/sdg/related_list_selector_component.rb b/app/components/sdg/related_list_selector_component.rb index b183765ded5f..4f32adf5a464 100644 --- a/app/components/sdg/related_list_selector_component.rb +++ b/app/components/sdg/related_list_selector_component.rb @@ -15,7 +15,8 @@ def sdg_related_suggestions def goals_and_targets goals.map do |goal| - [goal, *goal.targets.sort] + global_and_local_targets = goal.targets + goal.local_targets + [goal, global_and_local_targets.sort] end.flatten end diff --git a/app/models/concerns/sdg/relatable.rb b/app/models/concerns/sdg/relatable.rb index 636feca73958..1b1b8d4a4956 100644 --- a/app/models/concerns/sdg/relatable.rb +++ b/app/models/concerns/sdg/relatable.rb @@ -74,19 +74,20 @@ def sdg_target_list end def sdg_related_list - sdg_goals.order(:code).map do |goal| - [goal, sdg_global_targets.where(goal: goal).sort] - end.flatten.map(&:code).join(", ") + related_sdgs.sort.map(&:code).join(", ") end def sdg_related_list=(codes) target_codes, goal_codes = codes.tr(" ", "").split(",").partition { |code| code.include?(".") } - targets = target_codes.map { |code| SDG::Target[code] } + local_targets_codes, global_targets_codes = target_codes.partition { |code| code.split(".")[2] } + global_targets = global_targets_codes.map { |code| SDG::Target[code] } + local_targets = local_targets_codes.map { |code| SDG::LocalTarget[code] } goals = goal_codes.map { |code| SDG::Goal[code] } transaction do - self.sdg_global_targets = targets - self.sdg_goals = (targets.map(&:goal) + goals).uniq + self.sdg_local_targets = local_targets + self.sdg_global_targets = global_targets + self.sdg_goals = (global_targets.map(&:goal) + local_targets.map(&:goal) + goals).uniq end end end diff --git a/app/models/sdg/goal.rb b/app/models/sdg/goal.rb index 167dc2bf4ef5..3e0b8700751f 100644 --- a/app/models/sdg/goal.rb +++ b/app/models/sdg/goal.rb @@ -1,4 +1,5 @@ class SDG::Goal < ApplicationRecord + include Comparable include SDG::Related validates :code, presence: true, uniqueness: true, inclusion: { in: 1..17 } @@ -18,6 +19,14 @@ def description I18n.t("sdg.goals.goal_#{code}.description") end + def <=>(goal_or_target) + if goal_or_target.class == self.class + code <=> goal_or_target.code + elsif goal_or_target.respond_to?(:goal) + [self, -1] <=> [goal_or_target.goal, 1] + end + end + def self.[](code) find_by!(code: code) end diff --git a/app/models/sdg/local_target.rb b/app/models/sdg/local_target.rb index 1bc9a9a0e5a1..6e07d48950f0 100644 --- a/app/models/sdg/local_target.rb +++ b/app/models/sdg/local_target.rb @@ -23,11 +23,11 @@ def self.[](code) find_by!(code: code) end - def <=>(any_target) - if any_target.class == self.class - [target, numeric_subcode] <=> [any_target.target, any_target.numeric_subcode] - elsif any_target.class == target.class - -1 * (any_target <=> self) + def <=>(goal_or_target) + if goal_or_target.class == self.class + [target, numeric_subcode] <=> [goal_or_target.target, goal_or_target.numeric_subcode] + elsif [target.class, goal.class].include?(goal_or_target.class) + -1 * (goal_or_target <=> self) end end diff --git a/app/models/sdg/target.rb b/app/models/sdg/target.rb index ee1e96a45f42..e20536e1b969 100644 --- a/app/models/sdg/target.rb +++ b/app/models/sdg/target.rb @@ -12,11 +12,13 @@ def title I18n.t("sdg.goals.goal_#{goal.code}.targets.target_#{code_key}.title") end - def <=>(any_target) - if any_target.class == self.class - [goal.code, numeric_subcode] <=> [any_target.goal.code, any_target.numeric_subcode] - elsif any_target.class.name == "SDG::LocalTarget" - [self, -1] <=> [any_target.target, 1] + def <=>(goal_or_target) + if goal_or_target.class == self.class + [goal.code, numeric_subcode] <=> [goal_or_target.goal.code, goal_or_target.numeric_subcode] + elsif goal_or_target.class == goal.class + -1 * (goal_or_target <=> self) + elsif goal_or_target.class.name == "SDG::LocalTarget" + [self, -1] <=> [goal_or_target.target, 1] end end diff --git a/spec/components/sdg/related_list_selector_component_spec.rb b/spec/components/sdg/related_list_selector_component_spec.rb index 7326400e01f1..38a2fe74ea47 100644 --- a/spec/components/sdg/related_list_selector_component_spec.rb +++ b/spec/components/sdg/related_list_selector_component_spec.rb @@ -36,10 +36,12 @@ describe "#goals_and_targets" do it "return all goals and target with order" do + create(:sdg_local_target, code: "1.1.1") goals_and_targets = component.goals_and_targets expect(goals_and_targets.first).to eq SDG::Goal[1] expect(goals_and_targets.second).to eq SDG::Target[1.1] + expect(goals_and_targets.third).to eq SDG::LocalTarget["1.1.1"] expect(goals_and_targets.last).to eq SDG::Target[17.19] end end @@ -56,7 +58,7 @@ }) end - it "return suggestion tag for target" do + it "returns suggestion tag for global target" do suggestion = component.suggestion_tag_for(SDG::Target[1.1]) expect(suggestion).to eq({ @@ -66,5 +68,17 @@ value: "1.1" }) end + + it "returns suggestion tag for local target" do + create(:sdg_local_target, code: "1.1.1", title: "By 2030, eradicate extreme custom text") + suggestion = component.suggestion_tag_for(SDG::LocalTarget["1.1.1"]) + + expect(suggestion).to eq({ + tag: "1.1.1. By 2030 eradicate extreme custom text", + display_text: "1.1.1", + title: "By 2030, eradicate extreme custom text", + value: "1.1.1" + }) + end end end diff --git a/spec/models/sdg/goal_spec.rb b/spec/models/sdg/goal_spec.rb index 94d20710bf40..79a6fd276a0d 100644 --- a/spec/models/sdg/goal_spec.rb +++ b/spec/models/sdg/goal_spec.rb @@ -21,6 +21,34 @@ end end + describe "#<=>" do + let(:goal) { SDG::Goal[10] } + + it "can be compared against goals" do + lesser_goal = SDG::Goal[9] + greater_goal = SDG::Goal[11] + + expect(goal).to be > lesser_goal + expect(goal).to be < greater_goal + end + + it "can be compared against global targets" do + lesser_target = build(:sdg_target, code: "9.A", goal: SDG::Goal[9]) + greater_target = build(:sdg_target, code: "10.1", goal: SDG::Goal[1]) + + expect(goal).to be > lesser_target + expect(goal).to be < greater_target + end + + it "can be compared against global targets" do + lesser_local_target = build(:sdg_local_target, code: "9.B.12") + greater_local_target = build(:sdg_target, code: "11.1.4") + + expect(goal).to be > lesser_local_target + expect(goal).to be < greater_local_target + end + end + describe ".[]" do it "finds existing goals by code" do expect(SDG::Goal[1].code).to be 1 diff --git a/spec/models/sdg/local_target_spec.rb b/spec/models/sdg/local_target_spec.rb index ecccc2a3d1dc..0e7121ef633a 100644 --- a/spec/models/sdg/local_target_spec.rb +++ b/spec/models/sdg/local_target_spec.rb @@ -90,6 +90,14 @@ expect(local_target).to be > lesser_target expect(local_target).to be < greater_target end + + it "can be compared against goals" do + lesser_goal = build(:sdg_goal, code: "10") + greater_goal = build(:sdg_goal, code: "11") + + expect(local_target).to be > lesser_goal + expect(local_target).to be < greater_goal + end end describe ".[]" do diff --git a/spec/models/sdg/relatable_spec.rb b/spec/models/sdg/relatable_spec.rb index 4dd6aea511f4..e3bfc01fad78 100644 --- a/spec/models/sdg/relatable_spec.rb +++ b/spec/models/sdg/relatable_spec.rb @@ -102,9 +102,10 @@ describe "#sdg_related_list" do it "orders related list by code" do relatable.sdg_goals = [SDG::Goal[1], SDG::Goal[3], SDG::Goal[2]] - relatable.sdg_targets = [SDG::Target[2.2], SDG::Target[1.2], SDG::Target[2.1]] + local_targets = %w[2.2.2 2.2.1 3.1.1].map { |code| create(:sdg_local_target, code: code) } + relatable.sdg_targets = [SDG::Target[2.2], SDG::Target[1.2], SDG::Target[2.1]] + local_targets - expect(relatable.sdg_related_list).to eq "1, 1.2, 2, 2.1, 2.2, 3" + expect(relatable.sdg_related_list).to eq "1, 1.2, 2, 2.1, 2.2, 2.2.1, 2.2.2, 3, 3.1.1" end end @@ -133,6 +134,13 @@ expect(relatable.reload.sdg_targets).to match_array [SDG::Target[1.1]] end + it "assigns a single local target" do + relatable.sdg_related_list = local_target.code + + expect(relatable.reload.sdg_goals).to match_array [local_target.goal] + expect(relatable.reload.sdg_local_targets).to match_array [local_target] + end + it "assigns multiple targets" do relatable.sdg_related_list = "1.1,2.3" @@ -146,6 +154,13 @@ expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1], SDG::Goal[2], SDG::Goal[3]] end + it "assigns a multiple local targets" do + relatable.sdg_related_list = "#{local_target.code}, #{another_local_target.code}" + + expect(relatable.reload.sdg_goals).to match_array [local_target.goal, another_local_target.goal] + expect(relatable.reload.sdg_local_targets).to match_array [local_target, another_local_target] + end + it "ignores trailing spaces and spaces between commas" do relatable.sdg_related_list = " 1.1, 2.3 " @@ -153,11 +168,12 @@ expect(relatable.reload.sdg_targets).to match_array [SDG::Target[1.1], SDG::Target[2.3]] end - it "assigns goals and targets" do - relatable.sdg_related_list = "1.1,3,4,4.1" + it "assigns goals, targets and local_targets" do + relatable.sdg_related_list = "1.1,3,4,4.1,#{another_local_target.code}" - expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1], SDG::Goal[3], SDG::Goal[4]] - expect(relatable.reload.sdg_targets).to match_array [SDG::Target[1.1], SDG::Target[4.1]] + expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1], another_local_target.goal, SDG::Goal[3], SDG::Goal[4]] + expect(relatable.reload.sdg_global_targets).to match_array [SDG::Target[1.1], SDG::Target[4.1]] + expect(relatable.reload.sdg_local_targets).to match_array [another_local_target] end end diff --git a/spec/models/sdg/target_spec.rb b/spec/models/sdg/target_spec.rb index d227d9954582..d9dbb669cc3d 100644 --- a/spec/models/sdg/target_spec.rb +++ b/spec/models/sdg/target_spec.rb @@ -87,6 +87,14 @@ expect(target).to be < local_target end end + + it "can be compared against goals" do + lesser_goal = build(:sdg_goal, code: "9") + greater_goal = build(:sdg_goal, code: "11") + + expect(target).to be > lesser_goal + expect(target).to be < greater_goal + end end describe ".[]" do diff --git a/spec/system/sdg_management/relations_spec.rb b/spec/system/sdg_management/relations_spec.rb index 6469df2770a3..9221e01c1247 100644 --- a/spec/system/sdg_management/relations_spec.rb +++ b/spec/system/sdg_management/relations_spec.rb @@ -204,14 +204,16 @@ end describe "Edit" do - scenario "allows adding the goals and targets and marks the resource as reviewed" do + scenario "allows adding the goals, global targets and local targets and marks the resource as reviewed" do process = create(:legislation_process, title: "SDG process") - process.sdg_goals = [SDG::Goal[3]] - process.sdg_targets = [SDG::Target[3.3]] + create(:sdg_local_target, code: "1.1.1") + create(:sdg_local_target, code: "3.3.3") + process.sdg_goals = [SDG::Goal[3], SDG::Goal[4]] + process.sdg_targets = [SDG::Target[3.3], SDG::LocalTarget["3.3.3"]] visit sdg_management_edit_legislation_process_path(process) - find(:css, ".sdg-related-list-selector-input").set("1.2, 2,") + find(:css, ".sdg-related-list-selector-input").set("1.2, 2, 1.1.1, ") click_button "Update Process" @@ -220,20 +222,22 @@ click_link "Marked as reviewed" within("tr", text: "SDG process") do - expect(page).to have_css "td", exact_text: "1.2, 3.3" - expect(page).to have_css "td", exact_text: "1, 2, 3" + expect(page).to have_css "td", exact_text: "1.1.1, 1.2, 3.3, 3.3.3" + expect(page).to have_css "td", exact_text: "1, 2, 3, 4" end end - scenario "allows removing the goals and targets" do + scenario "allows removing the goals, global target and local_targets" do process = create(:legislation_process, title: "SDG process") - process.sdg_goals = [SDG::Goal[2], SDG::Goal[3]] - process.sdg_targets = [SDG::Target[2.1], SDG::Target[3.3]] + create(:sdg_local_target, code: "1.1.1") + process.sdg_goals = [SDG::Goal[1], SDG::Goal[2], SDG::Goal[3]] + process.sdg_targets = [SDG::Target[2.1], SDG::Target[3.3], SDG::LocalTarget["1.1.1"]] visit sdg_management_edit_legislation_process_path(process) remove_sdg_goal_or_target_tag(2) remove_sdg_goal_or_target_tag(3.3) + remove_sdg_goal_or_target_tag("1.1.1") click_button "Update Process" @@ -242,14 +246,13 @@ click_link "Marked as reviewed" within("tr", text: "SDG process") do - expect(page).to have_css "td", exact_text: "2, 3" + expect(page).to have_css "td", exact_text: "1, 2, 3" expect(page).to have_css "td", exact_text: "2.1" end end scenario "does not show the review notice when resource was already reviewed" do debate = create(:sdg_review, relatable: create(:debate, title: "SDG debate")).relatable - debate.sdg_targets = [SDG::Target[3.3]] visit sdg_management_edit_debate_path(debate, filter: "sdg_reviewed") find(:css, ".sdg-related-list-selector-input").set("1.2, 2.1,") @@ -265,8 +268,9 @@ end end - scenario "allows adding the goals and targets with autocomplete" do + scenario "allows adding the goals, global targets and local targets with autocomplete" do process = create(:legislation_process, title: "SDG process") + create(:sdg_local_target, code: "1.1.1") visit sdg_management_edit_legislation_process_path(process) fill_in "Sustainable Development Goals and Targets", with: "3" @@ -279,12 +283,17 @@ within(".amsify-suggestags-input-area") { expect(page).to have_content "1.1" } + fill_in "Sustainable Development Goals and Targets", with: "1.1.1" + within(".amsify-list") { find(:css, "[data-val='1.1.1']").click } + + within(".amsify-suggestags-input-area") { expect(page).to have_content "1.1.1" } + click_button "Update Process" click_link "Marked as reviewed" within("tr", text: "SDG process") do expect(page).to have_css "td", exact_text: "1, 3" - expect(page).to have_css "td", exact_text: "1.1" + expect(page).to have_css "td", exact_text: "1.1, 1.1.1" end end @@ -338,8 +347,9 @@ scenario "when remove a last tag related to a Goal, the icon will not be checked" do process = create(:legislation_process, title: "SDG process") + create(:sdg_local_target, code: "1.1.1") process.sdg_goals = [SDG::Goal[1]] - process.sdg_targets = [SDG::Target[1.1]] + process.sdg_targets = [SDG::Target[1.1], SDG::LocalTarget["1.1.1"]] visit sdg_management_edit_legislation_process_path(process) remove_sdg_goal_or_target_tag(1) @@ -348,6 +358,10 @@ remove_sdg_goal_or_target_tag(1.1) + expect(find("li[data-code='1']")["aria-checked"]).to eq "true" + + remove_sdg_goal_or_target_tag("1.1.1") + expect(find("li[data-code='1']")["aria-checked"]).to eq "false" end end From ecbf38723a93f568344c2f2915b48eee84154ed8 Mon Sep 17 00:00:00 2001 From: taitus Date: Tue, 26 Jan 2021 18:07:40 +0100 Subject: [PATCH 4/4] Rename sdg_related_list to related_sdg_list To maintain consistency with the current names in the database with fields: :related_sdg_type and :related_sdg_id --- .../related_list_selector_component.html.erb | 4 ++-- .../admin/legislation/processes_controller.rb | 2 +- .../admin/poll/polls_controller.rb | 2 +- .../budgets/investments_controller.rb | 2 +- app/controllers/debates_controller.rb | 2 +- app/controllers/proposals_controller.rb | 2 +- .../sdg_management/relations_controller.rb | 2 +- app/models/concerns/sdg/relatable.rb | 4 ++-- .../related_list_selector_component_spec.rb | 2 +- spec/models/sdg/relatable_spec.rb | 22 +++++++++---------- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/components/sdg/related_list_selector_component.html.erb b/app/components/sdg/related_list_selector_component.html.erb index 21902e42548b..3697bfa29d11 100644 --- a/app/components/sdg/related_list_selector_component.html.erb +++ b/app/components/sdg/related_list_selector_component.html.erb @@ -1,6 +1,6 @@
- <%= f.label :sdg_related_list %> + <%= f.label :related_sdg_list %>
    "> <% goals.each do |goal| %> @@ -10,7 +10,7 @@ <% end %>
- <%= f.text_field :sdg_related_list, + <%= f.text_field :related_sdg_list, class: "input", label: false, placeholder: t("sdg.related_list_selector.placeholder"), diff --git a/app/controllers/admin/legislation/processes_controller.rb b/app/controllers/admin/legislation/processes_controller.rb index 46144207dea2..39d636d577b9 100644 --- a/app/controllers/admin/legislation/processes_controller.rb +++ b/app/controllers/admin/legislation/processes_controller.rb @@ -69,7 +69,7 @@ def allowed_params :custom_list, :background_color, :font_color, - :sdg_related_list, + :related_sdg_list, translation_params(::Legislation::Process), documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], image_attributes: image_attributes diff --git a/app/controllers/admin/poll/polls_controller.rb b/app/controllers/admin/poll/polls_controller.rb index 8bf2b75f7754..b9e33ae6026b 100644 --- a/app/controllers/admin/poll/polls_controller.rb +++ b/app/controllers/admin/poll/polls_controller.rb @@ -76,7 +76,7 @@ def load_geozones end def poll_params - attributes = [:name, :starts_at, :ends_at, :geozone_restricted, :budget_id, :sdg_related_list, + attributes = [:name, :starts_at, :ends_at, :geozone_restricted, :budget_id, :related_sdg_list, geozone_ids: [], image_attributes: image_attributes] params.require(:poll).permit(*attributes, *report_attributes, translation_params(Poll)) diff --git a/app/controllers/budgets/investments_controller.rb b/app/controllers/budgets/investments_controller.rb index a876af8f617f..19e7655db459 100644 --- a/app/controllers/budgets/investments_controller.rb +++ b/app/controllers/budgets/investments_controller.rb @@ -133,7 +133,7 @@ def load_investment_votes(investments) def investment_params attributes = [:heading_id, :tag_list, :organization_name, :location, - :terms_of_service, :skip_map, :sdg_related_list, + :terms_of_service, :skip_map, :related_sdg_list, image_attributes: image_attributes, documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], map_location_attributes: [:latitude, :longitude, :zoom]] diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb index 89ef3d725ad7..a71a5be7bae5 100644 --- a/app/controllers/debates_controller.rb +++ b/app/controllers/debates_controller.rb @@ -55,7 +55,7 @@ def disable_recommendations private def debate_params - attributes = [:tag_list, :terms_of_service, :sdg_related_list] + attributes = [:tag_list, :terms_of_service, :related_sdg_list] params.require(:debate).permit(attributes, translation_params(Debate)) end diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 544a939cc9d1..8b28e1f79804 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -99,7 +99,7 @@ def publish def proposal_params attributes = [:video_url, :responsible_name, :tag_list, :terms_of_service, - :geozone_id, :skip_map, :sdg_related_list, + :geozone_id, :skip_map, :related_sdg_list, image_attributes: image_attributes, documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], diff --git a/app/controllers/sdg_management/relations_controller.rb b/app/controllers/sdg_management/relations_controller.rb index b9aab6c23ebd..ae6c9790e7fb 100644 --- a/app/controllers/sdg_management/relations_controller.rb +++ b/app/controllers/sdg_management/relations_controller.rb @@ -21,7 +21,7 @@ def edit end def update - @record.sdg_related_list = params[@record.class.table_name.singularize][:sdg_related_list] + @record.related_sdg_list = params[@record.class.table_name.singularize][:related_sdg_list] redirect_to({ action: :index }, notice: update_notice) end diff --git a/app/models/concerns/sdg/relatable.rb b/app/models/concerns/sdg/relatable.rb index 1b1b8d4a4956..63ce917ef443 100644 --- a/app/models/concerns/sdg/relatable.rb +++ b/app/models/concerns/sdg/relatable.rb @@ -73,11 +73,11 @@ def sdg_target_list sdg_targets.sort.map(&:code).join(", ") end - def sdg_related_list + def related_sdg_list related_sdgs.sort.map(&:code).join(", ") end - def sdg_related_list=(codes) + def related_sdg_list=(codes) target_codes, goal_codes = codes.tr(" ", "").split(",").partition { |code| code.include?(".") } local_targets_codes, global_targets_codes = target_codes.partition { |code| code.split(".")[2] } global_targets = global_targets_codes.map { |code| SDG::Target[code] } diff --git a/spec/components/sdg/related_list_selector_component_spec.rb b/spec/components/sdg/related_list_selector_component_spec.rb index 38a2fe74ea47..266b7146a6d5 100644 --- a/spec/components/sdg/related_list_selector_component_spec.rb +++ b/spec/components/sdg/related_list_selector_component_spec.rb @@ -26,7 +26,7 @@ expect(page).not_to have_css ".sdg-related-list-selector" end - it "renders sdg_related_list field" do + it "renders related_sdg_list field" do render_inline component expect(page).to have_css ".sdg-related-list-selector .input" diff --git a/spec/models/sdg/relatable_spec.rb b/spec/models/sdg/relatable_spec.rb index e3bfc01fad78..27e27093e211 100644 --- a/spec/models/sdg/relatable_spec.rb +++ b/spec/models/sdg/relatable_spec.rb @@ -99,13 +99,13 @@ end end - describe "#sdg_related_list" do + describe "#related_sdg_list" do it "orders related list by code" do relatable.sdg_goals = [SDG::Goal[1], SDG::Goal[3], SDG::Goal[2]] local_targets = %w[2.2.2 2.2.1 3.1.1].map { |code| create(:sdg_local_target, code: code) } relatable.sdg_targets = [SDG::Target[2.2], SDG::Target[1.2], SDG::Target[2.1]] + local_targets - expect(relatable.sdg_related_list).to eq "1, 1.2, 2, 2.1, 2.2, 2.2.1, 2.2.2, 3, 3.1.1" + expect(relatable.related_sdg_list).to eq "1, 1.2, 2, 2.1, 2.2, 2.2.1, 2.2.2, 3, 3.1.1" end end @@ -120,56 +120,56 @@ end end - describe "#sdg_related_list=" do + describe "#related_sdg_list=" do it "assigns a single goal" do - relatable.sdg_related_list = "1" + relatable.related_sdg_list = "1" expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1]] end it "assigns a single target" do - relatable.sdg_related_list = "1.1" + relatable.related_sdg_list = "1.1" expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1]] expect(relatable.reload.sdg_targets).to match_array [SDG::Target[1.1]] end it "assigns a single local target" do - relatable.sdg_related_list = local_target.code + relatable.related_sdg_list = local_target.code expect(relatable.reload.sdg_goals).to match_array [local_target.goal] expect(relatable.reload.sdg_local_targets).to match_array [local_target] end it "assigns multiple targets" do - relatable.sdg_related_list = "1.1,2.3" + relatable.related_sdg_list = "1.1,2.3" expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1], SDG::Goal[2]] expect(relatable.reload.sdg_targets).to match_array [SDG::Target[1.1], SDG::Target[2.3]] end it "assigns multiple goals" do - relatable.sdg_related_list = "3,2,1" + relatable.related_sdg_list = "3,2,1" expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1], SDG::Goal[2], SDG::Goal[3]] end it "assigns a multiple local targets" do - relatable.sdg_related_list = "#{local_target.code}, #{another_local_target.code}" + relatable.related_sdg_list = "#{local_target.code}, #{another_local_target.code}" expect(relatable.reload.sdg_goals).to match_array [local_target.goal, another_local_target.goal] expect(relatable.reload.sdg_local_targets).to match_array [local_target, another_local_target] end it "ignores trailing spaces and spaces between commas" do - relatable.sdg_related_list = " 1.1, 2.3 " + relatable.related_sdg_list = " 1.1, 2.3 " expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1], SDG::Goal[2]] expect(relatable.reload.sdg_targets).to match_array [SDG::Target[1.1], SDG::Target[2.3]] end it "assigns goals, targets and local_targets" do - relatable.sdg_related_list = "1.1,3,4,4.1,#{another_local_target.code}" + relatable.related_sdg_list = "1.1,3,4,4.1,#{another_local_target.code}" expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1], another_local_target.goal, SDG::Goal[3], SDG::Goal[4]] expect(relatable.reload.sdg_global_targets).to match_array [SDG::Target[1.1], SDG::Target[4.1]]