fix(2878): return meta for metrics (#581)

Author: klu909

lib/buildFactory.js

@@ -349,6 +349,12 @@ class BuildFactory extends BaseFactory {
             jobIds.forEach(jobId => {
                 const jobBuilds = builds[0].filter(b => b.jobId === jobId);
 
+                jobBuilds.forEach(build => {
+                    if (build.meta) {
+                        build.meta = JSON.parse(build.meta);
+                    }
+                });
+
                 result.push({
                     jobId,
                     builds: jobBuilds

lib/event.js

@@ -64,7 +64,7 @@ class EventModel extends BaseModel {
 
         // Generate metrics
         const metrics = builds.map(b => {
-            const { id, jobId, eventId, createTime, status, startTime, endTime, stats } = b;
+            const { id, jobId, eventId, createTime, status, startTime, endTime, stats, meta } = b;
             const duration = findDuration(startTime, endTime);
             let queuedTime;
             let imagePullTime;
@@ -87,7 +87,8 @@ class EventModel extends BaseModel {
                 duration,
                 status,
                 queuedTime,
-                imagePullTime
+                imagePullTime,
+                meta
             };
         });
 

lib/rawQueries.js

@@ -2,16 +2,16 @@
 
 const Queries = {
     // getBuildStatuses()
-    getStatusesQuery: (tablePrefix = '') => `SELECT "id", "jobId", "status", "startTime", "endTime"
-        FROM (SELECT "id", "jobId", "status", "startTime", "endTime",
+    getStatusesQuery: (tablePrefix = '') => `SELECT "id", "jobId", "status", "startTime", "endTime", "meta"
+        FROM (SELECT "id", "jobId", "status", "startTime", "endTime", "meta",
         RANK() OVER ( PARTITION BY "jobId" ORDER BY "id" DESC ) AS rank
         FROM "${tablePrefix}builds" WHERE "jobId" in (:jobIds)) as R
         WHERE rank > :offset AND rank <= :maxRank
         ORDER BY "jobId", "id" ASC`,
 
-    getStatusesQueryMySql: (tablePrefix = '') => `SELECT id, jobId, status, startTime, endTime FROM (
+    getStatusesQueryMySql: (tablePrefix = '') => `SELECT id, jobId, status, startTime, endTime, meta FROM (
         SELECT
-            id, jobId, status, startTime, endTime,
+            id, jobId, status, startTime, endTime, meta,
             IF(jobId=@lastJobId,
                 IF(id=@lastId,@curRank:=@curRank,@curRank:=@_sequence),
             @_sequence:=1) AS rank,

test/lib/event.test.js

@@ -122,7 +122,10 @@ describe('Event Model', () => {
             createTime: '2019-01-22T21:00:00.000Z',
             startTime: '2019-01-22T21:08:00.000Z',
             endTime: '2019-01-22T21:30:00.000Z',
-            status: 'SUCCESS'
+            status: 'SUCCESS',
+            meta: {
+                foo: 'bar'
+            }
         };
         const build2 = {
             id: 12,
@@ -135,6 +138,9 @@ describe('Event Model', () => {
             stats: {
                 queueEnterTime: '2019-01-22T21:02:00.000Z',
                 imagePullStartTime: '2019-01-22T21:10:00.000Z'
+            },
+            meta: {
+                foo: 'bar'
             }
         };
         const duration1 = (new Date(build1.endTime) - new Date(build1.startTime)) / 1000;
@@ -153,7 +159,8 @@ describe('Event Model', () => {
                     status: build1.status,
                     duration: duration1,
                     imagePullTime: undefined,
-                    queuedTime: undefined
+                    queuedTime: undefined,
+                    meta: build1.meta
                 },
                 {
                     id: build2.id,
@@ -165,7 +172,8 @@ describe('Event Model', () => {
                     status: build2.status,
                     duration: duration2,
                     imagePullTime: 600,
-                    queuedTime: 480
+                    queuedTime: 480,
+                    meta: build2.meta
                 }
             ];
         });
@@ -203,6 +211,7 @@ describe('Event Model', () => {
                 params: {
                     eventId: 1234
                 },
+
                 sort: 'ascending',
                 sortBy: 'id',
                 readOnly: true