feat: add member record to userGetCommunities roles array

api-schema.graphql

@@ -689,6 +689,7 @@ type Role {
   conditions: [RoleCondition!]
   createdAt: DateTime
   id: String!
+  member: CommunityMember
   name: String!
   permissions: [RolePermission!]
   updatedAt: DateTime

libs/api/community-member/feature/src/lib/api-community-member-feature.module.ts

@@ -1,11 +1,11 @@
 import { Module } from '@nestjs/common'
 import { ApiCommunityMemberDataAccessModule } from '@pubkey-link/api-community-member-data-access'
-import { ApiCommunityMemberResolver } from './api-community-member.resolver'
 import { ApiAdminCommunityMemberResolver } from './api-admin-community-member.resolver'
+import { ApiCommunityMemberResolver } from './api-community-member.resolver'
 import { ApiUserCommunityMemberResolver } from './api-user-community-member.resolver'
 
 @Module({
   imports: [ApiCommunityMemberDataAccessModule],
-  providers: [ApiCommunityMemberResolver, ApiAdminCommunityMemberResolver, ApiUserCommunityMemberResolver],
+  providers: [ApiAdminCommunityMemberResolver, ApiCommunityMemberResolver, ApiUserCommunityMemberResolver],
 })
 export class ApiCommunityMemberFeatureModule {}

libs/api/community/data-access/src/lib/api-community-data.service.ts

@@ -42,17 +42,24 @@ export class ApiCommunityDataService {
   async getCommunities(username: string) {
     return this.core.data.community.findMany({
       where: {
-        roles: {
-          some: { members: { some: { member: { user: { username } } } } },
-        },
+        // Ensure that the role has at least one condition
+        roles: { some: { conditions: { some: {} } } },
       },
       include: {
         roles: {
-          where: { members: { some: { member: { user: { username } } } } },
-          include: { conditions: { include: { token: true } } },
+          // Ensure that the role has at least one condition
+          where: { conditions: { some: {} } },
+          include: {
+            conditions: { include: { token: true } },
+            members: {
+              where: { member: { user: { username } } },
+              include: { member: true },
+            },
+          },
           orderBy: { name: 'asc' },
         },
       },
+      orderBy: { name: 'asc' },
     })
   }
 

libs/api/community/feature/src/lib/api-user-community.resolver.ts

@@ -25,6 +25,7 @@ export class ApiUserCommunityResolver {
   userDeleteCommunity(@CtxUserId() actorId: string, @Args('communityId') communityId: string) {
     return this.service.user.deleteCommunity(actorId, communityId)
   }
+
   @Query(() => [Community])
   userGetCommunities(@CtxUser() actor: User, @Args('username') username: string) {
     return this.service.user.getCommunities(actor, username)

libs/api/role/data-access/src/lib/entity/role.entity.ts

@@ -1,4 +1,4 @@
-import { Field, ObjectType } from '@nestjs/graphql'
+import { Field, HideField, ObjectType } from '@nestjs/graphql'
 import { PagingResponse } from '@pubkey-link/api-core-data-access'
 import { RoleCondition } from './role-condition.entity'
 import { RolePermission } from './role-permission.entity'
@@ -19,6 +19,8 @@ export class Role {
   conditions?: RoleCondition[] | null
   @Field(() => [RolePermission], { nullable: true })
   permissions?: RolePermission[] | null
+  @HideField()
+  members?: { member?: unknown }[] | null
 }
 
 @ObjectType()

libs/api/role/feature/src/lib/api-role.resolver.ts

@@ -1,10 +1,16 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql'
+import { CommunityMember } from '@pubkey-link/api-community-member-data-access'
 import { ApiRoleService, Role } from '@pubkey-link/api-role-data-access'
 
 @Resolver(() => Role)
 export class ApiRoleResolver {
   constructor(private readonly service: ApiRoleService) {}
 
+  @ResolveField(() => CommunityMember, { nullable: true })
+  member(@Parent() role: Role) {
+    return role.members?.length ? role.members[0].member : null
+  }
+
   @ResolveField(() => String, { nullable: true })
   viewUrl(@Parent() role: Role) {
     return `/c/${role.communityId}/roles/${role.id}`