Add roles field to NamespaceProject and assignedMembers field to NamespaceRole

Co-authored-by: Knerio <96529060+Knerio@users.noreply.github.com>

Author: Copilot

app/graphql/types/namespace_project_type.rb

@@ -12,6 +12,10 @@ class NamespaceProjectType < Types::BaseObject
 
     field :runtimes, Types::RuntimeType.connection_type, null: false, description: 'Runtimes assigned to this project'
 
+    field :roles, Types::NamespaceRoleType.connection_type, null: false,
+                                                            description: 'Roles assigned to this project',
+                                                            method: :assigned_roles
+
     field :namespace, Types::NamespaceType, null: false,
                                             description: 'The namespace where this project belongs to'
 

app/graphql/types/namespace_role_type.rb

@@ -15,6 +15,9 @@ class NamespaceRoleType < BaseObject
     field :assigned_projects, Types::NamespaceProjectType.connection_type,
           description: 'The projects this role is assigned to'
 
+    field :members, Types::NamespaceMemberType.connection_type,
+          description: 'The members this role is assigned to'
+
     expose_abilities %i[
       assign_role_abilities
       assign_role_projects
@@ -28,5 +31,9 @@ class NamespaceRoleType < BaseObject
     def abilities
       object.abilities.map(&:ability)
     end
+
+    def assigned_members
+      object.members
+    end
   end
 end

app/models/namespace_project.rb

@@ -11,7 +11,7 @@ class NamespaceProject < ApplicationRecord
                               inverse_of: :project
   has_many :assigned_roles, class_name: 'NamespaceRole', through: :role_assignments,
                             inverse_of: :assigned_projects,
-                            source: :project
+                            source: :role
   has_many :flows, class_name: 'Flow', inverse_of: :project
 
   validates :name, presence: true,

app/models/namespace_role.rb

@@ -10,7 +10,7 @@ class NamespaceRole < ApplicationRecord
   has_many :assigned_projects, class_name: 'NamespaceProject',
                                through: :project_assignments,
                                inverse_of: :assigned_roles,
-                               source: :role
+                               source: :project
 
   scope :applicable_to_project, lambda { |project|
     left_joins(:project_assignments)

docs/graphql/object/namespaceproject.md

@@ -15,6 +15,7 @@ Represents a namespace project
 | `name` | [`String!`](../scalar/string.md) | Name of the project |
 | `namespace` | [`Namespace!`](../object/namespace.md) | The namespace where this project belongs to |
 | `primaryRuntime` | [`Runtime`](../object/runtime.md) | The primary runtime for the project |
+| `roles` | [`NamespaceRoleConnection!`](../object/namespaceroleconnection.md) | Roles assigned to this project |
 | `runtimes` | [`RuntimeConnection!`](../object/runtimeconnection.md) | Runtimes assigned to this project |
 | `updatedAt` | [`Time!`](../scalar/time.md) | Time when this NamespaceProject was last updated |
 | `userAbilities` | [`NamespaceProjectUserAbilities!`](../object/namespaceprojectuserabilities.md) | Abilities for the current user on this NamespaceProject |

docs/graphql/object/namespacerole.md

@@ -12,6 +12,7 @@ Represents a namespace role.
 | `assignedProjects` | [`NamespaceProjectConnection`](../object/namespaceprojectconnection.md) | The projects this role is assigned to |
 | `createdAt` | [`Time!`](../scalar/time.md) | Time when this NamespaceRole was created |
 | `id` | [`NamespaceRoleID!`](../scalar/namespaceroleid.md) | Global ID of this NamespaceRole |
+| `members` | [`NamespaceMemberConnection`](../object/namespacememberconnection.md) | The members this role is assigned to |
 | `name` | [`String!`](../scalar/string.md) | The name of this role |
 | `namespace` | [`Namespace`](../object/namespace.md) | The namespace where this role belongs to |
 | `updatedAt` | [`Time!`](../scalar/time.md) | Time when this NamespaceRole was last updated |

spec/graphql/types/namespace_project_type_spec.rb

@@ -11,6 +11,7 @@
       namespace
       primary_runtime
       runtimes
+      roles
       flows
       flow
       user_abilities

spec/graphql/types/namespace_role_type_spec.rb

@@ -10,6 +10,7 @@
       name
       abilities
       assignedProjects
+      members
       userAbilities
       createdAt
       updatedAt

spec/models/namespace_project_spec.rb

@@ -19,7 +19,7 @@
     it do
       is_expected.to have_many(:assigned_roles).class_name('NamespaceRole')
                                                .through(:role_assignments)
-                                               .source(:project)
+                                               .source(:role)
                                                .inverse_of(:assigned_projects)
       is_expected.to have_many(:flows).class_name('Flow').inverse_of(:project)
     end

spec/models/namespace_role_spec.rb

@@ -14,7 +14,7 @@
     it do
       is_expected.to have_many(:assigned_projects).class_name('NamespaceProject')
                                                   .through(:project_assignments)
-                                                  .source(:role)
+                                                  .source(:project)
                                                   .inverse_of(:assigned_roles)
     end
   end