Add project id to app response

6 files changed, 8 insertions, 0 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 1ef2ec4d3cf..2c5bbef1e70 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -396,6 +396,9 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
                    .map(run -> run.application().source())
                    .ifPresent(source -> sourceRevisionToSlime(source, object.setObject("source")));
 
+        application.deploymentJobs().projectId()
+                   .ifPresent(id -> object.setLong("projectId", id));
+
         // Currently deploying change
         if (application.change().isPresent()) {
             toSlime(object.setObject("deploying"), application.change());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 33ac089439c..e65e0b62e1b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -97,6 +97,7 @@ import static org.junit.Assert.assertTrue;
  * @author bratseth
  * @author mpolden
  * @author bjorncs
+ * @author jonmv
  */
 public class ApplicationApiTest extends ControllerContainerTest {
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json
index 5c770ab9379..417fdce7550 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json
@@ -7,6 +7,7 @@
     "gitBranch": "master",
     "gitCommit": "commit1"
   },
+  "projectId": 1,
   "deployedInternally": false,
   "deploymentJobs": [
     {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json
index 39fc7d8e6dd..1fc61d92f40 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json
@@ -7,6 +7,7 @@
     "gitBranch": "master",
     "gitCommit": "commit1"
   },
+  "projectId": 123,
   "deploying": {
     "revision": {
       "hash": "(ignore)",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json
index e7301136ee9..75dd484866f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json
@@ -7,6 +7,7 @@
     "gitBranch": "master",
     "gitCommit": "commit1"
   },
+  "projectId": 123,
   "deploying": {
     "revision": {
       "hash": "(ignore)",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
index c1c133dface..2c34e5ae712 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
@@ -7,6 +7,7 @@
     "gitBranch": "master",
     "gitCommit": "commit1"
   },
+  "projectId": 456,
   "deploying": {
     "version": "(ignore)"
   },