feat(server): add commitedAt and ancestorCommittedAt

packages/cli/src/upload/upload.js

@@ -83,17 +83,13 @@ function getCurrentHash() {
 }
 
 /**
- * @param {string} currentHash
+ * @param {string} hash
  * @return {string}
  */
-function getCommitTime(currentHash) {
-  const result = childProcess.spawnSync(
-    'git',
-    ['log', '-n1', '-pretty="format:%cI"', currentHash],
-    {
-      encoding: 'utf8',
-    }
-  );
+function getCommitTime(hash) {
+  const result = childProcess.spawnSync('git', ['log', '-n1', '-pretty="format:%cI"', hash], {
+    encoding: 'utf8',
+  });
   if (result.status !== 0) {
     throw new Error('Unable to retrieve committer timestamp from commit');
   }
@@ -194,7 +190,7 @@ function getAncestorHashForBranch() {
   });
 
   if (result.status !== 0) {
-    throw new Error('Unable to determine current hash with `git merge-base HEAD master`');
+    throw new Error('Unable to determine ancestor hash with `git merge-base HEAD master`');
   }
 
   return result.stdout.trim();
@@ -331,19 +327,22 @@ async function runLHCITarget(options) {
 
   const hash = getCurrentHash();
   const branch = getCurrentBranch();
+  const ancestorHash =
+    branch === 'master' ? getAncestorHashForMaster() : getAncestorHashForBranch();
 
   const build = await api.createBuild({
     projectId: project.id,
     lifecycle: 'unsealed',
     hash,
     branch,
+    ancestorHash,
     commitMessage: getCommitMessage(hash),
     author: getAuthor(hash),
-    committedAt: getCommitTime(hash),
     avatarUrl: getAvatarUrl(hash),
-    ancestorHash: branch === 'master' ? getAncestorHashForMaster() : getAncestorHashForBranch(),
     externalBuildUrl: getExternalBuildUrl(),
     runAt: new Date().toISOString(),
+    committedAt: getCommitTime(hash),
+    ancestorCommittedAt: getCommitTime(ancestorHash),
   });
 
   print(`Saving CI project ${project.name} (${project.id})\n`);

packages/server/src/api/storage/sql/build-model.js

@@ -25,6 +25,8 @@ const attributes = {
   ancestorHash: {type: Sequelize.STRING(40)},
   externalBuildUrl: {type: Sequelize.STRING(256)},
   runAt: {type: Sequelize.DATE()}, // should mostly be equal to createdAt but modifiable by the consumer
+  committedAt: {type: Sequelize.DATE()},
+  ancestorCommittedAt: {type: Sequelize.DATE()},
 };
 
 module.exports = {

packages/server/src/api/storage/sql/migrations/20191029-committed-at.js

@@ -0,0 +1,26 @@
+/**
+ * @license Copyright 2019 Google Inc. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+'use strict';
+
+/* eslint-disable new-cap */
+
+module.exports = {
+  /**
+   * @param {import('sequelize').QueryInterface} queryInterface
+   * @param {typeof import('sequelize')} Sequelize
+   */
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.addColumn('builds', 'committedAt', {type: Sequelize.DATE()});
+    await queryInterface.addColumn('builds', 'ancestorCommittedAt', {type: Sequelize.DATE()});
+  },
+  /**
+   * @param {import('sequelize').QueryInterface} queryInterface
+   */
+  down: async queryInterface => {
+    await queryInterface.removeColumn('builds', 'committedAt');
+    await queryInterface.removeColumn('builds', 'ancestorCommittedAt');
+  },
+};

packages/server/test/server-test-suite.js

@@ -91,6 +91,8 @@ function runTests(state) {
         commitMessage: 'feat: add some awesome features',
         ancestorHash: '0ed0fdcfdce0acdd5eb2508498be50cc55c696ea',
         runAt: new Date().toISOString(),
+        committedAt: new Date().toISOString(),
+        ancestorCommittedAt: new Date().toISOString(),
       };
 
       buildA = await client.createBuild(payload);
@@ -111,6 +113,8 @@ function runTests(state) {
         commitMessage: 'feat: add some more awesome features',
         ancestorHash: buildA.hash,
         runAt: new Date().toISOString(),
+        committedAt: new Date().toISOString(),
+        ancestorCommittedAt: new Date().toISOString(),
       };
 
       buildB = await client.createBuild(payload);
@@ -131,6 +135,8 @@ function runTests(state) {
         commitMessage: 'feat: a branch without an ancestor',
         ancestorHash: '',
         runAt: new Date().toISOString(),
+        committedAt: new Date().toISOString(),
+        ancestorCommittedAt: new Date().toISOString(),
       };
 
       buildC = await client.createBuild(payload);
@@ -151,6 +157,8 @@ function runTests(state) {
         commitMessage: 'feat: initial commit',
         ancestorHash: '',
         runAt: new Date().toISOString(),
+        committedAt: new Date().toISOString(),
+        ancestorCommittedAt: new Date().toISOString(),
       };
 
       buildD = await client.createBuild(payload);

types/server.d.ts

@@ -36,9 +36,10 @@ declare global {
         author?: string;
         avatarUrl?: string;
         ancestorHash?: string;
+        committedAt?: string;
+        ancestorCommittedAt?: string;
         createdAt?: string;
         updatedAt?: string;
-        committedAt?: string;
       }
 
       export interface Run {