OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
properly set type and ID in custom setter
Klaus Zanders3e26bb445cfb
diff --git a/modules/costs/lib/api/v3/time_entries/entity_representer_factory.rb b/modules/costs/lib/api/v3/time_entries/entity_representer_factory.rbindex f11cffc19eb..fa753c9c13e 100644--- a/modules/costs/lib/api/v3/time_entries/entity_representer_factory.rb+++ b/modules/costs/lib/api/v3/time_entries/entity_representer_factory.rb@@ -92,15 +92,20 @@ module API}end- def create_setter_lambda(name, property_name: name, namespaces: %i(work_packages meetings))+ def create_setter_lambda(name)->(fragment:, **) {- ::API::Decorators::LinkObject- .new(represented,- property_name:,- namespace: namespaces,- getter: :"#{name}_id",- setter: :"#{name}_id=")- .from_hash(fragment)+ result = ::API::Utilities::ResourceLinkParser.parse(fragment["href"])++ case result[:namespace]+ when "meetings"+ represented.public_send("#{name}_id=", result[:id])+ represented.public_send("#{name}_type=", "Meeting")+ when "work_packages"+ represented.public_send("#{name}_id=", result[:id])+ represented.public_send("#{name}_type=", "WorkPackage")+ else+ # TODO: Handle error if unexpected object+ end}endenddiff --git a/modules/costs/spec/lib/api/v3/time_entries/time_entry_representer_parsing_spec.rb b/modules/costs/spec/lib/api/v3/time_entries/time_entry_representer_parsing_spec.rbindex feabb300391..b7a77f0df06 100644--- a/modules/costs/spec/lib/api/v3/time_entries/time_entry_representer_parsing_spec.rb+++ b/modules/costs/spec/lib/api/v3/time_entries/time_entry_representer_parsing_spec.rb@@ -34,7 +34,7 @@ RSpec.describe API::V3::TimeEntries::TimeEntryRepresenter, "parsing" dolet(:time_entry) dobuild_stubbed(:time_entry,comments: "blubs",- spent_on: Date.today - 3.days,+ spent_on: Date.current - 3.days,created_at: DateTime.now - 6.hours,updated_at: DateTime.now - 3.hours,activity:,@@ -43,8 +43,9 @@ RSpec.describe API::V3::TimeEntries::TimeEntryRepresenter, "parsing" doendlet(:project) { build_stubbed(:project) }let(:project2) { build_stubbed(:project) }- let(:work_package) { time_entry.work_package }- let(:work_package2) { build_stubbed(:work_package) }+ let(:work_package) { time_entry.entity }+ let(:work_package2) { build_stubbed(:work_package, project: project2) }+ let(:meeting) { build_stubbed(:meeting, project: project2) }let(:activity) { build_stubbed(:time_entry_activity) }let(:activity2) { build_stubbed(:time_entry_activity) }let(:user) { build_stubbed(:user) }@@ -59,6 +60,10 @@ RSpec.describe API::V3::TimeEntries::TimeEntryRepresenter, "parsing" dobuild_stubbed(:time_entry_custom_field)end+ let(:entity_link) do+ api_v3_paths.work_package(work_package2.id)+ end+let(:hash) do{"_links" => {@@ -68,9 +73,8 @@ RSpec.describe API::V3::TimeEntries::TimeEntryRepresenter, "parsing" do"activity" => {"href" => api_v3_paths.time_entries_activity(activity2.id)},- "workPackage" => {- "href" => api_v3_paths.work_package(work_package2.id)-+ "entity" => {+ "href" => entity_link},user_custom_field.attribute_name(:camel_case) => {"href" => api_v3_paths.user(user2.id)@@ -111,11 +115,11 @@ RSpec.describe API::V3::TimeEntries::TimeEntryRepresenter, "parsing" doendend- context "workPackage" do+ context "entity" doit "updates the work_package" dotime_entry = representer.from_hash(hash)- expect(time_entry.work_package_id)- .to eql(work_package2.id)+ expect(time_entry.entity_id).to eql(work_package2.id)+ expect(time_entry.entity_type).to eql("WorkPackage")endend@@ -127,6 +131,20 @@ RSpec.describe API::V3::TimeEntries::TimeEntryRepresenter, "parsing" do.to eql(user2.id.to_s)endend++ context "assigning a meeting as entity" do+ let(:entity_link) do+ api_v3_paths.meeting(meeting.id)+ end++ context "entity" do+ it "updates the meeting" do+ time_entry = representer.from_hash(hash)+ expect(time_entry.entity_id).to eql(meeting.id)+ expect(time_entry.entity_type).to eql("Meeting")+ end+ end+ endenddescribe "properties" do