fix: add apis getChannel and deleteNetwork(bestchains#14)

.dockerignore

@@ -0,0 +1,7 @@
+dist
+node_modules
+logs
+*.log
+.git
+static/client-sdk
+public

Dockerfile

@@ -4,6 +4,8 @@ ENV NODE_ENV production
 
 COPY . /usr/src/app/
 
+WORKDIR /usr/src/app
+
 RUN nr build
 
 FROM hyperledgerk8s/bc-console:dev-branch as bc-console

Dockerfile.build

@@ -4,6 +4,8 @@ ENV NODE_ENV production
 
 COPY . /usr/src/app/
 
+WORKDIR /usr/src/app
+
 RUN nr build
 
 FROM busybox

src/channel/channel.gql

@@ -1,3 +1,24 @@
+# 通道详情
+query getChannel($name: String!) {
+  channel(name: $name) {
+    name
+    description
+    creationTimestamp
+    epolicy {
+      name
+      description
+      creationTimestamp
+    }
+    members {
+      name
+    }
+    peers {
+      name
+      namespace
+    }
+  }
+}
+
 # 创建通道
 mutation createChannel($network: String!, $channel: NewChannel!) {
   channelCreate(network: $network, channel: $channel) {

src/channel/channel.module.ts

@@ -1,10 +1,12 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { ChannelService } from './channel.service';
 import { ChannelResolver } from './channel.resolver';
 import { ChannelLoader } from './channel.loader';
+import { EpolicyModule } from 'src/epolicy/epolicy.module';
 
 @Module({
   providers: [ChannelService, ChannelResolver, ChannelLoader],
   exports: [ChannelLoader, ChannelService],
+  imports: [forwardRef(() => EpolicyModule)],
 })
 export class ChannelModule {}

src/channel/channel.resolver.ts

@@ -2,12 +2,15 @@ import {
   Args,
   Mutation,
   Parent,
+  Query,
   ResolveField,
   Resolver,
 } from '@nestjs/graphql';
 import DataLoader from 'dataloader';
 import { Loader } from 'src/common/dataloader';
 import { Auth } from 'src/common/decorators/auth.decorator';
+import { EpolicyService } from 'src/epolicy/epolicy.service';
+import { Epolicy } from 'src/epolicy/models/epolicy.model';
 import { Organization } from 'src/organization/models/organization.model';
 import { OrganizationLoader } from 'src/organization/organization.loader';
 import { JwtAuth } from 'src/types';
@@ -18,7 +21,18 @@ import { Channel } from './models/channel.model';
 
 @Resolver(() => Channel)
 export class ChannelResolver {
-  constructor(private readonly channelService: ChannelService) {}
+  constructor(
+    private readonly channelService: ChannelService,
+    private readonly epolicyService: EpolicyService,
+  ) {}
+
+  @Query(() => Channel, { description: '通道详情' })
+  async channel(
+    @Auth() auth: JwtAuth,
+    @Args('name') name: string,
+  ): Promise<Channel> {
+    return this.channelService.getChannel(auth, name);
+  }
 
   @Mutation(() => Channel, { description: '创建通道' })
   async channelCreate(
@@ -93,4 +107,17 @@ export class ChannelResolver {
     });
     return involved;
   }
+
+  @ResolveField(() => [Epolicy], {
+    nullable: true,
+    description: '背书策略',
+  })
+  async epolicy(
+    @Auth() auth: JwtAuth,
+    @Parent() channel: Channel,
+  ): Promise<Epolicy[]> {
+    const { name } = channel;
+    const epolicies = await this.epolicyService.getEpolicies(auth);
+    return epolicies?.filter((epolicy) => epolicy.channel === name);
+  }
 }

src/channel/channel.service.ts

@@ -23,16 +23,10 @@ export class ChannelService {
       members: channel.spec?.members,
       status: channel.status?.type,
       peers: channel.spec?.peers,
+      description: channel.spec?.description,
     };
   }
 
-  // 权限问题，普通用户没有 list/channel
-  async getChannels(auth: JwtAuth): Promise<Channel[]> {
-    const k8s = await this.k8sService.getClient(auth);
-    const { body } = await k8s.channel.list();
-    return body.items.map((item) => this.format(item));
-  }
-
   async getChannel(auth: JwtAuth, name: string): Promise<Channel> {
     const k8s = await this.k8sService.getClient(auth);
     const { body } = await k8s.channel.read(name);

src/channel/models/channel.model.ts

@@ -1,5 +1,6 @@
 import { Field, ID, ObjectType } from '@nestjs/graphql';
 import { SpecMember } from 'src/common/models/spec-member.model';
+import { Epolicy } from 'src/epolicy/models/epolicy.model';
 import { ChannelStatus } from './channel-status.enum';
 import { SpecPeer } from './spec-peer.model';
 
@@ -8,6 +9,9 @@ export class Channel {
   @Field(() => ID, { description: 'name' })
   name: string;
 
+  /** 描述 */
+  description?: string;
+
   /** 组织数量 */
   members?: SpecMember[];
 
@@ -29,4 +33,7 @@ export class Channel {
 
   /** 我参与的 */
   iamInvolved?: boolean;
+
+  /** 背书策略 */
+  epolicy?: Epolicy[];
 }

src/epolicy/epolicy.module.ts

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { EpolicyService } from './epolicy.service';
 import { EpolicyResolver } from './epolicy.resolver';
 import { OrganizationModule } from 'src/organization/organization.module';
@@ -7,6 +7,7 @@ import { ChannelModule } from 'src/channel/channel.module';
 
 @Module({
   providers: [EpolicyService, EpolicyResolver],
-  imports: [OrganizationModule, NetworkModule, ChannelModule],
+  imports: [OrganizationModule, NetworkModule, forwardRef(() => ChannelModule)],
+  exports: [EpolicyService],
 })
 export class EpolicyModule {}

src/epolicy/epolicy.resolver.ts

@@ -7,7 +7,7 @@ import { NewEpolicyInput } from './dto/new-epolicy.input';
 import { EpolicyService } from './epolicy.service';
 import { Epolicy } from './models/epolicy.model';
 
-@Resolver()
+@Resolver(() => Epolicy)
 export class EpolicyResolver {
   constructor(private readonly epolicyService: EpolicyService) {}
 

src/epolicy/epolicy.service.ts

@@ -22,6 +22,9 @@ export class EpolicyService {
   format(epolicy: CRD.EndorsePolicy): Epolicy {
     return {
       name: epolicy.metadata?.name,
+      creationTimestamp: new Date(
+        epolicy.metadata?.creationTimestamp,
+      ).toISOString(),
       channel: epolicy.spec?.channel,
       description: epolicy.spec?.description,
       value: epolicy.spec?.value,

src/epolicy/models/epolicy.model.ts

@@ -1,6 +1,6 @@
 import { Field, ID, ObjectType } from '@nestjs/graphql';
 
-@ObjectType()
+@ObjectType({ description: '背书策略' })
 export class Epolicy {
   @Field(() => ID, { description: 'name' })
   name: string;
@@ -13,4 +13,7 @@ export class Epolicy {
 
   /** 策略内容 */
   value: string;
+
+  /** 创建时间 */
+  creationTimestamp?: string;
 }

src/network/network.gql

@@ -101,4 +101,13 @@ mutation createNetwork($network: NewNetworkInput!) {
 # 释放网络
 mutation dissolveNetwork($name: String!, $federation: String!, $initiator: String!) {
   networkDissolve(name: $name, federation: $federation, initiator: $initiator)
+}
+
+# 删除网络
+mutation deleteNetwork($name: String!) {
+  networkDelete(name: $name) {
+    code
+    status
+    message
+  }
 }

src/network/network.resolver.ts

@@ -12,6 +12,7 @@ import { ChannelLoader } from 'src/channel/channel.loader';
 import { Channel } from 'src/channel/models/channel.model';
 import { Loader } from 'src/common/dataloader';
 import { Auth } from 'src/common/decorators/auth.decorator';
+import { K8sV1Status } from 'src/common/models/k8s-v1-status.model';
 import { NETWORK_VERSION_RESOURCES } from 'src/common/utils';
 import { IbppeerService } from 'src/ibppeer/ibppeer.service';
 import { Ibppeer } from 'src/ibppeer/models/ibppeer.model';
@@ -69,6 +70,14 @@ export class NetworkResolver {
     );
   }
 
+  @Mutation(() => K8sV1Status, { description: '删除网络' })
+  async networkDelete(
+    @Auth() auth: JwtAuth,
+    @Args('name') name: string,
+  ): Promise<K8sV1Status> {
+    return this.networkService.deleteNetwork(auth, name);
+  }
+
   @ResolveField(() => OrderVersion, { nullable: true, description: '配置版本' })
   version(@Parent() network: Network): OrderVersion {
     const { storage } = network;

src/network/network.service.ts

@@ -1,6 +1,7 @@
 import { ForbiddenException, Inject, Injectable, Logger } from '@nestjs/common';
 import { ConfigType } from '@nestjs/config';
 import { uniq } from 'lodash';
+import { K8sV1Status } from 'src/common/models/k8s-v1-status.model';
 import {
   DEFAULT_INGRESS_CLASS,
   DEFAULT_STORAGE_CLASS,
@@ -188,4 +189,15 @@ export class NetworkService {
     // 3. 若投票成功，则此「释放网络」成功
     return true; // 表示这个操作触发成功，而不是释放网络成功
   }
+
+  async deleteNetwork(auth: JwtAuth, name: string): Promise<K8sV1Status> {
+    // 0. 检查是否可以删除网络
+    const { channelNames } = await this.getNetwork(auth, name);
+    if (channelNames && channelNames.length > 0) {
+      throw new ForbiddenException('channel also exist in the network');
+    }
+    const k8s = await this.k8sService.getClient(auth);
+    const { body } = await k8s.network.delete(name);
+    return body;
+  }
 }

src/schema.gql

@@ -9,6 +9,12 @@ type Channel {
   """合约数量"""
   creationTimestamp: String
 
+  """描述"""
+  description: String
+
+  """背书策略"""
+  epolicy: [Epolicy!]
+
   """我参与的"""
   iamInvolved: Boolean
 
@@ -45,10 +51,14 @@ enum ChannelStatus {
   Error
 }
 
+"""背书策略"""
 type Epolicy {
   """所在通道"""
   channel: String!
 
+  """创建时间"""
+  creationTimestamp: String
+
   """描述"""
   description: String
 
@@ -218,6 +228,9 @@ type Mutation {
   """创建网络"""
   networkCreate(network: NewNetworkInput!): Network!
 
+  """删除网络"""
+  networkDelete(name: String!): K8sV1Status!
+
   """释放网络（返回true：只表示这个操作触发成功，而不是释放网络成功）"""
   networkDissolve(
     """所属联盟"""
@@ -540,6 +553,9 @@ enum ProposalType {
 }
 
 type Query {
+  """通道详情"""
+  channel(name: String!): Channel!
+
   """创建策略时，可选的通道"""
   channelsForCreateEpolicy(network: String!): [Channel!]!