chore: project detail join approve

packages/ui/certd-server/src/controller/user/basic/user-controller.ts

@@ -0,0 +1,60 @@
+import { Constants, isEnterprise } from '@certd/lib-server';
+import { Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
+import { In } from 'typeorm';
+import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
+import { UserService } from '../../../modules/sys/authority/service/user-service.js';
+import { BasicController } from '../../basic/code-controller.js';
+
+/**
+ * 通知
+ */
+@Provide()
+@Controller('/api/basic/user')
+export class BasicUserController extends BasicController {
+  @Inject()
+  service: UserService;
+  @Inject()
+  authService: AuthService;
+
+  getService(): UserService {
+    return this.service;
+  }
+
+  @Post('/getSimpleUserByIds', { summary: Constants.per.authOnly })
+  async getSimpleUserByIds(@Body('ids') ids: number[]) {
+    if(!isEnterprise()){
+       throw new Error('非企业模式不能获取用户信息');
+    }
+    const users = await this.service.find({
+      select: {
+        id: true,
+        username: true,
+        nickName: true,
+        mobile: true,
+        phoneCode: true,
+      },
+      where: {
+        id: In(ids),
+      },
+    });
+    return this.ok(users);
+  }
+
+  @Post('/getSimpleUsers', {summary: Constants.per.authOnly})
+  async getSimpleUsers() {
+    if(!isEnterprise()){
+       throw new Error('非企业模式不能获取所有用户信息');
+    }
+    const users = await this.service.find({
+      select: {
+        id: true,
+        username: true,
+        nickName: true,
+        mobile: true,
+        phoneCode: true,
+      },
+    });
+    return this.ok(users);
+  }
+
+}

packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts

@@ -22,6 +22,18 @@ export class UserProjectController extends BaseController {
     return this.service;
   }
 
+   /**
+   * @param body 
+   * @returns 
+   */
+  @Post('/detail', { summary: Constants.per.authOnly })
+  async detail(@Body(ALL) body: any) {
+    const {projectId} = await this.getProjectUserIdRead();
+    const res = await this.service.getDetail(projectId,this.getUserId());
+    return this.ok(res);
+  }
+
+
   /**
    * 我的项目
    * @param body 

packages/ui/certd-server/src/controller/user/enterprise/project-member-controller.ts

@@ -0,0 +1,115 @@
+import { CrudController, SysSettingsService,Constants } from "@certd/lib-server";
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
+import { ProjectMemberEntity } from "../../../modules/sys/enterprise/entity/project-member.js";
+import { ProjectMemberService } from "../../../modules/sys/enterprise/service/project-member-service.js";
+import { merge } from "lodash-es";
+import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
+/**
+ */
+@Provide()
+@Controller("/api/enterprise/projectMember")
+export class ProjectMemberController extends CrudController<ProjectMemberEntity> {
+  @Inject()
+  service: ProjectMemberService;
+
+  @Inject()
+  sysSettingsService: SysSettingsService;
+
+  @Inject()
+  projectService: ProjectService;
+
+  getService<T>() {
+    return this.service;
+  }
+
+  @Post("/page", { summary: Constants.per.authOnly })
+  async page(@Body(ALL) body: any) {
+    const {projectId} = await this.getProjectUserIdRead();
+    body.query = body.query ?? {};
+    body.query.projectId = projectId;
+    return await super.page(body);
+  }
+
+  @Post("/list", { summary: Constants.per.authOnly })
+  async list(@Body(ALL) body: any) {
+    const {projectId} = await this.getProjectUserIdRead();
+    body.query = body.query ?? {};
+    body.query.projectId = projectId;
+    return super.list(body);
+  }
+
+  @Post("/add", { summary: Constants.per.authOnly })
+  async add(@Body(ALL) bean: any) {
+    const def: any = {
+      isDefault: false,
+      disabled: false,
+    };
+    merge(bean, def);
+
+    await this.projectService.checkAdminPermission({
+      userId: this.getUserId(),
+      projectId: bean.projectId,
+    });
+
+    return super.add(bean);
+  }
+
+  @Post("/update", { summary: Constants.per.authOnly }) 
+  async update(@Body(ALL) bean: any) {
+    if (!bean.id) {
+      throw new Error("id is required");
+    }
+    const projectId = await this.service.getProjectId(bean.id)
+    await this.projectService.checkAdminPermission({
+      userId: this.getUserId(),
+      projectId: projectId,
+    });
+    return super.update({
+      id: bean.id,
+      permission: bean.permission,
+    });
+  }
+
+  @Post("/info", { summary: Constants.per.authOnly })
+  async info(@Query("id") id: number) {
+     if (!id) {
+      throw new Error("id is required");
+    }
+    const projectId = await this.service.getProjectId(id)
+    await this.projectService.checkReadPermission({
+      userId: this.getUserId(),
+      projectId:projectId,
+    });
+    return super.info(id);
+  }
+
+  @Post("/delete", { summary: Constants.per.authOnly })
+  async delete(@Query("id") id: number) {
+    if (!id) {
+      throw new Error("id is required");
+    }
+    const projectId = await this.service.getProjectId(id)
+    await this.projectService.checkAdminPermission({
+      userId: this.getUserId(),
+      projectId:projectId,
+    });
+    return super.delete(id);
+  }
+
+  @Post("/deleteByIds", { summary: Constants.per.authOnly })
+  async deleteByIds(@Body("ids") ids: number[]) {
+    for (const id of ids) {
+      if (!id) {
+        throw new Error("id is required");
+      }
+      const projectId = await this.service.getProjectId(id)
+      await this.projectService.checkAdminPermission({
+        userId: this.getUserId(),
+        projectId:projectId,
+      });
+      await this.service.delete(id as any);
+    }
+   
+    return this.ok({});
+  }
+}

packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts

@@ -47,11 +47,12 @@ export class ProjectMemberService extends BaseService<ProjectMemberEntity> {
     });
   }
 
-  async getMember(projectId: number,userId: number) {
+  async getMember(projectId: number,userId: number,status?:string) {
     return await this.repository.findOne({
       where: {
         userId,
         projectId,
+        status,
       },
     });
   }

packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts

@@ -43,13 +43,13 @@ export class ProjectService extends BaseService<ProjectEntity> {
       throw new Error('项目名称已存在');
     }
     bean.disabled = false
-    const res= await super.add(bean)
+    const res = await super.add(bean)
     projectCache.clear();
     return res;
   }
 
-  async update( bean: ProjectEntity) {
-    const res= await super.update(bean)
+  async update(bean: ProjectEntity) {
+    const res = await super.update(bean)
     projectCache.clear();
     return res;
   }
@@ -65,7 +65,7 @@ export class ProjectService extends BaseService<ProjectEntity> {
 
   async getUserProjects(userId: number) {
 
-    const memberList = await this.projectMemberService.getByUserId(userId,'approved');
+    const memberList = await this.projectMemberService.getByUserId(userId, 'approved');
     const projectIds = memberList.map(item => item.projectId);
     const projectList = await this.repository.createQueryBuilder('project')
       .where(' project.disabled = false')
@@ -89,15 +89,15 @@ export class ProjectService extends BaseService<ProjectEntity> {
     return projectList
   }
 
-  async getAllWithStatus(userId: number) : Promise<ProjectMemberItem[]> {
-    let projectList:any = await this.find({
+  async getAllWithStatus(userId: number): Promise<ProjectMemberItem[]> {
+    let projectList: any = await this.find({
       where: {
         disabled: false,
         userId: 0,
       },
-    }) 
-    const  projectMemberItemList:ProjectMemberItem[] = projectList
-   
+    })
+    const projectMemberItemList: ProjectMemberItem[] = projectList
+
     const memberList = await this.projectMemberService.getByUserId(userId);
 
     const memberMap = memberList.reduce((prev, cur) => {
@@ -111,7 +111,7 @@ export class ProjectService extends BaseService<ProjectEntity> {
         item.status = 'approved';
         item.memberId = userId
       } else {
-        const memberItem :any = memberMap[item.id]
+        const memberItem: any = memberMap[item.id]
         if (memberItem) {
           item.permission = memberItem.permission;
           item.status = memberItem.status;
@@ -122,6 +122,27 @@ export class ProjectService extends BaseService<ProjectEntity> {
     return projectMemberItemList
   }
 
+
+  async getDetail(projectId: number, userId?: number): Promise<ProjectMemberItem[]> {
+    const project: any = await this.info(projectId);
+    if (!project) {
+      throw new Error('项目不存在');
+    }
+    if (project.adminId === userId) {
+      project.permission = 'admin';
+      project.status = 'approved';
+      project.memberId = userId
+    } else {
+      const member = await this.projectMemberService.getMember(projectId, userId);
+      if (member) {
+        project.permission = member.permission;
+        project.status = member.status;
+        project.memberId = member.userId
+      }
+    }
+    return project
+  }
+
   async checkAdminPermission({ userId, projectId }: { userId: number, projectId: number }) {
     return await this.checkPermission({
       userId,
@@ -157,36 +178,36 @@ export class ProjectService extends BaseService<ProjectEntity> {
 
     const cacheKey = `projectPermission:${projectId}:${userId}`
     let savedPermission = projectCache.get(cacheKey);
-    
-    if (!savedPermission){
-        const project = await this.findOne({
-          select: ['id', 'userId', 'adminId', 'disabled'],
-          where: {
-            id: projectId,
-          },
-        });
-        if (!project) {
-          throw new Error('项目不存在');
+
+    if (!savedPermission) {
+      const project = await this.findOne({
+        select: ['id', 'userId', 'adminId', 'disabled'],
+        where: {
+          id: projectId,
+        },
+      });
+      if (!project) {
+        throw new Error('项目不存在');
+      }
+      if (project.adminId === userId) {
+        //创建者拥有管理权限
+        savedPermission = 'admin';
+      } else {
+        if (project.disabled) {
+          throw new Error('项目已禁用');
         }
-        if (project.adminId === userId) {
-          //创建者拥有管理权限
-          savedPermission = 'admin';
-        }else{
-          if (project.disabled) {
-            throw new Error('项目已禁用');
-          } 
-          const member = await this.projectMemberService.getMember(projectId, userId);
-          if (!member || member.status !== 'approved') {
-            throw new Error(`用户${userId}还不是项目${projectId}的成员`);
-          }
-          savedPermission = member.permission;
+        const member = await this.projectMemberService.getMember(projectId, userId);
+        if (!member || member.status !== 'approved') {
+          throw new Error(`用户${userId}还不是项目${projectId}的成员`);
         }
+        savedPermission = member.permission;
+      }
     }
-    projectCache.set(cacheKey, savedPermission,{ttl:  3 * 60 * 1000});
+    projectCache.set(cacheKey, savedPermission, { ttl: 3 * 60 * 1000 });
     if (!savedPermission) {
       throw new Error(`权限不足，需要${permission}权限`);
     }
-    
+
     if (permission === 'read') {
       return true
     }
@@ -219,12 +240,12 @@ export class ProjectService extends BaseService<ProjectEntity> {
     if (member && member.status === 'approved') {
       throw new Error('用户已加入项目');
     }
-    if (member){
+    if (member) {
       this.projectMemberService.update({
         id: member.id,
         status: 'pending',
       })
-    }else{
+    } else {
       // 加入项目
       await this.projectMemberService.add({
         userId,
@@ -235,12 +256,12 @@ export class ProjectService extends BaseService<ProjectEntity> {
     }
   }
 
-  async approveJoin({ userId, projectId,status,permission }: { userId: number, projectId: number,status:string,permission:string }) {
+  async approveJoin({ userId, projectId, status, permission }: { userId: number, projectId: number, status: string, permission: string }) {
     const member = await this.projectMemberService.getMember(projectId, userId);
     if (!member) {
       throw new Error('找不到用户的申请记录');
     }
- 
+
     await this.projectMemberService.update({
       id: member.id,
       status: status,