q-koa 13.2.3 → 13.2.5

package/core/file/plugins/system/controller.js

@@ -21,25 +21,72 @@ const isSameArray = (_arr1 = [], _arr2 = [], deep = true) => {
   )
 }
 const compareIndex = (tableIndexList, modelIndexList = [], model) => {
-  const flag =
-    tableIndexList
-      .filter((i) => i.name !== 'PRIMARY')
-      .filter((i) => {
-        return !(
-          ((i.name.startsWith(model) &&
-            i.fields.every((f) => i.name.includes(f))) ||
-            modelIndexList
-              .filter((i) => i.name !== 'PRIMARY')
-              .some((m) => m.name === i.name)) &&
-          modelIndexList
-            .filter((i) => i.name !== 'PRIMARY')
-            .some((m) => isSameArray(m.fields, i.fields, true))
-        )
-      }).length === 0 &&
-    tableIndexList.filter((i) => i.name !== 'PRIMARY').length ===
-      modelIndexList.filter((i) => i.name !== 'PRIMARY').length
+  const sameObject = (obj1, obj2) => {
+    return isSameArray(obj1.fields, obj2.fields, true)
+  }
+  tableIndexList = lodash.cloneDeep(
+    tableIndexList.filter((i) => i.name !== 'PRIMARY')
+  )
+  modelIndexList = lodash.cloneDeep(
+    modelIndexList.filter((i) => i.name !== 'PRIMARY')
+  )
+  if (tableIndexList.length === 0 && modelIndexList.length === 0) {
+    return {
+      isSame: true,
+      current: [],
+      remote: [],
+    }
+  }
+
+  const flag = tableIndexList.every((i) => {
+    return modelIndexList.some((m) => isSameArray(m.fields, i.fields, true))
+  })
+
+  const intersection = lodash.intersectionWith(
+    tableIndexList,
+    modelIndexList,
+    sameObject
+  )
+
+  const remote = tableIndexList
+    .filter((i) => {
+      return !intersection.some((inter) =>
+        isSameArray(inter.fields, i.fields, true)
+      )
+    })
+    .map((i) => lodash.pick(i, ['fields', 'name']))
+
+  const current = modelIndexList
+    .filter((i) => {
+      return !intersection.some((inter) =>
+        isSameArray(inter.fields, i.fields, true)
+      )
+    })
+    .map((i) => lodash.pick(i, ['fields', 'name']))
 
-  return flag
+  return { isSame: flag, remote, current }
+}
+
+exports.countAndMaxId = async (ctx, _data) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const { model } = ctx.request.body
+  if (!model) {
+    ctx.SUCCESS(null)
+    return null
+  }
+  const count = await app.model[model].count()
+  const result = await app.model[model].findOne({
+    attributes: ['id'],
+    order: [['id', 'DESC']],
+  })
+
+  const payLoad = {
+    count,
+    max_id: result ? result.id : 0,
+  }
+
+  ctx.SUCCESS(payLoad)
+  return payLoad
 }
 
 exports.initModel = async (ctx) => {
@@ -793,15 +840,12 @@ exports.checkIndex = async (ctx) => {
         })
         const modelIndexList = app.config[current].indexList
 
-        const isSame = compareIndex(tableIndexList, modelIndexList, current)
-        if (isSame) {
+        const compareResult = compareIndex(tableIndexList, modelIndexList)
+        if (compareResult.isSame) {
         } else {
           res = {
             ...res,
-            [current]: {
-              isSame,
-              indexList: tableIndexList.filter((i) => i.name !== 'PRIMARY'),
-            },
+            [current]: compareResult,
           }
         }
       } catch (e) {
@@ -817,13 +861,9 @@ exports.checkIndex = async (ctx) => {
 
     const modelIndexList = app.config[model].indexList
 
-    const isSame = compareIndex(tableIndexList, modelIndexList, model)
-    return ctx.SUCCESS({
-      isSame,
-      ...(isSame
-        ? {}
-        : { indexList: tableIndexList.filter((i) => i.name !== 'PRIMARY') }),
-    })
+    const compareResult = compareIndex(tableIndexList, modelIndexList)
+
+    return ctx.SUCCESS(compareResult)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.2.3",
+  "version": "13.2.5",
   "description": "",
   "main": "index.js",
   "scripts": {