fix(subscription): Set the request message into the subscription

Closes gravitee-io/issues#1234
gravitee-io · May 25, 2018 · 5a762d7 · 5a762d7
1 parent c4a1fec
commit 5a762d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...-api-rest/src/main/java/io/gravitee/management/rest/resource/ApiSubscriptionResource.java b/...-api-rest/src/main/java/io/gravitee/management/rest/resource/ApiSubscriptionResource.java
@@ -246,6 +246,7 @@ private Subscription convert(SubscriptionEntity subscriptionEntity) {
         subscription.setProcessedBy(subscriptionEntity.getProcessedBy());
         subscription.setRequest(subscriptionEntity.getRequest());
         subscription.setReason(subscriptionEntity.getReason());
+        subscription.setRequest(subscriptionEntity.getRequest());
         subscription.setStatus(subscriptionEntity.getStatus());
         subscription.setSubscribedBy(
                 new Subscription.User(

diff --git a/.../src/main/java/io/gravitee/management/rest/resource/ApplicationSubscriptionsResource.java b/.../src/main/java/io/gravitee/management/rest/resource/ApplicationSubscriptionsResource.java
@@ -78,8 +78,12 @@ public class ApplicationSubscriptionsResource {
     public Response createSubscription(
             @PathParam("application") String application,
             @ApiParam(name = "plan", required = true)
-            @NotNull @QueryParam("plan") String plan) {
-        NewSubscriptionEntity newSubscriptionEntity = new NewSubscriptionEntity();
+            @NotNull @QueryParam("plan") String plan,
+            NewSubscriptionEntity newSubscriptionEntity) {
+        // If no request message has been passed, the entity is not created
+        if (newSubscriptionEntity == null) {
+            newSubscriptionEntity = new NewSubscriptionEntity();
+        }
         newSubscriptionEntity.setApplication(application);
         newSubscriptionEntity.setPlan(plan);
         Subscription subscription = convert(subscriptionService.create(newSubscriptionEntity));