fix: support for creating multiple ibpPeers(#13)

src/epolicy/epolicy.gql

@@ -5,6 +5,8 @@ query getEpolicies($network: String) {
     description
     channel
     value
+    creationTimestamp
+    lastHeartbeatTime
   }
 }
 

src/epolicy/epolicy.service.ts

@@ -20,11 +20,16 @@ export class EpolicyService {
   ) {}
 
   format(epolicy: CRD.EndorsePolicy): Epolicy {
+    const creationTimestamp = new Date(
+      epolicy.metadata?.creationTimestamp,
+    ).toISOString();
+    const lastHeartbeatTime = epolicy.status?.lastHeartbeatTime
+      ? new Date(epolicy.status?.lastHeartbeatTime).toISOString()
+      : creationTimestamp;
     return {
       name: epolicy.metadata?.name,
-      creationTimestamp: new Date(
-        epolicy.metadata?.creationTimestamp,
-      ).toISOString(),
+      creationTimestamp,
+      lastHeartbeatTime,
       channel: epolicy.spec?.channel,
       description: epolicy.spec?.description,
       value: epolicy.spec?.value,

src/epolicy/models/epolicy.model.ts

@@ -16,4 +16,7 @@ export class Epolicy {
 
   /** 创建时间 */
   creationTimestamp?: string;
+
+  /** 更新时间 */
+  lastHeartbeatTime?: string;
 }

src/ibppeer/ibppeer.gql

@@ -14,8 +14,8 @@ query getIbppeers($organization: String!) {
 }
 
 # 创建节点
-mutation createIbppeer($organization: String!) {
-  ibppeerCreate(organization: $organization) {
+mutation createIbppeer($org: String!, $count: Float) {
+  ibppeerCreate(organization: $org, count: $count) {
     name
     creationTimestamp
     status

src/ibppeer/ibppeer.resolver.ts

@@ -35,12 +35,13 @@ export class IbppeerResolver {
     return this.ibppeerService.getIbppeers(auth, org);
   }
 
-  @Mutation(() => Ibppeer, { description: '创建IBPPeer节点' })
+  @Mutation(() => [Ibppeer], { description: '创建IBPPeer节点' })
   async ibppeerCreate(
     @Auth() auth: JwtAuth,
     @Args('organization', { description: '所在组织' }) org: string,
-  ): Promise<Ibppeer> {
-    return this.ibppeerService.createIbppeer(auth, org);
+    @Args('count', { description: '新增节点数', nullable: true }) count: number,
+  ): Promise<Ibppeer[]> {
+    return this.ibppeerService.createIbppeers(auth, org, count);
   }
 
   @ResolveField(() => [String], {

src/ibppeer/ibppeer.service.ts

@@ -52,6 +52,16 @@ export class IbppeerService {
     return this.format(body);
   }
 
+  async createIbppeers(
+    auth: JwtAuth,
+    org: string,
+    count = 1,
+  ): Promise<Ibppeer[]> {
+    return Promise.all(
+      Array.from({ length: count }).map(() => this.createIbppeer(auth, org)),
+    );
+  }
+
   async createIbppeer(auth: JwtAuth, org: string): Promise<Ibppeer> {
     const { token, preferred_username } = auth;
     const { binaryData } = await this.cmService.getConfigmap(

src/organization/organization.gql

@@ -35,15 +35,10 @@ query getOrganization($name: String!) {
     users {
       name
       isOrganizationAdmin
+      joinedAt
     }
     ibppeers {
       name
-      creationTimestamp # TODO：去除，查询太多数据，分两个接口
-		  status
-      limits {
-        cpu
-        memory
-      }
     }
   }
 }

src/organization/organization.resolver.ts

@@ -93,13 +93,21 @@ export class OrganizationResolver {
     @Parent() org: Organization,
     @Loader(UsersLoader) usersLoader: DataLoader<User['name'], User>,
   ): Promise<User[]> {
-    const { clients, admin } = org;
+    const { clients, admin, name } = org;
     const names = [...new Set([...(clients || []), ...(admin ? [admin] : [])])];
     const users = await usersLoader.loadMany(names);
-    return (users as User[]).map((u) => ({
-      ...u,
-      isOrganizationAdmin: admin === u.name,
-    }));
+    return (users as User[]).map((u) => {
+      let joinedAt = null;
+      try {
+        const bestchains = JSON.parse(u?.annotations?.bestchains);
+        joinedAt = bestchains?.list[name]?.creationTimestamp;
+      } catch (e) {}
+      return {
+        ...u,
+        isOrganizationAdmin: admin === u.name,
+        joinedAt,
+      };
+    });
   }
 
   @ResolveField(() => [Network], {

src/schema.gql

@@ -62,6 +62,9 @@ type Epolicy {
   """描述"""
   description: String
 
+  """更新时间"""
+  lastHeartbeatTime: String
+
   """name"""
   name: ID!
 
@@ -221,9 +224,12 @@ type Mutation {
 
   """创建IBPPeer节点"""
   ibppeerCreate(
+    """新增节点数"""
+    count: Float
+
     """所在组织"""
     organization: String!
-  ): Ibppeer!
+  ): [Ibppeer!]!
 
   """创建网络"""
   networkCreate(network: NewNetworkInput!): Network!
@@ -720,6 +726,9 @@ type User {
   """是否为组织管理员（组织列表中）"""
   isOrganizationAdmin: Boolean
 
+  """加入组织时间（组织列表中）"""
+  joinedAt: String
+
   """用户名"""
   name: ID!
 

src/users/models/user.model.ts

@@ -1,4 +1,5 @@
 import { Field, HideField, ID, ObjectType } from '@nestjs/graphql';
+import { AnyObj } from 'src/types';
 
 @ObjectType({ description: '用户' })
 export class User {
@@ -25,4 +26,10 @@ export class User {
 
   /** 是否为组织管理员（组织列表中） */
   isOrganizationAdmin?: boolean;
+
+  /** 加入组织时间（组织列表中） */
+  joinedAt?: string;
+
+  @HideField()
+  annotations?: AnyObj;
 }