feat: sync identities

Author: beeman

api-schema.graphql

@@ -158,6 +158,7 @@ input AdminUpdateNetworkInput {
 
 input AdminUpdateNetworkTokenInput {
   name: String
+  vault: String
 }
 
 input AdminUpdateRuleInput {
@@ -305,6 +306,8 @@ type Identity {
   profile: JSON
   provider: IdentityProvider!
   providerId: String!
+  syncEnded: DateTime
+  syncStarted: DateTime
   updatedAt: DateTime
   url: String
   verified: Boolean
@@ -344,7 +347,7 @@ input LinkIdentityInput {
 type Log {
   bot: Bot
   botId: String
-  communityId: String!
+  communityId: String
   createdAt: DateTime
   data: JSON
   id: String!
@@ -353,6 +356,7 @@ type Log {
   identityProviderId: String
   level: LogLevel!
   message: String!
+  networkAssetId: String
   relatedId: String
   relatedType: LogRelatedType
   rule: Rule
@@ -375,6 +379,7 @@ type LogPaging {
 
 enum LogRelatedType {
   Bot
+  BotMember
   Community
   Identity
   Rule
@@ -477,6 +482,7 @@ type NetworkAsset {
   name: String!
   owner: String!
   program: String
+  resolver: NetworkResolver!
   symbol: String
   type: NetworkTokenType!
   updatedAt: DateTime
@@ -499,6 +505,12 @@ type NetworkPaging {
   meta: PagingMeta!
 }
 
+enum NetworkResolver {
+  Anybodies
+  SolanaFungible
+  SolanaNonFungible
+}
+
 type NetworkToken {
   account: String!
   cluster: NetworkCluster!
@@ -513,6 +525,7 @@ type NetworkToken {
   symbol: String
   type: NetworkTokenType!
   updatedAt: DateTime
+  vault: String
 }
 
 type NetworkTokenPaging {
@@ -734,11 +747,12 @@ input UserFindManyIdentityInput {
 
 input UserFindManyLogInput {
   botId: String
-  communityId: String!
+  communityId: String
   identityProvider: IdentityProvider
   identityProviderId: String
   level: LogLevel
   limit: Int = 10
+  networkAssetId: String
   page: Int = 1
   relatedId: String
   relatedType: LogRelatedType
@@ -749,6 +763,7 @@ input UserFindManyLogInput {
 
 input UserFindManyNetworkAssetInput {
   cluster: NetworkCluster!
+  group: String
   limit: Int = 10
   page: Int = 1
   search: String
@@ -762,6 +777,7 @@ input UserFindManyNetworkTokenInput {
   page: Int = 1
   search: String
   type: NetworkTokenType
+  username: String
 }
 
 input UserFindManyRuleInput {

libs/api/bot/data-access/src/lib/api-bot-member.service.ts

@@ -60,12 +60,6 @@ export class ApiBotMemberService {
         include: { bot: { select: { id: true, communityId: true } }, identity: { select: { ownerId: true } } },
       })
       .then(async (created) => {
-        await this.core.logInfo(`Added ${userId} to ${serverId}`, {
-          botId,
-          communityId,
-          identityProvider: IdentityProvider.Discord,
-          identityProviderId: userId,
-        })
         await this.core.data.communityMember.upsert({
           where: { communityId_userId: { communityId: created.bot.communityId, userId: created.identity.ownerId } },
           create: {
@@ -96,12 +90,6 @@ export class ApiBotMemberService {
         include: { bot: true, identity: { select: { ownerId: true } } },
       })
       .then(async (deleted) => {
-        await this.core.logInfo(`Removed ${userId} from ${serverId}`, {
-          botId,
-          communityId,
-          identityProvider: IdentityProvider.Discord,
-          identityProviderId: userId,
-        })
         const botMembers = await this.core.data.botMember.findMany({ where: { botId, userId } })
         if (!botMembers.length) {
           await this.core.data.communityMember
@@ -117,6 +105,8 @@ export class ApiBotMemberService {
                 identityProvider: IdentityProvider.Discord,
                 identityProviderId: userId,
                 userId: res.userId,
+                relatedId: res.id,
+                relatedType: 'BotMember',
               })
             })
         }

libs/api/bot/data-access/src/lib/processors/api-bot-member-add-processor.ts

@@ -27,11 +27,14 @@ export class ApiBotMemberAddProcessor extends WorkerHost {
     const added = await this.member.upsert(job.data)
     if (added) {
       await job.log(`Added ${job.data.userId} to ${job.data.serverId} by bot ${job.data.botId}`)
-      await this.core.logInfo(`Added ${job.data.userId} to ${job.data.serverId} by bot ${job.data.botId}`, {
+      await this.core.logInfo(`Added bot member`, {
         botId: job.data.botId,
         communityId: job.data.communityId,
         identityProvider: IdentityProvider.Discord,
         identityProviderId: job.data.userId,
+        relatedId: added.id,
+        relatedType: 'BotMember',
+        data: { botId: job.data.botId, serverId: job.data.serverId, userId: job.data.userId },
       })
       return added
     } else {
@@ -41,6 +44,7 @@ export class ApiBotMemberAddProcessor extends WorkerHost {
         communityId: job.data.communityId,
         identityProvider: IdentityProvider.Discord,
         identityProviderId: job.data.userId,
+        data: { botId: job.data.botId, serverId: job.data.serverId, userId: job.data.userId },
       })
       return undefined
     }

libs/api/core/data-access/src/lib/api-core-provision-data-networks.ts

@@ -91,6 +91,7 @@ export const provisionNetworks: Prisma.NetworkCreateInput[] = [
           imageUrl: 'https://shdw-drive.genesysgo.net/GQfWBgNh4GUM1Y7nRrx8MFiMoxDLcNDCpsptXYxbozAE/collection.png',
           metadataUrl: 'https://shdw-drive.genesysgo.net/GQfWBgNh4GUM1Y7nRrx8MFiMoxDLcNDCpsptXYxbozAE/collection.json',
           name: 'Deanslist',
+          vault: 'JiZUwqz0ETakNYOIulut:CjYTP9jJVmCqnmdPf8tyafTHxTQtAjsFckVGZWMwprca',
           program: TOKEN_PROGRAM_ID.toString(),
           symbol: 'DEAN',
           type: NetworkTokenType.NonFungible,

libs/api/core/data-access/src/lib/api-core-provision-data.ts

@@ -66,7 +66,7 @@ export const provisionCommunities: Prisma.CommunityCreateInput[] = [
               {
                 type: RuleConditionType.AnybodiesAsset,
                 name: 'Deanslist NFT staked in Anybodies Vault',
-                config: { vaultId: 'JiZUwqz0ETakNYOIulut' },
+                config: { vault: 'JiZUwqz0ETakNYOIulut:CjYTP9jJVmCqnmdPf8tyafTHxTQtAjsFckVGZWMwprca' },
                 amount: '1',
               },
             ],
@@ -114,7 +114,7 @@ export const provisionCommunities: Prisma.CommunityCreateInput[] = [
               {
                 type: RuleConditionType.AnybodiesAsset,
                 name: 'Deanslist NFT staked in Anybodies Vault',
-                config: { vaultId: 'JiZUwqz0ETakNYOIulut' },
+                config: { vault: 'JiZUwqz0ETakNYOIulut:CjYTP9jJVmCqnmdPf8tyafTHxTQtAjsFckVGZWMwprca' },
                 amount: '1',
               },
             ],

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

@@ -12,7 +12,10 @@ export class Identity {
   createdAt?: Date
   @Field({ nullable: true })
   updatedAt?: Date
-
+  @Field({ nullable: true })
+  syncStarted?: Date | null
+  @Field({ nullable: true })
+  syncEnded?: Date | null
   @Field(() => IdentityProvider)
   provider!: IdentityProvider
   @Field()

libs/api/log/data-access/src/lib/api-user-log.service.ts

@@ -9,11 +9,14 @@ export class ApiUserLogService {
   constructor(private readonly core: ApiCoreService) {}
 
   async findManyLog(userId: string, input: UserFindManyLogInput): Promise<LogPaging> {
-    await this.core.ensureCommunityAdmin({ communityId: input.communityId, userId })
+    if (input.communityId) {
+      await this.core.ensureCommunityAdmin({ communityId: input.communityId, userId })
+    }
     return this.core.data.log
       .paginate({
         orderBy: { createdAt: 'desc' },
         where: getUserLogWhereInput(input),
+        include: { bot: true, identity: true },
       })
       .withPages({ limit: input.limit, page: input.page })
       .then(([data, meta]) => ({ data, meta }))
@@ -27,7 +30,9 @@ export class ApiUserLogService {
     if (!found) {
       throw new Error('Log not found')
     }
-    await this.core.ensureCommunityAdmin({ communityId: found.communityId, userId })
+    if (found.communityId) {
+      await this.core.ensureCommunityAdmin({ communityId: found.communityId, userId })
+    }
     return found
   }
 }

libs/api/log/data-access/src/lib/dto/user-find-many-log.input.ts

@@ -5,11 +5,13 @@ import { LogRelatedType } from '../entity/log-related-type.enum'
 
 @InputType()
 export class UserFindManyLogInput extends PagingInput() {
-  @Field()
-  communityId!: string
+  @Field({ nullable: true })
+  communityId?: string
   @Field(() => LogLevel, { nullable: true })
   level?: LogLevel
   @Field({ nullable: true })
+  botId?: string | null
+  @Field({ nullable: true })
   relatedId?: string
   @Field(() => LogRelatedType, { nullable: true })
   relatedType?: LogRelatedType
@@ -18,7 +20,7 @@ export class UserFindManyLogInput extends PagingInput() {
   @Field({ nullable: true })
   identityProviderId?: string | null
   @Field({ nullable: true })
-  botId?: string | null
+  networkAssetId?: string
   @Field({ nullable: true })
   userId?: string | null
   @Field({ nullable: true })

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

@@ -23,15 +23,17 @@ export class Log {
   relatedId?: string | null
   @Field(() => LogRelatedType, { nullable: true })
   relatedType?: LogRelatedType | null
-  @Field()
-  communityId!: string
+  @Field({ nullable: true })
+  communityId?: string | null
   @Field(() => IdentityProvider, { nullable: true })
   identityProvider?: IdentityProvider | null
   @Field({ nullable: true })
   identityProviderId?: string | null
   @HideField()
   identity?: Identity | null
   @Field({ nullable: true })
+  networkAssetId?: string | null
+  @Field({ nullable: true })
   botId?: string | null
   @HideField()
   bot?: Bot | null

libs/api/log/data-access/src/lib/helpers/get-user-log-where.input.ts

@@ -3,32 +3,16 @@ import { UserFindManyLogInput } from '../dto/user-find-many-log.input'
 
 export function getUserLogWhereInput(input: UserFindManyLogInput): Prisma.LogWhereInput {
   const where: Prisma.LogWhereInput = {
-    communityId: input.communityId,
-  }
-
-  if (input.level) {
-    where.level = input.level
-  }
-  if (input.relatedId) {
-    where.relatedId = input.relatedId
-  }
-  if (input.relatedType) {
-    where.relatedType = input.relatedType
-  }
-  if (input.identityProvider) {
-    where.identityProvider = input.identityProvider
-  }
-  if (input.identityProviderId) {
-    where.identityProviderId = input.identityProviderId
-  }
-  if (input.botId) {
-    where.botId = input.botId
-  }
-  if (input.userId) {
-    where.userId = input.userId
-  }
-  if (input.ruleId) {
-    where.ruleId = input.ruleId
+    communityId: input.communityId ?? undefined,
+    networkAssetId: input.networkAssetId ?? undefined,
+    level: input.level ?? undefined,
+    relatedId: input.relatedId ?? undefined,
+    relatedType: input.relatedType ?? undefined,
+    identityProvider: input.identityProvider ?? undefined,
+    identityProviderId: input.identityProviderId ?? undefined,
+    botId: input.botId ?? undefined,
+    userId: input.userId ?? undefined,
+    ruleId: input.ruleId ?? undefined,
   }
 
   if (input.search) {

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

@@ -28,4 +28,9 @@ export class ApiLogResolver {
   user(@Parent() log: Log) {
     return log.user
   }
+
+  @ResolveField(() => String, { nullable: true })
+  userId(@Parent() log: Log) {
+    return log.userId ?? log.identity?.ownerId
+  }
 }