feat(collections): Revert "fix: Revert "feat(collections): Add lastBu…

…ilds to pipeline" (#175)" (#176) BREAKING CHANGE: This reverts commit 2595480.
screwdriver-cd · Aug 22, 2017 · a061a52 · a061a52
1 parent 2595480
commit a061a52
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/models/collection.js b/models/collection.js
@@ -3,8 +3,12 @@
 const Joi = require('joi');
 const mutate = require('../lib/mutate');
 
+const BUILD_MODEL = require('./build').get;
 const PIPELINE_MODEL = require('./pipeline').get;
-const PIPELINES_MODEL = Joi.array().items(PIPELINE_MODEL);
+const PIPELINE_OBJECT = PIPELINE_MODEL.keys({
+    lastBuilds: Joi.array().items(BUILD_MODEL).optional()
+});
+const PIPELINES_MODEL = Joi.array().items(PIPELINE_OBJECT);
 const MODEL = {
     id: Joi
         .number()
@@ -53,6 +57,7 @@ module.exports = {
     get: Joi.object(mutate(GET_MODEL, [
         'id',
         'name',
+        'pipelineIds',
         'pipelines'
     ], [
         'description'

diff --git a/models/pipeline.js b/models/pipeline.js
@@ -48,7 +48,11 @@ const MODEL = {
         .description('Current workflow of the pipeline'),
 
     annotations: Annotations.annotations
-        .description('Pipeline-level annotations')
+        .description('Pipeline-level annotations'),
+
+    lastEventId: Joi.number().integer().positive()
+        .description('Identifier of last event')
+        .example(123345)
 };
 
 module.exports = {
@@ -69,7 +73,7 @@ module.exports = {
     get: Joi.object(mutate(MODEL, [
         'id', 'scmUri', 'scmContext', 'createTime', 'admins'
     ], [
-        'workflow', 'scmRepo', 'annotations'
+        'workflow', 'scmRepo', 'annotations', 'lastEventId'
     ])).label('Get Pipeline'),
 
     /**

diff --git a/test/data/collection.get.yaml b/test/data/collection.get.yaml
@@ -2,6 +2,7 @@
 id: 123
 name: 'Screwdriver'
 description: 'Collection of screwdriver related pipelines'
+pipelineIds: [12742, 12576]
 pipelines:
     - id: 12742
       scmUri: github.com:12345678:master
@@ -22,6 +23,21 @@ pipelines:
           - OSX-SIERRA
         screwdriver.cd/notify.email: foo@example.com
         beta.screwdriver.cd/auto_pr_builds: fork-only
+      lastBuilds:
+        - id: 123345
+          eventId: 12351523
+          jobId: 123415
+          number: 1473900790309
+          cause: Commit ccc493 was pushed to master
+          status: SUCCESS
+          createTime: "2017-08-21"
+        - id: 123346
+          eventId: 12351523
+          jobId: 123416
+          number: 1473900790309
+          cause: Commit ccc493 was pushed to master
+          status: SUCCESS
+          createTime: "2017-08-21"
     - id: 12576
       scmUri: github.com:87654321:master
       scmContext: github:github.com

diff --git a/test/data/pipeline.get.yaml b/test/data/pipeline.get.yaml
@@ -18,3 +18,4 @@ annotations:
         - OSX-SIERRA
     screwdriver.cd/notify.email: foo@example.com
     beta.screwdriver.cd/auto_pr_builds: fork-only
+lastEventId: 31135214