From 2f29bfd0849d488ff1997c769b8d6301cd8ceb50 Mon Sep 17 00:00:00 2001
From: maslow <wangfugen@126.com>
Date: Thu, 14 Oct 2021 14:44:31 +0800
Subject: [PATCH] feat(dbm): impl db schema; impl create db;

---
 packages/system-client/src/api/collec.js      |  39 +++-
 packages/system-client/src/utils/request.js   |   4 +-
 .../src/views/database/collections.vue        | 166 +++++++++++++++---
 .../system-server/src/router/dbm/create.ts    |  44 +++++
 packages/system-server/src/router/dbm/get.ts  |  10 +-
 .../system-server/src/router/dbm/index.ts     |  13 +-
 .../system-server/src/router/dbm/proxy.ts     |  11 +-
 .../system-server/src/router/dbm/update.ts    |  62 +++++++
 8 files changed, 305 insertions(+), 44 deletions(-)
 create mode 100644 packages/system-server/src/router/dbm/create.ts
 create mode 100644 packages/system-server/src/router/dbm/update.ts

diff --git a/packages/system-client/src/api/collec.js b/packages/system-client/src/api/collec.js
index dbe824a0ac..038ec014d9 100644
--- a/packages/system-client/src/api/collec.js
+++ b/packages/system-client/src/api/collec.js
@@ -5,9 +5,6 @@ import { Cloud } from 'laf-client-sdk'
 
 /**
  * Get collection list
- * @param {*} query
- * @param {*} page
- * @param {*} pageSize
  */
 export function getCollections() {
   const appid = store.state.app.appid
@@ -17,6 +14,42 @@ export function getCollections() {
   })
 }
 
+/**
+ * Create collection
+ * @param {string} collectionName
+ */
+export function createCollection(collectionName) {
+  const appid = store.state.app.appid
+  return request({
+    url: `/apps/${appid}/dbm/collections`,
+    method: 'post',
+    data: {
+      collectionName
+    }
+  })
+}
+
+/**
+ * Update collection
+ * @param {string} collectionName
+ * @param {object} validatorSchema
+ * @param {string} validatorLevel
+ */
+export function updateCollection(collectionName, validatorSchema, validatorLevel = 'strict') {
+  const appid = store.state.app.appid
+  return request({
+    url: `/apps/${appid}/dbm/collections`,
+    method: 'put',
+    data: {
+      collectionName,
+      options: {
+        validatorSchema,
+        validatorLevel
+      }
+    }
+  })
+}
+
 /**
  * 获取集合的索引信息
  */
diff --git a/packages/system-client/src/utils/request.js b/packages/system-client/src/utils/request.js
index 3402ecdbc9..2d0bda05fc 100644
--- a/packages/system-client/src/utils/request.js
+++ b/packages/system-client/src/utils/request.js
@@ -2,7 +2,7 @@ import axios from 'axios'
 import { MessageBox } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
-import { showError, showInfo } from './show'
+import { showInfo } from './show'
 
 // create an axios instance
 const service = axios.create({
@@ -66,7 +66,7 @@ service.interceptors.response.use(
       return Promise.reject(error)
     }
 
-    showError(error.message)
+    // showError(error.message)
     return Promise.reject(error)
   }
 )
diff --git a/packages/system-client/src/views/database/collections.vue b/packages/system-client/src/views/database/collections.vue
index 5aac071fee..0fd5e46406 100644
--- a/packages/system-client/src/views/database/collections.vue
+++ b/packages/system-client/src/views/database/collections.vue
@@ -4,15 +4,18 @@
     <div style="margin: 10px 0;">
       <el-input v-model.trim="listQuery._id" size="mini" placeholder="请输入_id查找" style="width:200px" :disabled="!collectionName" @keyup.enter.native="handleFilter" />
       <el-button size="mini" plain type="default" style="margin-left: 10px" icon="el-icon-search" :disabled="!collectionName" @click="handleFilter">搜索</el-button>
-      <el-button size="mini" plain type="primary" style="margin-left: 10px" @click="showIndexesList = true">新建集合</el-button>
+      <el-button size="mini" plain type="primary" style="margin-left: 10px" @click="showCreateCollectionForm = true">新建集合</el-button>
       <el-button size="mini" plain type="default" style="margin-left: 10px" :disabled="!collectionName" @click="showIndexesList = true">索引管理</el-button>
-      <el-button size="mini" plain type="default" style="margin-left: 10px" :disabled="!collectionName" @click="showIndexesList = true">集合结构</el-button>
+      <el-button size="mini" plain type="default" style="margin-left: 10px" :disabled="!collectionName" @click="handleShowCollectinoSchema">集合结构</el-button>
       <el-button size="mini" plain type="success" style="margin-left: 10px" icon="el-icon-plus" :disabled="!collectionName" @click="handleCreateRecord">添加记录</el-button>
 
     </div>
-    <el-container v-show="tabType === 'record'" style="height: calc(100vh - 200px); border: 1px solid #eee">
+    <el-container style="height: calc(100vh - 130px); border: 1px solid #eee">
       <el-aside width="240px" class="collection-list">
-        <div class="label">选择集合</div>
+        <div class="label">
+          选择集合
+          <el-button :loading="loading" size="medium" circle type="text" style="margin-left: 10px" icon="el-icon-refresh" @click="getCollections" />
+        </div>
         <el-radio-group v-model="collectionName" class="radio-group">
           <el-radio v-for="item in collections" :key="item.name" class="collection-radio" border size="medium" :label="item.name" />
         </el-radio-group>
@@ -47,7 +50,6 @@
       title="索引管理"
       size="50%"
       :visible.sync="showIndexesList"
-      :direction="direction"
     >
       <div>
         <div style="margin: 10px 0;">
@@ -74,12 +76,25 @@
       </div>
     </el-drawer>
 
+    <!-- 编辑集合数据结构 -->
+    <el-drawer
+      :title="'集合数据结构:' + collectionName"
+      size="50%"
+      :visible.sync="showCollectionSchemaForm"
+    >
+      <el-header>
+        <el-button :loading="loading" size="mini" type="primary" :disabled="!collectionName" @click="updateCollectionSchema">保存</el-button>
+      </el-header>
+      <el-main>
+        <json-editor v-model="collectionSchemaForm.schema" class="db-editor" :line-numbers="true" :dark="false" :height="600" />
+      </el-main>
+    </el-drawer>
+
     <!-- 添加/编辑文档表单 -->
     <el-drawer
       :title="formMode === 'edit' ? '编辑文档' : '添加文档'"
       size="50%"
       :visible.sync="showDocEditorForm"
-      :direction="direction"
     >
       <el-header>
         <el-button size="mini" type="primary" :disabled="!collectionName" @click="formMode === 'edit' ? updateDocument() : addDocument()">保存</el-button>
@@ -89,7 +104,26 @@
       </el-main>
     </el-drawer>
 
-    <!-- 索引dialog -->
+    <!-- 创建集合表单 -->
+    <el-dialog title="创建集合" :visible.sync="showCreateCollectionForm" width="500px">
+      <el-form :model="createCollectionForm" label-width="80px" style="width:460px">
+        <el-form-item label="集合名称">
+          <el-input v-model="createCollectionForm.collectionName" placeholder="请输入新集合名称" />
+        </el-form-item>
+      </el-form>
+      <div style="text-align:right;">
+        <el-button
+          size="mini"
+          type="default"
+          @click="showCreateCollectionForm = false"
+        >
+          取消
+        </el-button>
+        <el-button size="mini" type="primary" @click="handleCreateCollection">确认</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 创建索引表单 -->
     <el-dialog title="创建索引" :visible.sync="showCreateIndexDialog">
       <el-form :model="createIndexForm" label-width="100px" style="width:600px">
         <el-form-item label="索引名称">
@@ -120,9 +154,10 @@
 
 <script>
 
-import { getCollections, getCollectionIndexes, deleCollectionIndex, setCollectionIndexes, getDb } from '@/api/collec'
+import { getCollections, getCollectionIndexes, deleCollectionIndex, setCollectionIndexes, getDb, createCollection, updateCollection } from '@/api/collec'
 import JsonEditor from '@/components/JsonEditor/param'
 import MiniPagination from '@/components/Pagination/mini'
+import { showError, showSuccess } from '@/utils/show'
 
 const db = getDb()
 
@@ -133,9 +168,11 @@ export default {
   filters: {},
   data() {
     return {
+      loading: false,
       collections: [],
       collectionName: '',
-      tabType: 'record',
+
+      // 文档列表相关
       listQuery: {
         limit: 10,
         page: 1
@@ -143,13 +180,26 @@ export default {
       list: [],
       indexes: [],
       total: 0,
+
+      // 添加/编辑文档表单
       record: {},
-      // newRecord: {},
+      formMode: 'edit', // doc editor form mode
       showCreateIndexDialog: false,
       showDocEditorForm: false,
+      createIndexForm: {},
       showIndexesList: false,
-      formMode: 'edit',
-      createIndexForm: {}
+
+      // 创建集合表单
+      showCreateCollectionForm: false,
+      createCollectionForm: {
+        collectionName: ''
+      },
+
+      // 管理集合结构表单
+      showCollectionSchemaForm: false,
+      collectionSchemaForm: {
+        schema: null
+      }
     }
   },
   watch: {
@@ -165,7 +215,9 @@ export default {
   },
   methods: {
     async getCollections() {
+      this.loading = true
       const ret = await getCollections()
+        .finally(() => { this.loading = false })
       this.collections = ret || []
     },
 
@@ -199,12 +251,76 @@ export default {
 
       this.total = total
     },
+    async handleCreateCollection() {
+      const collectionName = this.createCollectionForm.collectionName
+      if (!collectionName) {
+        return showError('集合名不可为空')
+      }
 
+      await createCollection(collectionName)
+        .then(res => {
+          showSuccess('集合创建成功！')
+          this.getCollections()
+        })
+        .catch(err => {
+          console.error(err.response.data)
+          if (err.response?.data?.code === 'NamespaceExists') {
+            showError('错误：该集合已存在')
+          } else {
+            showError('创建集合失败: ' + err.response?.data?.error)
+          }
+        })
+        .finally(() => {
+          this.createCollectionForm.collectionName = ''
+          this.showCreateCollectionForm = false
+        })
+    },
+    async handleShowCollectinoSchema() {
+      const deulfaSchema = {
+        'bsonType': 'object',
+        'required': [],
+        'properties': {
+          '_id': {
+            'description': 'ID，系统自动生成'
+          }
+        }
+      }
+      // find the collection schema
+      const [collection] = this.collections.filter(coll => coll.name === this.collectionName)
+      if (!collection) return
+
+      const schema = collection.options?.validator?.$jsonSchema
+      this.collectionSchemaForm.schema = schema || deulfaSchema
+      this.showCollectionSchemaForm = true
+    },
+    async updateCollectionSchema() {
+      await this.$confirm('确认要更新集合结构？', '确认')
+      const collectionName = this.collectionName
+      if (!collectionName) return
+
+      const schema = this.collectionSchemaForm.schema
+      const schemaData = typeof schema === 'string' ? JSON.parse(schema) : schema
+
+      this.loading = true
+      await updateCollection(collectionName, schemaData)
+        .then(res => {
+          showSuccess('集合更新成功')
+          this.getCollections()
+        })
+        .catch(err => {
+          console.error(err.response.data)
+          showError('更新集合失败: ' + err.response?.data?.error)
+        })
+        .finally(() => { this.loading = false })
+    },
     getClass(val) {
       let record = this.record
       const isString = typeof (record) === 'string'
-
-      if (isString) record = JSON.parse(record)
+      try {
+        if (isString) record = JSON.parse(record)
+      } catch (error) {
+        return
+      }
 
       return val._id === record._id ? 'active' : ''
     },
@@ -214,8 +330,9 @@ export default {
       await db.collection(this.collectionName)
         .where({ _id: record._id })
         .remove()
-    },
 
+      this.getList()
+    },
     handleEditRecord(val) {
       this.record = val
       this.formMode = 'edit'
@@ -248,16 +365,13 @@ export default {
         const params = JSON.parse(this.record)
         const r = await db.collection(this.collectionName)
           .add({
-            ...params,
-            created_at: Date.now()
+            ...params
           })
 
-        if (!r.id) {
-          this.$notify({
-            type: 'error',
-            message: '创建失败！' + r.error
-          })
-          return
+        if (r.error) {
+          console.log(r.code)
+          const message = typeof r.error !== 'string' ? JSON.stringify(r.error) : r.error
+          return showError('创建失败: ' + message)
         }
 
         this.$notify({
@@ -282,7 +396,6 @@ export default {
       const ret = await getCollectionIndexes(this.collectionName)
       this.indexes = ret
     },
-
     /**
      * 删除索引
      */
@@ -312,7 +425,6 @@ export default {
       this.showCreateIndexDialog = false
       this.getIndexes()
     },
-
     handleCreateIndex() {
       this.showCreateIndexDialog = true
     }
@@ -360,7 +472,6 @@ export default {
     flex-direction: column;
     padding: 3px;
     width: 100%;
-    // height: calc(100vh - 200px);
     overflow-y: scroll;
 
     .record-item {
@@ -377,9 +488,6 @@ export default {
         width: 160px;
         text-align: right;
         padding-top: 15px;
-        .tools-btn {
-          // margin-left: 10px;
-        }
       }
     }
 
diff --git a/packages/system-server/src/router/dbm/create.ts b/packages/system-server/src/router/dbm/create.ts
new file mode 100644
index 0000000000..7af745df09
--- /dev/null
+++ b/packages/system-server/src/router/dbm/create.ts
@@ -0,0 +1,44 @@
+/*
+ * @Author: Maslow<wangfugen@126.com>
+ * @Date: 2021-08-30 16:26:26
+ * @LastEditTime: 2021-10-14 14:03:32
+ * @Description: 
+ */
+
+import { ApplicationStruct, getApplicationDbAccessor } from '../../api/application'
+import { checkPermission } from '../../api/permission'
+import { permissions } from '../../constants/permissions'
+import { Request, Response } from 'express'
+
+
+/**
+ * Create collection
+ */
+export async function handleCreateCollection(req: Request, res: Response) {
+  const uid = req['auth']?.uid
+  const app: ApplicationStruct = req['parsed-app']
+
+  // check permission
+  const code = await checkPermission(uid, permissions.DATABASE_MANAGE.name, app)
+  if (code) {
+    return res.status(code).send()
+  }
+
+  const collectionName = req.body?.collectionName
+  if (!collectionName) {
+    return res.status(422).send('collection name got empty')
+  }
+
+  const accessor = await getApplicationDbAccessor(app)
+
+  const db = accessor.db
+  try {
+    await db.createCollection(collectionName)
+    return res.send({ code: 0, data: 'ok' })
+  } catch (error) {
+    return res.status(400).send({
+      error: error.message,
+      code: error.codeName
+    })
+  }
+}
\ No newline at end of file
diff --git a/packages/system-server/src/router/dbm/get.ts b/packages/system-server/src/router/dbm/get.ts
index 6d5bfed078..fb0272685d 100644
--- a/packages/system-server/src/router/dbm/get.ts
+++ b/packages/system-server/src/router/dbm/get.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: Maslow<wangfugen@126.com>
  * @Date: 2021-08-30 16:26:26
- * @LastEditTime: 2021-10-13 21:30:55
+ * @LastEditTime: 2021-10-14 12:25:19
  * @Description: 
  */
 
@@ -27,10 +27,6 @@ export async function handleCollectionList(req: Request, res: Response) {
   const accessor = await getApplicationDbAccessor(app)
 
   const collections = await accessor.db.listCollections().toArray()
-  const names = collections
-    .filter(coll => !coll.name.startsWith('__'))
-    // .map(coll => coll.name)
-    .sort()
-
-  return res.send(names)
+  const result = collections.filter(coll => !coll.name.startsWith('__'))
+  return res.send(result)
 }
\ No newline at end of file
diff --git a/packages/system-server/src/router/dbm/index.ts b/packages/system-server/src/router/dbm/index.ts
index f0245ccff7..5088d38df0 100644
--- a/packages/system-server/src/router/dbm/index.ts
+++ b/packages/system-server/src/router/dbm/index.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: Maslow<wangfugen@126.com>
  * @Date: 2021-07-30 10:30:29
- * @LastEditTime: 2021-08-30 16:34:17
+ * @LastEditTime: 2021-10-14 13:11:48
  * @Description: 
  */
 
@@ -11,6 +11,8 @@ import { handleCollectionList } from './get'
 import { handleGetIndexesOfCollection } from './get-indexes'
 import { handleCreateIndex } from './add-index'
 import { handleDeleteIndex } from './delete-index'
+import { handleCreateCollection } from './create'
+import { handleUpdateCollection } from './update'
 
 export const DbmRouter = express.Router()
 
@@ -24,6 +26,15 @@ DbmRouter.post('/entry', handleDbProxy)
  */
 DbmRouter.get('/collections', handleCollectionList)
 
+/**
+ * Create collection
+ */
+DbmRouter.post('/collections', handleCreateCollection)
+
+/**
+ * Update collection
+ */
+DbmRouter.put('/collections', handleUpdateCollection)
 
 /**
  * Get indexes of collection
diff --git a/packages/system-server/src/router/dbm/proxy.ts b/packages/system-server/src/router/dbm/proxy.ts
index cded8b6387..6e70aba9d9 100644
--- a/packages/system-server/src/router/dbm/proxy.ts
+++ b/packages/system-server/src/router/dbm/proxy.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: Maslow<wangfugen@126.com>
  * @Date: 2021-08-30 16:26:26
- * @LastEditTime: 2021-10-13 15:17:27
+ * @LastEditTime: 2021-10-14 14:30:41
  * @Description: 
  */
 
@@ -42,8 +42,15 @@ export async function handleDbProxy(req: Request, res: Response) {
       data
     })
   } catch (error) {
+    if (error.code === 121) {
+      const errs = error.errInfo?.details?.schemaRulesNotSatisfied
+      return res.send({
+        code: error.code,
+        error: errs,
+      })
+    }
     return res.send({
-      code: 1,
+      code: error.code || 1,
       error: error
     })
   }
diff --git a/packages/system-server/src/router/dbm/update.ts b/packages/system-server/src/router/dbm/update.ts
new file mode 100644
index 0000000000..cc903cfc2d
--- /dev/null
+++ b/packages/system-server/src/router/dbm/update.ts
@@ -0,0 +1,62 @@
+/*
+ * @Author: Maslow<wangfugen@126.com>
+ * @Date: 2021-08-30 16:26:26
+ * @LastEditTime: 2021-10-14 14:27:34
+ * @Description: 
+ */
+
+import { ApplicationStruct, getApplicationDbAccessor } from '../../api/application'
+import { checkPermission } from '../../api/permission'
+import { permissions } from '../../constants/permissions'
+import { Request, Response } from 'express'
+
+
+/**
+ * Update collection
+ */
+export async function handleUpdateCollection(req: Request, res: Response) {
+  const uid = req['auth']?.uid
+  const app: ApplicationStruct = req['parsed-app']
+
+  // check permission
+  const code = await checkPermission(uid, permissions.DATABASE_MANAGE.name, app)
+  if (code) {
+    return res.status(code).send()
+  }
+
+  const collectionName = req.body?.collectionName
+  if (!collectionName) {
+    return res.status(422).send('collection name got empty')
+  }
+
+  const options = req.body?.options || {}
+  const accessor = await getApplicationDbAccessor(app)
+
+  const db = accessor.db
+  const command = {
+    collMod: collectionName,
+    validationAction: 'error'
+  }
+
+  if (options?.validatorSchema) {
+    command['validator'] = {
+      $jsonSchema: options.validatorSchema
+    }
+  }
+
+  if (['strict', 'off', 'moderate'].includes(options?.validationLevel)) {
+    command['validationLevel'] = options.validationLevel
+  } else {
+    command['validationLevel'] = 'strict'
+  }
+
+  try {
+    await db.command(command)
+    return res.send({ code: 0, data: 'ok' })
+  } catch (error) {
+    return res.status(400).send({
+      error: error.message,
+      code: error.codeName
+    })
+  }
+}
\ No newline at end of file