sonar FAILED

app/controller/pipeline.js

@@ -103,7 +103,7 @@ const webhooks = async function (ctx) {
     return
   }
 
-  const gitUser = req.user_username
+  const gitUser = req.user_username || req.user_email.split('@')[0]
   const commitMes = req.commits[req.commits.length - 1].message
 
   // const project = await ProConfig.getOneProject({ project_name: projectName })

app/controller/sonar.js

@@ -93,6 +93,11 @@ const callback = async (ctx) => {
       executionTimeMs = ceTaskResult.task.executionTimeMs
       flag = false
     }
+    if (ceTaskResult.task.status === 'FAILED') {
+      executionTimeMs = ceTaskResult.task.executionTimeMs
+      data.sonarResult = ceTaskResult.task.status
+      flag = false
+    }
     await sleep(2 * 1000)
   }
   const res = await awaitRequest({
@@ -105,17 +110,11 @@ const callback = async (ctx) => {
       logger.info(data.projectName, '触发质量阀，发送邮件通知')
       sendFailMail(data, i, executionTimeMs)
     }
-    data.buildResult = 'success'
     data.sonarResult = i.status.qualityGateStatus
     data.analysisDate = i.analysisDate
-    // const sonarJob = await SonarJob.getOneSonarJob({ branchHash: data.branchHash })
-    // if (sonarJob) {
-    //   await SonarJob.updateSonarJob(data)
-    // } else {
-    //   await SonarJob.saveSonarJob(data)
-    // }
-    await saveData(data)
   }
+  data.buildResult = 'success'
+  await saveData(data)
   ctx.body = ctx.ok(data)
 }
 
@@ -142,6 +141,12 @@ const queryHandle = function (query) {
   } else {
     delete query.gitUser
   }
+
+  if (query.startDate) {
+    Object.assign(query, { createdAt: { $gte: query.startDate, $lte: query.endDate } })
+    delete query.startDate
+    delete query.endDate
+  }
 }
 
 
@@ -149,10 +154,7 @@ const getSonarJob = async (ctx) => {
   const query = ctx.request.body.query
   const page = ctx.request.body.page
   queryHandle(query)
-  const curDate = new Date()
-  const date = new Date(curDate.getTime() - 3 * 24 * 60 * 60 * 1000)
-  Object.assign(query, { updatedAt: { $gte: date } })
-  const data = await SonarJob.getSonarJob(query, { _id: 0 }, { updatedAt: -1 }, page)
+  const data = await SonarJob.getSonarJob(query, { _id: 0 }, { createdAt: -1 }, page)
   const count = await SonarJob.getSonarJobCount(query)
   ctx.body = ctx.ok({ data, count })
 }
@@ -160,7 +162,7 @@ const getSonarJob = async (ctx) => {
 const fetchQuality = async (ctx) => {
   const req = ctx.request.body
   const query = {
-    updatedAt: { $gte: req.startDate, $lte: req.endDate },
+    createdAt: { $gte: req.startDate, $lte: req.endDate },
   }
   if (req.repository) {
     query.projectName = req.repository