scope mutations belong to users under Users module

app/graphql/mutations/users/delete_user.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Mutations
+  module Users
+    # Deletes an user as an admin.
+    class DeleteUser < Mutations::BaseMutation
+      description 'Deletes an user as an admin.'
+      argument :id, ID, required: true
+      payload_type Boolean
+
+      def resolve(id:)
+        user = ::User.accessible_by(current_ability).find_by(id: id)
+        if user.nil?
+          raise ActiveRecord::RecordNotFound, I18n.t('errors.messages.resource_not_found', resource: ::User.model_name.human)
+        end
+
+        current_ability.authorize! :destroy, user
+        return true if user.destroy!
+
+        false
+      end
+    end
+  end
+end

app/graphql/mutations/users/update_user.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Mutations
+  module Users
+    # Updates an existing user as an admin.
+    class UpdateUser < Mutations::BaseMutation
+      description 'Updates an existing user as an admin.'
+      argument :id, ID, required: true
+      argument :attributes, Types::Users::UserInputType, required: true
+      payload_type Types::Users::UserType
+
+      def resolve(id:, attributes:)
+        user = ::User.accessible_by(current_ability).find_by(id: id)
+        raise ActiveRecord::RecordNotFound, I18n.t('errors.messages.resource_not_found', resource: ::User.model_name.human) if user.nil?
+
+        user.attributes = attributes.to_h
+        current_ability.authorize! :update, user
+        return user if user.save!
+      end
+    end
+  end
+end

app/graphql/mutations/users/update_user_role.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Mutations
+  module Users
+    # Updates the role for an user as an admin.
+    class UpdateUserRole < Mutations::BaseMutation
+      description 'Updates the role for an user as an admin.'
+      argument :id, ID, required: true
+      argument :role, String, required: true, description: '"user" or "admin"'
+      payload_type Boolean
+
+      def resolve(id:, role:)
+        user = ::User.accessible_by(current_ability).find_by(id: id)
+        if user.nil?
+          raise ActiveRecord::RecordNotFound, I18n.t('errors.messages.resource_not_found', resource: ::User.model_name.human)
+        end
+
+        if %w[admin user].include?(role)
+          user.role = role
+          current_ability.authorize! :update, user
+          user.save!
+          return true
+        end
+
+        false
+      end
+    end
+  end
+end

app/graphql/resolvers/users/me.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module Users
+    # Get current user object
+    class Me < Resolvers::BaseResolver
+      type Types::Users::UserType, null: true
+      description 'Returns the current user'
+
+      def resolve
+        context[:current_user]
+      end
+    end
+  end
+end

app/graphql/resolvers/users/user.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module Users
+    # Resolver to return a user
+    class User < Resolvers::BaseResolver
+      type Types::Users::UserType, null: true
+      description 'Returns the user for a requested id'
+
+      argument :id, ID, required: true
+
+      def resolve(id:)
+        ::User.accessible_by(current_ability).find_by(id: id)
+      end
+    end
+  end
+end

app/graphql/resolvers/users/users.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module Users
+    # Resolver to return a user
+    class Users < Resolvers::BaseResolver
+      type Types::Users::UserType.connection_type, null: true
+      description 'Returns all user for the current user company'
+
+      def resolve(**_args)
+        ::User.accessible_by(current_ability).includes(:company)
+      end
+    end
+  end
+end

app/graphql/types/companies/company_type.rb

@@ -3,7 +3,7 @@
 module Types
   module Companies
     # GraphQL type for a company
-    class CompanyType < ::Types::BaseModel
+    class CompanyType < Types::BaseModel
       field :name, String, null: false
       field :slug, String, null: true
       # field :users, [::Types::UserType], null: true

app/graphql/types/mutation_type.rb

@@ -7,9 +7,9 @@ class MutationType < Types::BaseObject
     implements ::Types::GraphqlAuth
 
     # Mutations
-    field :update_user, mutation: Mutations::UpdateUser
-    field :update_user_role, mutation: Mutations::UpdateUserRole
-    field :delete_user, mutation: Mutations::DeleteUser
+    field :update_user, mutation: Mutations::Users::UpdateUser
+    field :update_user_role, mutation: Mutations::Users::UpdateUserRole
+    field :delete_user, mutation: Mutations::Users::DeleteUser
 
     # Company
     field :update_company, mutation: Mutations::Companies::UpdateCompany

app/graphql/types/query_type.rb

@@ -4,10 +4,10 @@ module Types
   # Loads queries into schema
   # include other queries and resolvers here
   class QueryType < BaseObject
-    field :me, resolver: Resolvers::Me
+    field :me, resolver: Resolvers::Users::Me
 
-    field :users, resolver: Resolvers::Users
-    field :user, resolver: Resolvers::User
+    field :users, resolver: Resolvers::Users::Users
+    field :user, resolver: Resolvers::Users::User
 
     field :company, resolver: Resolvers::Companies::Company
   end

app/graphql/types/users/user_input_type.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Types
+  module Users
+    # Input type for user
+    class UserInputType < Types::BaseInputObject
+      description 'Attributes to create a user.'
+      argument :email, String, 'Email of user', required: true
+      argument :first_name, String, 'Firstname of user', required: true
+      argument :last_name, String, 'Lastname of user', required: true
+      argument :password, String, 'Password of user', required: false
+      argument :password_confirmation, String, 'Password confirmation', required: false
+    end
+  end
+end

app/graphql/types/users/user_type.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Types
+  module Users
+    # GraphQL type for a user
+    class UserType < Types::BaseModel
+      field :name, String, null: false
+      field :first_name, String, null: false
+      field :last_name, String, null: false
+      field :email, String, null: true
+      field :role, String, null: false
+      field :company, Types::Companies::CompanyType, null: false
+    end
+  end
+end

config/initializers/graphql_auth.rb

@@ -5,7 +5,7 @@
   config.jwt_secret_key = ENV['DEVISE_SECRET_KEY']
   config.app_url = ENV['CLIENT_URL']
 
-  config.user_type = '::Types::UserType'
+  config.user_type = '::Types::Users::UserType'
 
   # Devise allowed actions
   # Don't forget to enable the lockable setting in your Devise user model if you plan on using the lock_account feature

spec/graphql/mutations/delete_user_spec.rb → spec/graphql/mutations/users/delete_user_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe Mutations::DeleteUser do
+RSpec.describe Mutations::Users::DeleteUser do
   subject(:graphql!) { result }
 
   let!(:admin) do

spec/graphql/mutations/update_user_role_spec.rb → spec/graphql/mutations/users/update_user_role_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe Mutations::UpdateUserRole do
+RSpec.describe Mutations::Users::UpdateUserRole do
   subject(:graphql!) { result }
 
   let!(:admin) do

spec/graphql/mutations/update_user_spec.rb → spec/graphql/mutations/users/update_user_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe Mutations::UpdateUser do
+RSpec.describe Mutations::Users::UpdateUser do
   subject(:graphql!) { result }
 
   let!(:admin) do

spec/graphql/resolvers/me_spec.rb → spec/graphql/resolvers/users/me_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe Resolvers::Me, type: :request do
+RSpec.describe Resolvers::Users::Me, type: :request do
   subject(:graphql!) { result }
 
   let(:result) do

spec/graphql/resolvers/user_spec.rb → spec/graphql/resolvers/users/user_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe Resolvers::User, type: :request do
+RSpec.describe Resolvers::Users::User, type: :request do
   subject(:graphql!) { result }
 
   let!(:company) do