feat(server): impl application query api (#423)

* feat(server): impl application query api

Signed-off-by: maslow <[email protected]>

* chore: delete redundant files

Signed-off-by: maslow <[email protected]>

Author: maslow

.vscode/settings.json

@@ -61,6 +61,7 @@
     "moby",
     "MONOG",
     "mycrd",
+    "nestjs",
     "objs",
     "openebs",
     "passw",
@@ -77,9 +78,9 @@
     "uids",
     "upsert",
     "upserted",
+    "userid",
     "vitepress",
     "withs",
-    "zcube",
-    "nestjs"
+    "zcube"
   ]
 }

server/package-lock.json

@@ -38,6 +38,7 @@
     "dotenv": "^16.0.3",
     "nanoid": "^3.3.4",
     "passport-jwt": "^4.0.0",
+    "passport-local": "^1.0.0",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
     "rxjs": "^7.2.0"
@@ -50,6 +51,8 @@
     "@types/express": "^4.17.13",
     "@types/jest": "28.1.8",
     "@types/node": "^16.0.0",
+    "@types/passport-jwt": "^3.0.7",
+    "@types/passport-local": "^1.0.34",
     "@types/supertest": "^2.0.11",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",

server/package.json

@@ -1,5 +1,6 @@
 import { Controller, Get, Query, Req, Res, UseGuards } from '@nestjs/common'
-import { Response } from 'express'
+import { User } from '@prisma/client'
+import { Request, Response } from 'express'
 import { AuthService } from './auth/auth.service'
 import { JwtAuthGuard } from './auth/jwt-auth.guard'
 import { ResponseUtil } from './utils/response'
@@ -44,7 +45,8 @@ export class AppController {
 
   @UseGuards(JwtAuthGuard)
   @Get('profile')
-  async getProfile(@Req() request) {
-    return request.user
+  async getProfile(@Req() request: Request) {
+    const user = request.user as User
+    return ResponseUtil.ok(user)
   }
 }

server/src/app.controller.ts

@@ -6,8 +6,14 @@ import {
   Patch,
   Param,
   Delete,
+  UseGuards,
+  Req,
+  Res,
 } from '@nestjs/common'
-import { ResponseUtil } from 'src/utils/response'
+import { User } from '@prisma/client'
+import { Request, Response } from 'express'
+import { JwtAuthGuard } from '../auth/jwt-auth.guard'
+import { ResponseUtil } from '../utils/response'
 import { ApplicationsService } from './applications.service'
 import { CreateApplicationDto } from './dto/create-application.dto'
 import { UpdateApplicationDto } from './dto/update-application.dto'
@@ -20,36 +26,51 @@ export class ApplicationsController {
    * Create application
    * @returns
    */
+  @UseGuards(JwtAuthGuard)
   @Post()
-  async create(@Body() dto: CreateApplicationDto) {
+  async create(@Body() dto: CreateApplicationDto, @Req() req: Request) {
+    const user = req.user as User
     const error = dto.validate()
     if (error) {
       return ResponseUtil.error(error)
     }
 
     // create namespace
     const appid = this.appService.generateAppid(6)
-    const namespace = await this.appService.createAppNamespace(appid)
+    const namespace = await this.appService.createAppNamespace(user.id, appid)
     if (!namespace) {
       return ResponseUtil.error('create app namespace error')
     }
 
     // create app
-    const app = await this.appService.create(appid, dto)
+    const app = await this.appService.create(user.id, appid, dto)
     if (!app) {
       return ResponseUtil.error('create app error')
     }
     return ResponseUtil.ok(app)
   }
 
+  @UseGuards(JwtAuthGuard)
   @Get()
-  findAll() {
-    return this.appService.findAll()
+  async findAll(@Req() req: Request) {
+    const user = req.user as User
+    const data = this.appService.findAllByUser(user.id)
+    return ResponseUtil.ok(data)
   }
 
-  @Get(':id')
-  findOne(@Param('id') id: string) {
-    return this.appService.findOne(+id)
+  @UseGuards(JwtAuthGuard)
+  @Get(':appid')
+  findOne(
+    @Param('appid') appid: string,
+    @Req() req: Request,
+    @Res() res: Response,
+  ) {
+    const user = req.user as User
+    const data = this.appService.findOne(user.id, appid)
+    if (null === data) {
+      return res.status(404).send('Application not found with appid: ' + appid)
+    }
+    return ResponseUtil.ok(data)
   }
 
   @Patch(':id')

server/src/applications/applications.controller.ts

@@ -21,6 +21,8 @@ describe('AppsService', () => {
   })
 })
 
+const userid = 'test-user-id'
+
 describe('AppService create app', () => {
   const timeout = 60 * 1000
   let service: ApplicationsService
@@ -46,22 +48,22 @@ describe('AppService create app', () => {
   }
 
   it('should create app', async () => {
+    appid = service.generateAppid(6)
     const dto = new CreateApplicationDto()
-    dto.name = 'test-for-create-app'
+    dto.name = appid
     dto.state = ApplicationState.ApplicationStateRunning
     dto.region = 'default'
     dto.bundleName = 'mini'
     dto.runtimeName = 'node-laf'
 
     // create namespace
-    appid = service.generateAppid(6)
-    const ns = await service.createAppNamespace(appid)
+    const ns = await service.createAppNamespace(appid, userid)
     expect(ns).toBeDefined()
     expect(ns.kind).toEqual('Namespace')
     expect(ns.metadata.name).toEqual(appid)
 
     // create app
-    const res = await service.create(appid, dto)
+    const res = await service.create(userid, appid, dto)
     expect(res).not.toBeNull()
     expect(res.kind).toBe('Application')
     expect(res.metadata.name).toBe(dto.name)
@@ -72,3 +74,28 @@ describe('AppService create app', () => {
     await cleanup()
   }, 20000)
 })
+
+describe.skip('AppService find app by appid', () => {
+  const timeout = 60 * 1000
+  let service: ApplicationsService
+  let appid: string
+  beforeAll(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      imports: [CoreModule],
+      providers: [ApplicationsService],
+    }).compile()
+
+    service = module.get<ApplicationsService>(ApplicationsService)
+  }, timeout)
+
+  jest.setTimeout(timeout)
+
+  it('should find app by appid', async () => {
+    appid = '1i43zq'
+    const res = await service.findOne(userid, appid)
+    expect(res).not.toBeNull()
+    expect(res.kind).toBe('Application')
+    expect(res.metadata.name).toBe(appid)
+    console.log(res)
+  })
+})