API-6864 - updated ApiApplicationToBeDeletedNotification template

app/preview/TemplateParams.scala

@@ -211,12 +211,12 @@ object TemplateParams {
       "applicationName"    -> "Tax Software"
     ),
     "apiApplicationToBeDeletedNotification" -> Map(
-      "userFirstName"           -> "Fred",
-      "userLastName"            -> "Bloggs",
-      "applicationName"         -> "Test Application",
-      "environmentName"         -> "Sandbox",
-      "timeSinceLastUse"        -> "11 months",
-      "dateOfScheduledDeletion" -> "1 April 2025"
+      "userFirstName"    -> "Fred",
+      "userLastName"     -> "Bloggs",
+      "applicationName"  -> "Test Application",
+      "environmentName"  -> "Sandbox",
+      "timeSinceLastUse" -> "11 months",
+      "daysToDeletion"   -> "30 days"
     ),
     "apiProductionCredentialsRequestExpired" -> Map(
       "applicationName" -> "Test Application"

app/uk/gov/hmrc/hmrcemailrenderer/templates/api/apiApplicationToBeDeletedNotification.scala.html

@@ -17,7 +17,7 @@
 @(params: Map[String, Any])
 @uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "We’re deleting your application") {
  <p style="margin: 0 0 30px; font-size: 19px;">Dear @{params("userFirstName")} @{params("userLastName")}</p>
- <p style="margin: 0 0 30px; font-size: 19px;">Your <strong>@{params("environmentName")}</strong> application <strong>@{params("applicationName")}</strong> has been inactive for more than <strong>@{params("timeSinceLastUse")}</strong> and will be deleted on <strong>@{params("dateOfScheduledDeletion")}</strong>.</p>
+ <p style="margin: 0 0 30px; font-size: 19px;">Your <strong>@{params("environmentName")}</strong> application <strong>@{params("applicationName")}</strong> has been inactive for more than <strong>@{params("timeSinceLastUse")}</strong> and will be deleted in <strong>@{params("daysToDeletion")}</strong>.</p>
  <p style="margin: 0 0 30px; font-size: 19px;">To keep this application, use it to make an API call before the deletion date.</p>
  <p style="margin: 0 0 30px; font-size: 19px;">If you do nothing, we will automatically delete this application.</p>
  <p style="margin: 0 0 30px; font-size: 19px;">Do not reply to this email, this inbox is not monitored.</p>

app/uk/gov/hmrc/hmrcemailrenderer/templates/api/apiApplicationToBeDeletedNotification.scala.txt

@@ -2,7 +2,7 @@
 
 Dear @{params("userFirstName")} @{params("userLastName")}
 
-Your @{params("environmentName")} application @{params("applicationName")} has been inactive for more than @{params("timeSinceLastUse")} and will be deleted on @{params("dateOfScheduledDeletion")}.
+Your @{params("environmentName")} application @{params("applicationName")} has been inactive for more than @{params("timeSinceLastUse")} and will be deleted in @{params("daysToDeletion")}.
 
 To keep this application, use it to make an API call before the deletion date.
 

app/uk/gov/hmrc/hmrcemailrenderer/templates/ecc/applicationCompleteCY.scala.html

@@ -14,7 +14,6 @@
  * limitations under the License.
  *@
 
-
 @(params: Map[String, Any], default: String = "")@(if(params.getOrElse("serviceName", "") == "Cael rhif EORI")"Mae’ch rhif EORI yn barod i’w ddefnyddio" else params.get("enrolmentKey").map({
 case "HMRC-ATAR-ORG" => "Mae’ch tanysgrifiad i ddyfarniadau tariffau uwch a’ch rhif EORI yn barod i’w defnyddio"
 case "HMRC-GVMS-ORG" => "Mae’ch tanysgrifiad i’r Gwasanaeth Symud Cerbydau Nwyddau a’ch rhif EORI yn barod i’w defnyddio"

app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful.scala.html

@@ -1,18 +1,18 @@
 @*
-* Copyright 2023 HM Revenue & Customs
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*@
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
 

app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful_cy.scala.html

@@ -1,18 +1,18 @@
 @*
-* Copyright 2023 HM Revenue & Customs
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*@
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
 

app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful.scala.html

@@ -1,18 +1,18 @@
 @*
-* Copyright 2023 HM Revenue & Customs
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*@
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
 

app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful_cy.scala.html

@@ -1,18 +1,18 @@
 @*
-* Copyright 2023 HM Revenue & Customs
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*@
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
 

app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful.scala.html

@@ -1,18 +1,18 @@
 @*
-* Copyright 2023 HM Revenue & Customs
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*@
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
 

app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful_cy.scala.html

@@ -1,18 +1,18 @@
 @*
-* Copyright 2023 HM Revenue & Customs
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*@
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
 

app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful.scala.html

@@ -1,18 +1,18 @@
 @*
-* Copyright 2023 HM Revenue & Customs
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*@
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
 

app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful_cy.scala.html

@@ -1,18 +1,18 @@
 @*
-* Copyright 2023 HM Revenue & Customs
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*@
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
 
 @import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
 

test/uk/gov/hmrc/hmrcemailrenderer/templates/api/ApiApplicationToBeDeletedNotificationSpec.scala

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.hmrc.hmrcemailrenderer.templates.api
+
+import junit.framework.TestCase
+import org.scalatest.wordspec.AnyWordSpecLike
+import org.scalatest.matchers.should.Matchers
+import uk.gov.hmrc.hmrcemailrenderer.templates.api
+
+class ApiApplicationToBeDeletedNotificationSpec extends AnyWordSpecLike with Matchers {
+
+  val userFirstName = "Fred"
+  val userLastName = "Bloggs"
+  val applicationName = "Test Application"
+  val environmentName = "Sandbox"
+  val timeSinceLastUse = "11 months"
+  val daysToDeletion = "30 days"
+
+  val templateParams = Map(
+    "userFirstName"        -> userFirstName,
+    "userLastName"         -> userLastName,
+    "applicationName"      -> applicationName,
+    "environmentName"      -> environmentName,
+    "timeSinceLastUse"     -> timeSinceLastUse,
+    "daysToDeletion"       -> daysToDeletion,
+    "staticAssetUrlPrefix" -> "http://uri",
+    "staticAssetVersion"   -> "v1",
+    "borderColour"         -> "#005EA5"
+  )
+
+  "htmlView" should {
+    "render as" in new TestCase {
+      val renderedHtml = api.html.apiApplicationToBeDeletedNotification.render(templateParams)
+      renderedHtml.contentType should include("text/html")
+      renderedHtml.body should include(
+        "<p style=\"margin: 0 0 30px; font-size: 19px;\">Dear " + userFirstName + " " + userLastName + "</p>"
+      )
+      renderedHtml.body should include(
+        "<p style=\"margin: 0 0 30px; font-size: 19px;\">Your <strong>" + environmentName +
+          "</strong> application <strong>" + applicationName + "</strong>" +
+          " has been inactive for more than <strong>" + timeSinceLastUse +
+          "</strong> and will be deleted in <strong>" + daysToDeletion + "</strong>.</p>"
+      )
+      renderedHtml.body should include("<p style=\"margin: 0 0 30px; font-size: 19px;\">From HMRC Developer Hub</p>")
+    }
+  }
+
+  "textView" should {
+    "render as" in new TestCase {
+      val renderedTxt = api.txt.apiApplicationToBeDeletedNotification.render(templateParams)
+      renderedTxt.contentType should include("text/plain")
+      renderedTxt.body should include(s"Dear $userFirstName $userLastName")
+      renderedTxt.body should include(
+        s"Your $environmentName application $applicationName " +
+          s"has been inactive for more than $timeSinceLastUse and will be deleted in $daysToDeletion.")
+      renderedTxt.body should include("From HMRC Developer Hub")
+    }
+
+  }
+}