fix Coupa instance creation

peter-plochan · peter-plochan · commit 04676f7d14c6 · 2017-06-21T11:28:41.000+02:00
diff --git a/src/main/java/com/gooddata/connector/ConnectorService.java b/src/main/java/com/gooddata/connector/ConnectorService.java
@@ -176,12 +176,22 @@ public CoupaInstance createCoupaInstance(Project project, CoupaInstance instance
         notNull(project, "project");
         notNull(instance, "instance");
 
+        //POST request for creating Coupa instance returns created instance URI as response
+        final UriResponse instanceUri;
         try {
-            return restTemplate.postForObject(CoupaInstances.URL, instance, CoupaInstance.class, project.getId());
+            instanceUri = restTemplate.postForObject(CoupaInstances.URL, instance, UriResponse.class,
+                    project.getId());
         } catch (GoodDataRestException | RestClientException e) {
             throw new ConnectorException("Unable to create Coupa instance with API URL '" + instance.getApiUrl() +
                     "'", e);
         }
+
+        try {
+            return restTemplate.getForObject(instanceUri.getUri(), CoupaInstance.class);
+        } catch (GoodDataRestException | RestClientException e) {
+            throw new ConnectorException("Unable to get created Coupa instance with URI '" + instanceUri.getUri() +
+                    "'", e);
+        }
     }
 
     /**
diff --git a/src/test/java/com/gooddata/connector/ConnectorServiceIT.java b/src/test/java/com/gooddata/connector/ConnectorServiceIT.java
@@ -246,6 +246,13 @@ public void shouldCreateCoupaInstance() throws Exception {
         onRequest()
                 .havingMethodEqualTo("POST")
                 .havingPathEqualTo("/gdc/projects/PROJECT_ID/connectors/coupa/integration/config/settings/instances")
+             .respond()
+                .withStatus(201)
+                .withBody("{\"uri\":\"/gdc/projects/PROJECT_ID/connectors/coupa/integration/config/settings/instances/123\"}");
+
+        onRequest()
+                .havingMethodEqualTo("GET")
+                .havingPathEqualTo("/gdc/projects/PROJECT_ID/connectors/coupa/integration/config/settings/instances/123")
              .respond()
                 .withBody(readFromResource("/connector/coupa_instance.json"));
 
@@ -264,6 +271,25 @@ public void shouldFailCreatingCoupaInstance() throws Exception {
         connectors.createCoupaInstance(project, new CoupaInstance("i1", "url", "key"));
     }
 
+    @Test(expectedExceptions = ConnectorException.class)
+    public void shouldFailGettingCreatedCoupaInstance() throws Exception {
+        onRequest()
+                .havingMethodEqualTo("POST")
+                .havingPathEqualTo("/gdc/projects/PROJECT_ID/connectors/coupa/integration/config/settings/instances")
+             .respond()
+                .withStatus(201)
+                .withBody("{\"uri\":\"/gdc/projects/PROJECT_ID/connectors/coupa/integration/config/settings/instances/123\"}");
+
+        //method should throw exception for any error response status returned by GET request on created Coupa instance uri
+        onRequest()
+                .havingMethodEqualTo("GET")
+                .havingPathEqualTo("/gdc/projects/PROJECT_ID/connectors/coupa/integration/config/settings/instances/123")
+             .respond()
+                .withStatus(404);
+
+        connectors.createCoupaInstance(project, new CoupaInstance("i1", "url", "key"));
+    }
+
     @Test
     public void shouldGetCoupaInstances() throws Exception {
         onRequest()
