Skip to content

Allow to post existing relationships #1167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 6, 2018
Merged

Allow to post existing relationships #1167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fca75ec
Remove checking for existing relationships
ArneZsng Jul 5, 2018
24c7249
Skip adding relationship if it already exists
ArneZsng Jul 5, 2018
5f4c1a2
Adapt test for adding existing relationships
ArneZsng Jul 5, 2018
60bdd2e
Remove now superfluous error
ArneZsng Jul 5, 2018
a51ea62
Remove now superfluous translations
ArneZsng Jul 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions lib/jsonapi/exceptions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,26 +141,6 @@ def errors
end
end


class HasManyRelationExists < Error
attr_accessor :id

def initialize(id, error_object_overrides = {})
@id = id
super(error_object_overrides)
end

def errors
[create_error_object(code: JSONAPI::RELATION_EXISTS,
status: :bad_request,
title: I18n.translate('jsonapi-resources.exceptions.has_many_relation.title',
default: 'Relation exists'),
detail: I18n.translate('jsonapi-resources.exceptions.has_many_relation.detail',
default: "The relation to #{id} already exists.",
id: id))]
end
end

class BadRequest < Error
def initialize(exception, error_object_overrides = {})
@exception = exception
Expand Down
11 changes: 3 additions & 8 deletions lib/jsonapi/resource.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,14 +238,7 @@ def reflect_relationship?(relationship, options)

def _create_to_many_links(relationship_type, relationship_key_values, options)
relationship = self.class._relationships[relationship_type]

# check if relationship_key_values are already members of this relationship
relation_name = relationship.relation_name(context: @context)
existing_relations = @model.public_send(relation_name).where(relationship.primary_key => relationship_key_values)
if existing_relations.count > 0
# todo: obscure id so not to leak info
fail JSONAPI::Exceptions::HasManyRelationExists.new(existing_relations.first.id)
end

if options[:reflected_source]
@model.public_send(relation_name) << options[:reflected_source]._model
Expand Down Expand Up @@ -273,7 +266,9 @@ def _create_to_many_links(relationship_type, relationship_key_values, options)
end
@reload_needed = true
else
@model.public_send(relation_name) << related_resource._model
unless @model.public_send(relation_name).include?(related_resource._model)
@model.public_send(relation_name) << related_resource._model
end
end
end

Expand Down
3 changes: 0 additions & 3 deletions locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ en:
unsupported_media_type:
title: 'Unsupported media type'
detail: "All requests that create or update must use the '%{needed_media_type}' Content-Type. This request specified '%{media_type}.'"
has_many_relation:
title: 'Relation exists'
detail: "The relation to %{id} already exists."
to_many_set_replacement_forbidden:
title: 'Complete replacement forbidden'
detail: 'Complete replacement forbidden for this relationship'
Expand Down
5 changes: 3 additions & 2 deletions test/controllers/controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,8 +1508,9 @@ def test_create_relationship_to_many_join_table_record_exists

post :create_relationship, params: {post_id: 3, relationship: 'tags', data: [{type: 'tags', id: 502}, {type: 'tags', id: 505}]}

assert_response :bad_request
assert_match /The relation to 502 already exists./, response.body
assert_response :no_content
post_object.reload
assert_equal [502,503,505], post_object.tag_ids
end

def test_update_relationship_to_many_missing_tags
Expand Down