From 9d50a96c59ffa687e878d84007d90e6fe73f8527 Mon Sep 17 00:00:00 2001 From: Rob Fletcher Date: Wed, 2 Mar 2016 16:04:55 -0800 Subject: [PATCH] user-centric notifications for stale app ownership --- .../appOwnerMultipleUsers/body-email.vm | 8 +++-- .../body-email.vm | 11 ++++--- .../appOwnerOutdatedReassign/body-email.vm | 12 +++++--- .../templates/appOwnerUnknown/body-email.vm | 10 +++++-- .../templates/appOwnership/body-email.vm | 29 ------------------- .../templates/appOwnership/subject.vm | 1 - .../templates/appReassigned/body-email.vm | 1 - .../templates/appReassigned/subject.vm | 1 - .../templates/appUnknownOwner/body-email.vm | 1 - .../templates/appUnknownOwner/subject.vm | 1 - 10 files changed, 28 insertions(+), 47 deletions(-) delete mode 100644 echo-notifications/src/main/resources/templates/appOwnership/body-email.vm delete mode 100644 echo-notifications/src/main/resources/templates/appOwnership/subject.vm delete mode 100644 echo-notifications/src/main/resources/templates/appReassigned/body-email.vm delete mode 100644 echo-notifications/src/main/resources/templates/appReassigned/subject.vm delete mode 100644 echo-notifications/src/main/resources/templates/appUnknownOwner/body-email.vm delete mode 100644 echo-notifications/src/main/resources/templates/appUnknownOwner/subject.vm diff --git a/echo-notifications/src/main/resources/templates/appOwnerMultipleUsers/body-email.vm b/echo-notifications/src/main/resources/templates/appOwnerMultipleUsers/body-email.vm index 5cf2a69a0..662c24a46 100644 --- a/echo-notifications/src/main/resources/templates/appOwnerMultipleUsers/body-email.vm +++ b/echo-notifications/src/main/resources/templates/appOwnerMultipleUsers/body-email.vm @@ -1,5 +1,9 @@ The owner email for the following applications matches multiple users: -#foreach($application in $notification.additionalContext.multiple) - $application.name in $application.accounts owned by <$application.owner.email> +#foreach($event in $notification.additionalContext.events) +$event.email owns: +#foreach($application in $event.applications) +- $application.name in $application.accounts +#end + #end diff --git a/echo-notifications/src/main/resources/templates/appOwnerOutdatedNoSuggestion/body-email.vm b/echo-notifications/src/main/resources/templates/appOwnerOutdatedNoSuggestion/body-email.vm index 37560a74c..6b990f6bf 100644 --- a/echo-notifications/src/main/resources/templates/appOwnerOutdatedNoSuggestion/body-email.vm +++ b/echo-notifications/src/main/resources/templates/appOwnerOutdatedNoSuggestion/body-email.vm @@ -1,6 +1,9 @@ -The following applications are owned by ex-employees: +The following users are ex-employees but still own applications. We could not identify managers or team members to reassign to. + +#foreach($event in $notification.additionalContext.events) +$application.owner.name<$application.owner.email> owns... +#foreach($application in $event.applications) +- $application.name in $application.accounts +#end -#foreach($application in $notification.additionalContext.outdated) - $application.name in $application.accounts owned by $application.owner.name<$application.owner.email> - - no suggested owner found for reassignment. #end diff --git a/echo-notifications/src/main/resources/templates/appOwnerOutdatedReassign/body-email.vm b/echo-notifications/src/main/resources/templates/appOwnerOutdatedReassign/body-email.vm index 2f7b21ab2..f9959e030 100644 --- a/echo-notifications/src/main/resources/templates/appOwnerOutdatedReassign/body-email.vm +++ b/echo-notifications/src/main/resources/templates/appOwnerOutdatedReassign/body-email.vm @@ -1,6 +1,10 @@ -The following applications are owned by ex-employees: +The following users are ex-employees but still own applications. We have identified possible managers or team members to reassign to. + +#foreach($event in $notification.additionalContext.events) +$application.owner.name<$application.owner.email> owns... +#foreach($application in $event.applications) +- $application.name in $application.accounts +#end +Suggest reassigning to $application.suggestedOwner.name<$application.suggestedOwner.email> -#foreach($application in $notification.additionalContext.applications) - $application.name in $application.accounts owned by $application.owner.name<$application.owner.email> - - suggest reassigning to $application.suggestedOwner.name<$application.suggestedOwner.email>. #end diff --git a/echo-notifications/src/main/resources/templates/appOwnerUnknown/body-email.vm b/echo-notifications/src/main/resources/templates/appOwnerUnknown/body-email.vm index 224a4a486..51f9bafa3 100644 --- a/echo-notifications/src/main/resources/templates/appOwnerUnknown/body-email.vm +++ b/echo-notifications/src/main/resources/templates/appOwnerUnknown/body-email.vm @@ -1,5 +1,9 @@ -The following applications are owned by unidentifiable users: +The following email addresses are not recognized employee or group addresses but own applications. + +#foreach($event in $notification.additionalContext.events) +$event.email owns... +#foreach($application in $event.applications) +- $application.name in $application.accounts +#end -#foreach($application in $notification.additionalContext.unknown) - $application.name in $application.accounts owned by <$application.owner.email> #end diff --git a/echo-notifications/src/main/resources/templates/appOwnership/body-email.vm b/echo-notifications/src/main/resources/templates/appOwnership/body-email.vm deleted file mode 100644 index 74317fa2d..000000000 --- a/echo-notifications/src/main/resources/templates/appOwnership/body-email.vm +++ /dev/null @@ -1,29 +0,0 @@ -#if($notification.additionalContext.outdated.size() > 0) -The following applications are owned by ex-employees: - -#foreach($application in $notification.additionalContext.outdated) - $application.name in $application.accounts owned by $application.owner.name<$application.owner.email> - #if($application.suggestedOwner) - - suggest reassigning to $application.suggestedOwner.name<$application.suggestedOwner.email>. - #else - - no suggested owner found for reassignment. - #end -#end - -#end -#if($notification.additionalContext.unknown.size() > 0) -The following applications are owned by unidentifiable users: - -#foreach($application in $notification.additionalContext.unknown) - $application.name in $application.accounts owned by <$application.owner.email> -#end - -#end -#if($notification.additionalContext.multiple.size() > 0) -The owner email for the following applications matches multiple users: - -#foreach($application in $notification.additionalContext.multiple) - $application.name in $application.accounts owned by <$application.owner.email> -#end - -#end diff --git a/echo-notifications/src/main/resources/templates/appOwnership/subject.vm b/echo-notifications/src/main/resources/templates/appOwnership/subject.vm deleted file mode 100644 index ee5d2d10b..000000000 --- a/echo-notifications/src/main/resources/templates/appOwnership/subject.vm +++ /dev/null @@ -1 +0,0 @@ -Report of issues with application owners diff --git a/echo-notifications/src/main/resources/templates/appReassigned/body-email.vm b/echo-notifications/src/main/resources/templates/appReassigned/body-email.vm deleted file mode 100644 index bf6edc8c4..000000000 --- a/echo-notifications/src/main/resources/templates/appReassigned/body-email.vm +++ /dev/null @@ -1 +0,0 @@ -The application $notification.additionalContext.application in $notification.additionalContext.accounts has been reassigned to $notification.additionalContext.newOwner.name<$notification.additionalContext.newOwner.email> as the previous owner $notification.additionalContext.previousOwner.name<$notification.additionalContext.previousOwner.email> is no longer employed by Netflix. diff --git a/echo-notifications/src/main/resources/templates/appReassigned/subject.vm b/echo-notifications/src/main/resources/templates/appReassigned/subject.vm deleted file mode 100644 index 9383ab0ce..000000000 --- a/echo-notifications/src/main/resources/templates/appReassigned/subject.vm +++ /dev/null @@ -1 +0,0 @@ -The application $notification.additionalContext.application has been reassigned to $notification.additionalContext.newOwner.name diff --git a/echo-notifications/src/main/resources/templates/appUnknownOwner/body-email.vm b/echo-notifications/src/main/resources/templates/appUnknownOwner/body-email.vm deleted file mode 100644 index 013e648e5..000000000 --- a/echo-notifications/src/main/resources/templates/appUnknownOwner/body-email.vm +++ /dev/null @@ -1 +0,0 @@ -The application $notification.additionalContext.application in $notification.additionalContext.accounts has an unknown owner $notification.additionalContext.previousOwner.email. diff --git a/echo-notifications/src/main/resources/templates/appUnknownOwner/subject.vm b/echo-notifications/src/main/resources/templates/appUnknownOwner/subject.vm deleted file mode 100644 index 74b8580c2..000000000 --- a/echo-notifications/src/main/resources/templates/appUnknownOwner/subject.vm +++ /dev/null @@ -1 +0,0 @@ -The application $notification.additionalContext.application has an unknown owner