Merge pull request #1390 from hmrc/BST-148972_Correct-various-page-H1-headings

BST-148972 Correct various page H1 headings

Author: tumakha

.scalafix.conf

@@ -0,0 +1,7 @@
+rules = [
+    DisableSyntax,
+    LeakingImplicitClassVal,
+    NoValInForComprehension,
+    RedundantSyntax,
+    NoAutoTupling
+]

app/controllers/aboutYourLeaseOrTenure/CheckYourAnswersAboutYourLeaseOrTenureController.scala

@@ -126,7 +126,7 @@ class CheckYourAnswersAboutYourLeaseOrTenureController @Inject() (
               case FOR6076 =>
                 controllers.aboutYourLeaseOrTenure.routes.ProvideDetailsOfYourLeaseController.show().url
               case _       =>
-                logger.warn(s"Navigation for CYA about lease without correct selection of conditions by controller")
+                logger.warn("Navigation for CYA about lease without correct selection of conditions by controller")
                 throw new RuntimeException("Invalid option exception for CYA about lease back link")
             }
         }

app/controllers/aboutYourLeaseOrTenure/PayACapitalSumController.scala

@@ -100,7 +100,7 @@ class PayACapitalSumController @Inject() (
                 controllers.aboutYourLeaseOrTenure.routes.BenefitsGivenDetailsController.show().url
               case Some(AnswerNo)  => controllers.aboutYourLeaseOrTenure.routes.BenefitsGivenController.show().url
               case _               =>
-                logger.warn(s"Back link for pay capital sum page reached with unknown benefits given value")
+                logger.warn("Back link for pay capital sum page reached with unknown benefits given value")
                 controllers.routes.TaskListController.show().url
             }
           case FOR6045 | FOR6046 =>

app/controllers/aboutYourLeaseOrTenure/RentIncludeFixtureAndFittingsController.scala

@@ -104,7 +104,7 @@ class RentIncludeFixtureAndFittingsController @Inject() (
             controllers.aboutYourLeaseOrTenure.routes.ServicePaidSeparatelyListController.show(index).url
           case Some(AnswerNo)  => controllers.aboutYourLeaseOrTenure.routes.PaymentForTradeServicesController.show().url
           case _               =>
-            logger.warn(s"Back link for fixture and fittings page reached with unknown payment trade services value")
+            logger.warn("Back link for fixture and fittings page reached with unknown payment trade services value")
             controllers.routes.TaskListController.show().url
         }
       case _       =>

app/controllers/connectiontoproperty/ConnectionToThePropertyController.scala

@@ -97,6 +97,6 @@ class ConnectionToThePropertyController @Inject() (
         Right(controllers.connectiontoproperty.routes.EditAddressController.show().url)
       case Some(AddressConnectionTypeYes)              =>
         Right(controllers.connectiontoproperty.routes.AreYouStillConnectedController.show().url)
-      case _                                           => Left(s"Unknown connection to property back link")
+      case _                                           => Left("Unknown connection to property back link")
     }
 }

app/controllers/connectiontoproperty/ProvideContactDetailsController.scala

@@ -94,16 +94,15 @@ class ProvideContactDetailsController @Inject() (
       case _     =>
         request.sessionData.stillConnectedDetails.flatMap(_.isAnyRentReceived) match {
           case Some(AnswerYes) =>
-            request.sessionData.stillConnectedDetails.get.lettingPartOfPropertyDetails.isEmpty match {
-              case true  =>
-                controllers.connectiontoproperty.routes.AddAnotherLettingPartOfPropertyController.show(0).url
-              case false =>
-                controllers.connectiontoproperty.routes.AddAnotherLettingPartOfPropertyController
-                  .show(request.sessionData.stillConnectedDetails.get.lettingPartOfPropertyDetailsIndex)
-                  .url
+            if (request.sessionData.stillConnectedDetails.get.lettingPartOfPropertyDetails.isEmpty) {
+              controllers.connectiontoproperty.routes.AddAnotherLettingPartOfPropertyController.show(0).url
+            } else {
+              controllers.connectiontoproperty.routes.AddAnotherLettingPartOfPropertyController
+                .show(request.sessionData.stillConnectedDetails.get.lettingPartOfPropertyDetailsIndex)
+                .url
             }
           case Some(AnswerNo)  => controllers.connectiontoproperty.routes.IsRentReceivedFromLettingController.show().url
-          case _               => s"Unknown connection to property back link"
+          case _               => "Unknown connection to property back link"
         }
     }
 }

app/form/MappingSupport.scala

@@ -247,13 +247,13 @@ object MappingSupport:
 
   def rallyAreasMapping(year: String)(using messages: Messages): Mapping[Option[BigDecimal]] = optional(
     text
-      .verifying(messages(s"error.rallyAreas.areaInHectares.range", year), s => Try(BigDecimal(s)).isSuccess)
+      .verifying(messages("error.rallyAreas.areaInHectares.range", year), s => Try(BigDecimal(s)).isSuccess)
       .transform[BigDecimal](
         s => BigDecimal(s),
         _.toString
       )
-      .verifying(messages(s"error.rallyAreas.areaInHectares.range", year), _ >= 0)
-  ).verifying(messages(s"error.rallyAreas.areaInHectares.required", year), _.isDefined)
+      .verifying(messages("error.rallyAreas.areaInHectares.range", year), _ >= 0)
+  ).verifying(messages("error.rallyAreas.areaInHectares.required", year), _.isDefined)
 
   private val salesMax = BigDecimal(1000000000000L)
 

app/form/MonthYearFormatter.scala

@@ -56,7 +56,7 @@ class MonthYearFormatter(
 
     val fieldCapitalized = fieldName.capitalize
     val prefix           = messages("error.dateParts.prefix")
-    val monthText        = messages(s"error.dateParts.month")
+    val monthText        = messages("error.dateParts.month")
     val yearText         = messages("error.dateParts.year")
     val monthKey         = s"$key.month"
     val yearKey          = s"$key.year"

app/repositories/SessionRepository.scala

@@ -61,7 +61,7 @@ class SessionRepository @Inject() (mongo: MongoComponent)(implicit
                        .findOneAndUpdate(
                          filter = Filters.equal("_id", sessionId),
                          update = Updates.combine(
-                           Updates.set(s"data", Codecs.toBson(SensitiveSession(data))),
+                           Updates.set("data", Codecs.toBson(SensitiveSession(data))),
                            Updates.set("createdAt", Instant.now)
                          ),
                          options = FindOneAndUpdateOptions().upsert(true)

app/views/CheckYourAnswersHelpers.scala

@@ -33,4 +33,4 @@ object CheckYourAnswersHelpers:
 
     private def withFrom: String =
       // Append the "from" query string parameter with a "CYA" value
-      call.url + (if call.url.contains("?") then "&" else "?") + s"from=CYA"
+      call.url + (if call.url.contains("?") then "&" else "?") + "from=CYA"