From 9312e5a69389a7560267d0c30e606d1119ef02c5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Lesaint?=
 <sebastien.lesaint@sonarsource.com>
Date: Wed, 11 Jan 2017 11:40:20 +0100
Subject: [PATCH] SONAR-8595 add organization to api/components/search_projects
 response

---
 .../component/ws/SearchProjectsAction.java    |  1 +
 .../component/ws/search_projects-example.json |  3 +++
 .../src/main/protobuf/ws-components.proto     | 23 ++++++++++---------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
index 4322d6a082f..ddf1598562c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java
@@ -270,6 +270,7 @@ public class SearchProjectsAction implements ComponentsWsAction {
     public Component apply(ComponentDto dbComponent) {
       wsComponent
         .clear()
+        .setOrganization(dbComponent.getOrganizationKey())
         .setId(dbComponent.uuid())
         .setKey(dbComponent.key())
         .setName(dbComponent.name());
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json b/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json
index 4dead04eec0..7a37aabb71b 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/component/ws/search_projects-example.json
@@ -6,18 +6,21 @@
   },
   "components": [
     {
+      "organization": "my-org-key-1",
       "id": "AU-Tpxb--iU5OvuD2FLy",
       "key": "my_project",
       "name": "My Project 1",
       "isFavorite": true
     },
     {
+      "organization": "my-org-key-1",
       "id": "AU-TpxcA-iU5OvuD2FLz",
       "key": "another_project",
       "name": "My Project 2",
       "isFavorite": false
     },
     {
+      "organization": "my-org-key-2",
       "id": "AU-TpxcA-iU5OvuD2FL0",
       "key": "third_project",
       "name": "My Project 3",
diff --git a/sonar-ws/src/main/protobuf/ws-components.proto b/sonar-ws/src/main/protobuf/ws-components.proto
index b0659973fe0..fdf92f4dbae 100644
--- a/sonar-ws/src/main/protobuf/ws-components.proto
+++ b/sonar-ws/src/main/protobuf/ws-components.proto
@@ -65,15 +65,16 @@ message SearchProjectsWsResponse {
 }
 
 message Component {
-  optional string id = 1;
-  optional string key = 2;
-  optional string refId = 3;
-  optional string refKey = 4;
-  optional string projectId = 5;
-  optional string name = 6;
-  optional string description = 7;
-  optional string qualifier = 8;
-  optional string path = 9;
-  optional string language = 10;
-  optional bool isFavorite = 11;
+  optional string organization = 1;
+  optional string id = 2;
+  optional string key = 3;
+  optional string refId = 4;
+  optional string refKey = 5;
+  optional string projectId = 6;
+  optional string name = 7;
+  optional string description = 8;
+  optional string qualifier = 9;
+  optional string path = 10;
+  optional string language = 11;
+  optional bool isFavorite = 12;
 }
-- 
2.39.5