Skip to content

Updated handling of multiple relationships between same records #167

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

Draft
ajolipa wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Draft

Updated handling of multiple relationships between same records #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/controllers/core_data_connector/public/v1/public_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def base_query
query = super

if nested_resource? && current_record.present?
query = query.joins(build_base_sql).order('record.order')
query = query.joins(build_base_sql).distinct
elsif nested_resource?
query = item_class.none
elsif params[:id].present?
Expand Down
6 changes: 3 additions & 3 deletions app/serializers/concerns/core_data_connector/public/v1/typeable_serializer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module TypeableSerializer
extend ActiveSupport::Concern

included do
index_attributes(:project_model_relationship_uuid) { |item| relationship_uuid(item) }
index_attributes(:project_model_relationship_uuid) { |item| relationship_uuid(item).length > 1 ? relationship_uuid(item) : relationship_uuid(item)[0] }
index_attributes(:project_model_relationship_inverse) { |item| relationship_inverse(item) }

protected
Expand All @@ -16,9 +16,9 @@ def self.relationship_inverse(item)

def self.relationship_uuid(item)
if !item.relationships.empty?
item.relationships.map{ |r| r.project_model_relationship.uuid }.first
item.relationships.map{ |r| r.project_model_relationship.uuid }.uniq
elsif !item.related_relationships.empty?
item.related_relationships.map { |r| r.project_model_relationship.uuid }.first
item.related_relationships.map { |r| r.project_model_relationship.uuid }.uniq
end
end
end
Expand Down