Skip to content
This repository has been archived by the owner on Aug 20, 2021. It is now read-only.

Commit

Permalink
fix(subscription): display the subscribedBy name
Browse files Browse the repository at this point in the history 
fix gravitee-io/issues#1096
  • Loading branch information
@NicolasGeraud
NicolasGeraud committed Mar 22, 2018
1 parent 9a5b0cf commit 5543f24
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 22 deletions.
22 changes: 11 additions & 11 deletions ...tee-management-api-rest/src/main/java/io/gravitee/management/rest/model/Subscription.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class Subscription {
private String processedBy;

@JsonProperty("subscribed_by")
private String subscribedBy;
private User subscribedBy;

private String reason;

Expand Down Expand Up @@ -128,11 +128,11 @@ public void setProcessedBy(String processedBy) {
this.processedBy = processedBy;
}

public String getSubscribedBy() {
public User getSubscribedBy() {
return subscribedBy;
}

public void setSubscribedBy(String subscribedBy) {
public void setSubscribedBy(User subscribedBy) {
this.subscribedBy = subscribedBy;
}

Expand Down Expand Up @@ -238,9 +238,9 @@ public static class Application {
private final String id;
private final String name;
private final String type;
private final Owner owner;
private final User owner;

public Application(final String id, final String name, final String type, final Owner owner) {
public Application(final String id, final String name, final String type, final User owner) {
this.id = id;
this.name = name;
this.type = type;
Expand All @@ -259,7 +259,7 @@ public String getName() {
return name;
}

public Owner getOwner() {
public User getOwner() {
return owner;
}

Expand All @@ -269,9 +269,9 @@ public static class Api {
private final String id;
private final String name;
private final String version;
private final Owner owner;
private final User owner;

public Api(final String id, final String name, final String version, final Owner owner) {
public Api(final String id, final String name, final String version, final User owner) {
this.id = id;
this.name = name;
this.version = version;
Expand All @@ -286,7 +286,7 @@ public String getName() {
return name;
}

public Owner getOwner() {
public User getOwner() {
return owner;
}

Expand All @@ -295,11 +295,11 @@ public String getVersion() {
}
}

public static class Owner {
public static class User {
private final String id;
private final String displayName;

public Owner(final String id, final String displayName) {
public User(final String id, final String displayName) {
this.id = id;
this.displayName = displayName;
}
Expand Down
15 changes: 9 additions & 6 deletions ...-api-rest/src/main/java/io/gravitee/management/rest/resource/ApiSubscriptionResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
import io.gravitee.management.rest.model.Subscription;
import io.gravitee.management.rest.security.Permission;
import io.gravitee.management.rest.security.Permissions;
import io.gravitee.management.service.ApiKeyService;
import io.gravitee.management.service.ApplicationService;
import io.gravitee.management.service.PlanService;
import io.gravitee.management.service.SubscriptionService;
import io.gravitee.management.service.*;
import io.swagger.annotations.*;

import javax.inject.Inject;
Expand Down Expand Up @@ -59,6 +56,9 @@ public class ApiSubscriptionResource extends AbstractResource {
@Inject
private ApplicationService applicationService;

@Inject
private UserService userService;

@GET
@Produces(MediaType.APPLICATION_JSON)
@ApiOperation(value = "Get a subscription",
Expand Down Expand Up @@ -246,7 +246,10 @@ private Subscription convert(SubscriptionEntity subscriptionEntity) {
subscription.setProcessedBy(subscriptionEntity.getProcessedBy());
subscription.setReason(subscriptionEntity.getReason());
subscription.setStatus(subscriptionEntity.getStatus());
subscription.setSubscribedBy(subscriptionEntity.getSubscribedBy());
subscription.setSubscribedBy(
new Subscription.User(
subscriptionEntity.getSubscribedBy(),
userService.findById(subscriptionEntity.getSubscribedBy()).getDisplayName()));
subscription.setClientId(subscriptionEntity.getClientId());

PlanEntity plan = planService.findById(subscriptionEntity.getPlan());
Expand All @@ -259,7 +262,7 @@ private Subscription convert(SubscriptionEntity subscriptionEntity) {
application.getId(),
application.getName(),
application.getType(),
new Subscription.Owner(
new Subscription.User(
application.getPrimaryOwner().getId(),
application.getPrimaryOwner().getDisplayName()
)
Expand Down
11 changes: 9 additions & 2 deletions ...api-rest/src/main/java/io/gravitee/management/rest/resource/ApiSubscriptionsResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import io.gravitee.management.service.ApplicationService;
import io.gravitee.management.service.PlanService;
import io.gravitee.management.service.SubscriptionService;
import io.gravitee.management.service.UserService;
import io.swagger.annotations.*;

import javax.inject.Inject;
Expand Down Expand Up @@ -63,6 +64,9 @@ public class ApiSubscriptionsResource extends AbstractResource {
@Context
private ResourceContext resourceContext;

@Inject
private UserService userService;

@GET
@Produces(MediaType.APPLICATION_JSON)
@ApiOperation(value = "List subscriptions for the API",
Expand Down Expand Up @@ -136,7 +140,10 @@ private Subscription convert(SubscriptionEntity subscriptionEntity) {
subscription.setProcessedBy(subscriptionEntity.getProcessedBy());
subscription.setReason(subscriptionEntity.getReason());
subscription.setStatus(subscriptionEntity.getStatus());
subscription.setSubscribedBy(subscriptionEntity.getSubscribedBy());
subscription.setSubscribedBy(
new Subscription.User(subscriptionEntity.getSubscribedBy(),
userService.findById(subscriptionEntity.getSubscribedBy()).getDisplayName()
));

PlanEntity plan = planService.findById(subscriptionEntity.getPlan());
subscription.setPlan(new Subscription.Plan(plan.getId(), plan.getName()));
Expand All @@ -147,7 +154,7 @@ private Subscription convert(SubscriptionEntity subscriptionEntity) {
application.getId(),
application.getName(),
application.getType(),
new Subscription.Owner(
new Subscription.User(
application.getPrimaryOwner().getId(),
application.getPrimaryOwner().getDisplayName()
)
Expand Down
10 changes: 8 additions & 2 deletions .../src/main/java/io/gravitee/management/rest/resource/ApplicationSubscriptionsResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ public class ApplicationSubscriptionsResource {
@Inject
private ApplicationService applicationService;

@Inject
private UserService userService;

@POST
@Produces(MediaType.APPLICATION_JSON)
@ApiOperation(value = "Subscribe to a plan",
Expand Down Expand Up @@ -205,7 +208,10 @@ private Subscription convert(SubscriptionEntity subscriptionEntity) {
subscription.setProcessedBy(subscriptionEntity.getProcessedBy());
subscription.setReason(subscriptionEntity.getReason());
subscription.setStatus(subscriptionEntity.getStatus());
subscription.setSubscribedBy(subscriptionEntity.getSubscribedBy());
subscription.setSubscribedBy(
new Subscription.User(subscriptionEntity.getSubscribedBy(),
userService.findById(subscriptionEntity.getSubscribedBy()).getDisplayName()
));

PlanEntity plan = planService.findById(subscriptionEntity.getPlan());
subscription.setPlan(new Subscription.Plan(plan.getId(), plan.getName()));
Expand All @@ -217,7 +223,7 @@ private Subscription convert(SubscriptionEntity subscriptionEntity) {
api.getId(),
api.getName(),
api.getVersion(),
new Subscription.Owner(
new Subscription.User(
api.getPrimaryOwner().getId(),
api.getPrimaryOwner().getDisplayName()
)
Expand Down
2 changes: 1 addition & 1 deletion ...nt-api-rest/src/main/java/io/gravitee/management/rest/resource/SubscriptionsResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private Subscription convert(SubscriptionEntity subscriptionEntity) {
application.getId(),
application.getName(),
application.getType(),
new Subscription.Owner(
new Subscription.User(
application.getPrimaryOwner().getId(),
application.getPrimaryOwner().getDisplayName()
)
Expand Down

0 comments on commit 5543f24

Please sign in to comment.