保存触发

app/controller/pipeline.js

@@ -21,21 +21,57 @@ const awaitRequest = function (options) {
     })
   })
 }
+
+const jenkinsBuild = async function (gitObject, gitUser, commitMes, timestamp) {
+  logger.info('执行jenkins', gitObject, gitUser)
+  const res = await jenkinsService.build_with_params(`tke-${gitObject.type}`, {
+    depth: 1,
+    GIT_REPO: `${gitObject.groupName}/${gitObject.repository}`,
+    BRANCH_NAME: gitObject.ref.name,
+    IS_DEPLOY: 'false',
+    IMAGE_REPOSITORY: `ccr.ccs.tencentyun.com/qa-${gitObject.type}`,
+  })
+  let flag = true
+  while (flag) {
+    const apiJson = await jenkinsService.queue_item(res.queueId);
+    if (apiJson.executable) {
+      flag = false
+      const store = {
+        buildId: apiJson.executable.number,
+        branchName: gitObject.ref.name,
+        commitMes,
+        projectName: gitObject.repository,
+        gitUser,
+        gitEventTime: timestamp,
+      }
+      await PipeLinePush.savePipesPush(store)
+    }
+  }
+}
+
 const webhooks = async function (ctx) {
-  logger.info('webhooks', ctx.request.body)
+  const req = ctx.request.body
+  logger.info('webhooks', req)
+
+  // user_add_to_team之类的操作
+  if (req.enent_name !== 'push') {
+    logger.info(`enent_name 是 ${req.enent_name}`)
+    ctx.body = ctx.ok(`enent_name 是 ${req.enent_name}`)
+    return
+  }
 
   // 增删分支之类的push
-  if (ctx.request.body.commits.length === 0) {
-    logger.info(`${ctx.request.body.repository.name} ${ctx.request.body.ref} 没有commits`)
-    ctx.body = ctx.ok(`${ctx.request.body.repository.name}  ${ctx.request.body.ref} 没有commits`)
+  if (req.commits.length === 0) {
+    logger.info(`${req.repository.name} ${req.ref} 没有commits`)
+    ctx.body = ctx.ok(`${req.repository.name}  ${req.ref} 没有commits`)
     return
   }
 
-  const projectName = ctx.request.body.repository.name
-  const arr = ctx.request.body.ref.split('/')
-  const gitUser = ctx.request.body.user_name
-  const commitMes = ctx.request.body.commits[0].message
-  const timestamp = ctx.request.body.commits[0].timestamp
+  const projectName = req.repository.name
+  const arr = req.ref.split('/')
+  const gitUser = req.user_name
+  const commitMes = req.commits[0].message
+  const timestamp = req.commits[0].timestamp
   const branchName = arr[arr.length - 1]
 
   logger.info(`收到webhooks->>>项目名:${projectName}分支名:${branchName}`)
@@ -52,33 +88,11 @@ const webhooks = async function (ctx) {
     }
   }
   if (gitObject == null || gitObject === undefined) {
-    logger.info(`未获取到订阅信息->>>项目名:${projectName}分支名:${branchName}`)
-    ctx.body = ctx.ok(`未获取到订阅信息->>>项目名:${projectName}分支名:${branchName}`)
+    logger.info(`未查询到订阅信息->>>项目名:${projectName}分支名:${branchName}`)
   } else {
-    const res = await jenkinsService.build_with_params(`tke-${gitObject.type}`, {
-      depth: 1,
-      GIT_REPO: `${gitObject.groupName}/${projectName}`,
-      BRANCH_NAME: gitObject.ref.name,
-      IS_DEPLOY: 'false',
-      IMAGE_REPOSITORY: `ccr.ccs.tencentyun.com/qa-${gitObject.type}`,
-    })
-    let flag = true
-    while (flag) {
-      const apiJson = await jenkinsService.queue_item(res.queueId);
-      if (apiJson.executable) {
-        flag = false
-        const store = {
-          buildId: apiJson.executable.number,
-          branchName,
-          commitMes,
-          projectName,
-          gitUser,
-          gitEventTime: timestamp,
-        }
-        await PipeLinePush.savePipesPush(store)
-      }
-    }
+    await jenkinsBuild(gitObject, gitUser, commitMes, timestamp)
   }
+
   ctx.body = ctx.ok('success')
 }
 
@@ -110,11 +124,17 @@ const findPipes = async function (ctx) {
   const data = await PipeLine.getPipes(ctx.request.body)
   ctx.body = ctx.ok(data)
 }
+
 const save = async function (ctx) {
   const data = ctx.request.body
   await PipeLine.savePipes(data)
+  for (const item of data.repos) {
+    logger.info('save pipeline application', item)
+    jenkinsBuild(item, 'qahome', 'save pipeline application', moment().format('YYYY-MM-DD HH:mm:ss'))
+  }
   ctx.body = ctx.ok('ok')
 }
+
 const deletePipes = async function (ctx) {
   const id = ctx.request.body.id
   const res = await PipeLine.delete(id)

app/model/mongo/qa_api/StatisticsLog.js

@@ -48,7 +48,7 @@ schema.statics.getLog = function (query, sort, num, count) {
 
 schema.statics.getLogCount = function (query) {
   query = queryHandle(query)
-  return this.find(query).count()
+  return this.find(query).countDocuments()
 }
 
 module.exports = schema