Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions lib/hq/graphql.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ def self.excluded_inputs
end

def self.lookup_resource(klass)
if klass.to_s == "Organization"
klass = HasHelpers::Organization
elsif klass.to_s == "User"
klass = HasHelpers::User
end
[klass, klass.base_class, klass.superclass].lazy.map do |k|
config.resource_lookup.call(k) || resources.detect { |r| r.model_klass == k }
end.reject(&:nil?).first
Expand Down
2 changes: 1 addition & 1 deletion spec/internal/app/models/advisor.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class Advisor < ActiveRecord::Base
belongs_to :organization
belongs_to :organization, class_name: "::HasHelpers::Organization"

def hydrate
end
Expand Down
9 changes: 5 additions & 4 deletions spec/internal/app/models/manager.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
class Manager < ::ActiveRecord::Base
belongs_to :organization

has_many :active_users, -> { where(inactive: [nil, false]) }, class_name: "User"
has_many :users, inverse_of: :organization
belongs_to :organization, class_name: "::HasHelpers::Organization"
has_many :user_organizations, class_name: "::HasHelpers::UserOrganization"
has_many :active_users, -> { where(inactive: [nil, false]) }, class_name: "::HasHelpers::User"
# has_many :users, inverse_of: :organization
has_many :users, class_name: "::HasHelpers::User", through: :user_organizations
has_many :advisors, through: :users
has_many :not_joe, -> { where.not(name: "Joe" ) }, through: :users, source: :advisor
end
2 changes: 2 additions & 0 deletions spec/internal/app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ class User < ::ActiveRecord::Base
belongs_to :advisor, optional: true
belongs_to :manager, optional: true
belongs_to :organization
# has_many :user_organizations, dependent: :destroy, class_name: "::HasHelpers::UserOrganization", inverse_of: :user
# has_many :organizations, class_name: "::HasHelpers::Organization", through: :user_organizations, inverse_of: :users

def hydrate
end
Expand Down
2 changes: 2 additions & 0 deletions spec/internal/app/models/user_organization.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class UserOrganization < ::ActiveRecord::Base
end
2 changes: 1 addition & 1 deletion spec/lib/graphql/object_association_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

scope do |name: nil|
if name
User.where(name: name)
::HasHelpers::User.where(name: name)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/graphql/paginated_association_loader_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def load(association, **options)
user3.update(advisor: advisor3)

# Create dummy data to verify data is properly filtered
other_user = ::User.find_by(manager: manager2)
other_user = ::HasHelpers::User.find_by(manager: manager2)
2.times do
advisor = ::FactoryBot.create(:advisor, organization: organization)
other_user.update(advisor: advisor)
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/graphql/types_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
end

it "raises an exception for unknown types" do
expect { described_class[Organization] }.to raise_error(described_class::Error)
expect { described_class[::HasHelpers::Organization] }.to raise_error(described_class::Error)
end

it "works with sti" do
Expand Down