diff options
Diffstat (limited to 'app/models/group.rb')
| -rw-r--r-- | app/models/group.rb | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index e4127b2b2d4..eefb8d3d16a 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -167,7 +167,7 @@ class Group < Namespace def without_integration(integration) integrations = Integration .select('1') - .where('services.group_id = namespaces.id') + .where("#{Integration.table_name}.group_id = namespaces.id") .where(type: integration.type) where('NOT EXISTS (?)', integrations) @@ -296,7 +296,7 @@ class Group < Namespace end def add_users(users, access_level, current_user: nil, expires_at: nil) - GroupMember.add_users( + Members::Groups::CreatorService.add_users( # rubocop:todo CodeReuse/ServiceClass self, users, access_level, @@ -306,14 +306,13 @@ class Group < Namespace end def add_user(user, access_level, current_user: nil, expires_at: nil, ldap: false) - GroupMember.add_user( - self, - user, - access_level, - current_user: current_user, - expires_at: expires_at, - ldap: ldap - ) + Members::Groups::CreatorService.new(self, # rubocop:todo CodeReuse/ServiceClass + user, + access_level, + current_user: current_user, + expires_at: expires_at, + ldap: ldap) + .execute end def add_guest(user, current_user = nil) @@ -667,7 +666,7 @@ class Group < Namespace # TODO: group hooks https://gitlab.com/gitlab-org/gitlab/-/issues/216904 end - def execute_services(data, hooks_scope) + def execute_integrations(data, hooks_scope) # NOOP # TODO: group hooks https://gitlab.com/gitlab-org/gitlab/-/issues/216904 end |