fix(email): bad templates

fix gravitee-io/issues#721
gravitee-io · Aug 18, 2017 · 7bbea2e · 7bbea2e
1 parent d40fb3f
commit 7bbea2e
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 28 deletions.
diff --git a/...-api-service/src/main/java/io/gravitee/management/service/impl/MembershipServiceImpl.java b/...-api-service/src/main/java/io/gravitee/management/service/impl/MembershipServiceImpl.java
@@ -65,6 +65,15 @@ public class MembershipServiceImpl extends TransactionalService implements Membe
     @Autowired
     private RoleService roleService;
 
+    @Autowired
+    private ApplicationService applicationService;
+
+    @Autowired
+    private ApiService apiService;
+
+    @Autowired
+    private GroupService groupService;
+
     @Override
     public Set<MemberEntity> getMembers(MembershipReferenceType referenceType, String referenceId) {
         return getMembers(referenceType, referenceId, null, null);
@@ -247,27 +256,31 @@ private EmailNotification buildEmailNotification(UserEntity user, MembershipRefe
         String subject = null;
         EmailNotificationBuilder.EmailTemplate template = null;
         Map params = null;
-
+        GroupEntity groupEntity;
         switch (referenceType) {
             case APPLICATION:
-                subject = "Subscription to application " + referenceId;
+                ApplicationEntity applicationEntity = applicationService.findById(referenceId);
+                subject = "Subscription to application " + applicationEntity.getName();
                 template = EmailNotificationBuilder.EmailTemplate.APPLICATION_MEMBER_SUBSCRIPTION;
-                params = ImmutableMap.of("application", referenceId, "username", user.getUsername());
+                params = ImmutableMap.of("application", applicationEntity, "username", user.getUsername());
                 break;
             case API:
-                subject = "Subscription to API " + referenceId;
+                ApiEntity apiEntity = apiService.findById(referenceId);
+                subject = "Subscription to API " + apiEntity.getName();
                 template = EmailNotificationBuilder.EmailTemplate.API_MEMBER_SUBSCRIPTION;
-                params = ImmutableMap.of("api", referenceId, "username", user.getUsername());
+                params = ImmutableMap.of("api", apiEntity, "username", user.getUsername());
                 break;
             case APPLICATION_GROUP:
-                subject = "Subscription to application group " + referenceId;
+                groupEntity = groupService.findById(referenceId);
+                subject = "Subscription to application group " + groupEntity.getName();
                 template = EmailNotificationBuilder.EmailTemplate.APPLICATION_GROUP_MEMBER_SUBSCRIPTION;
-                params = ImmutableMap.of("group", referenceId, "username", user.getUsername());
+                params = ImmutableMap.of("group", groupEntity, "username", user.getUsername());
                 break;
             case API_GROUP:
-                subject = "Subscription to API group " + referenceId;
+                groupEntity = groupService.findById(referenceId);
+                subject = "Subscription to API group " + groupEntity.getName();
                 template = EmailNotificationBuilder.EmailTemplate.API_MEMBER_GROUP_SUBSCRIPTION;
-                params = ImmutableMap.of("group", referenceId, "username", user.getUsername());
+                params = ImmutableMap.of("group", groupEntity, "username", user.getUsername());
                 break;
         }
 

diff --git a/...pi-service/src/main/java/io/gravitee/management/service/impl/SubscriptionServiceImpl.java b/...pi-service/src/main/java/io/gravitee/management/service/impl/SubscriptionServiceImpl.java
@@ -221,8 +221,8 @@ public SubscriptionEntity create(String plan, String application) {
                         .params(ImmutableMap.of(
                                 "owner", appOwner,
                                 "api", api,
-                                "plan", plan,
-                                "application", application))
+                                "plan", planEntity,
+                                "application", applicationEntity))
                         .build());
             }
 

diff --git a/...e-management-api-standalone-distribution/src/main/resources/templates/apiGroupMember.html b/...e-management-api-standalone-distribution/src/main/resources/templates/apiGroupMember.html
@@ -5,7 +5,7 @@
 		</header>
 		<div style="margin-top: 50px; color: #424e5a;">
 			<h3>Hi ${username},</h3>
-			<p>You are now a member of the group of APIs: ${group}</p>
+			<p>You are now a member of the group of APIs: ${group.name}</p>
 		</div>
 	</body>
 </html>
diff --git a/...ee-management-api-standalone-distribution/src/main/resources/templates/apiKeyExpired.html b/...ee-management-api-standalone-distribution/src/main/resources/templates/apiKeyExpired.html
@@ -4,8 +4,8 @@
 			<#include "header.html" />
 		</header>
 		<div style="margin-top: 50px; color: #424e5a;">
-			<h3>Hi ${owner},</h3>
+			<h3>Hi ${owner.username},</h3>
 			<p>The API Key <code>${apiKey}</code> has been expired.
 		</p>
 	</body>
-</html>
+</html>
diff --git a/...ee-management-api-standalone-distribution/src/main/resources/templates/apiKeyRevoked.html b/...ee-management-api-standalone-distribution/src/main/resources/templates/apiKeyRevoked.html
@@ -4,8 +4,8 @@
 			<#include "header.html" />
 		</header>
 		<div style="margin-top: 50px; color: #424e5a;">
-			<h3>Hi ${owner},</h3>
+			<h3>Hi ${owner.username},</h3>
 			<p>The API Key <code>${apiKey}</code> has been revoked</p>
 		</div>
 	</body>
-</html>
+</html>
diff --git a/...avitee-management-api-standalone-distribution/src/main/resources/templates/apiMember.html b/...avitee-management-api-standalone-distribution/src/main/resources/templates/apiMember.html
@@ -5,7 +5,7 @@
 		</header>
 		<div style="margin-top: 50px; color: #424e5a;">
 			<h3>Hi ${username},</h3>
-			<p>You are now a member of the API: ${api}</p>
+			<p>You are now a member of the API: ${api.name}</p>
 		</div>
 
 	</body>

diff --git a/...ment-api-standalone-distribution/src/main/resources/templates/applicationGroupMember.html b/...ment-api-standalone-distribution/src/main/resources/templates/applicationGroupMember.html
@@ -5,7 +5,7 @@
 		</header>
 		<div style="margin-top: 50px; color: #424e5a;">
 			<h3>Hi ${username},</h3>
-			<p>You are now a member of the group of Applications: ${group}</p>
+			<p>You are now a member of the group of Applications: ${group.name}</p>
 		</div>
 	</body>
 </html>
diff --git a/...anagement-api-standalone-distribution/src/main/resources/templates/applicationMember.html b/...anagement-api-standalone-distribution/src/main/resources/templates/applicationMember.html
@@ -5,7 +5,7 @@
 		</header>
 		<div style="margin-top: 50px; color: #424e5a;">
 			<h3>Hi ${username},</h3>
-			<p>You are now a member of the application: ${application}</p>
+			<p>You are now a member of the application: ${application.name}</p>
 		</div>
 	</body>
 </html>
diff --git a/...gement-api-standalone-distribution/src/main/resources/templates/subscriptionApproved.html b/...gement-api-standalone-distribution/src/main/resources/templates/subscriptionApproved.html
@@ -4,8 +4,8 @@
 			<#include "header.html" />
 		</header>
 		<div style="margin-top: 50px; color: #424e5a;">
-			<h3>Hi ${owner},</h3>
-			<p>Your subscription to the API <code>${api}</code> with plan <code>${plan}</code> has been approved.</p>
+			<h3>Hi ${owner.username},</h3>
+			<p>Your subscription to the API <code>${api.name}</code> with plan <code>${plan.name}</code> has been approved.</p>
 		</div>
 	</body>
-</html>
+</html>
diff --git a/...gement-api-standalone-distribution/src/main/resources/templates/subscriptionReceived.html b/...gement-api-standalone-distribution/src/main/resources/templates/subscriptionReceived.html
@@ -4,8 +4,8 @@
 			<#include "header.html" />
 		</header>
 		<div style="margin-top: 50px; color: #424e5a;">
-			<h3>Hi ${owner},</h3>
-			<p><code>${application}</code> has just subscribed to the API <code>${api}</code> with plan <code>${plan}</code>.</p>
+			<h3>Hi ${owner.username},</h3>
+			<p><code>${application.name}</code> has just subscribed to the API <code>${api.name}</code> with plan <code>${plan.name}</code>.</p>
       	</div>
 	</body>
-</html>
+</html>
diff --git a/...gement-api-standalone-distribution/src/main/resources/templates/subscriptionRejected.html b/...gement-api-standalone-distribution/src/main/resources/templates/subscriptionRejected.html
@@ -4,8 +4,8 @@
 			<#include "header.html" />
 		</header>
 		<div style="margin-top: 50px; color: #424e5a;">
-			<h3>Hi ${owner},</h3>
-			<p>Your subscription to the API <code>${api}</code> with plan <code>${plan}</code> has been rejected.</p>
+			<h3>Hi ${owner.username},</h3>
+			<p>Your subscription to the API <code>${api.name}</code> with plan <code>${plan.name}</code> has been rejected.</p>
 		</div>
 	</body>
-</html>
+</html>