Merge pull request #27489 from guardian/dina/remove-survey-switch

Remove `surveys` switch
guardian · Sep 19, 2024 · 353040d · 353040d
2 parents 2058b7a + 98b7f17
commit 353040d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 17 deletions.
diff --git a/applications/app/views/fragments/mediaBody.scala.html b/applications/app/views/fragments/mediaBody.scala.html
@@ -1,5 +1,4 @@
 @import common.LinkTo
-@import conf.switches.Switches.SurveySwitch
 @import model.{MediaPage, Video, VideoPlayer}
 @import views.support.Commercial.{isAdFree, isPaidContent}
 @import views.support.TrailCssClasses.toneClass
@@ -22,7 +21,7 @@
             )"
             itemscope itemtype="@media.metadata.schemaType" role="main">
 
-                @if(!page.metadata.isFront && SurveySwitch.isSwitchedOn) {
+                @if(!page.metadata.isFront && page.metadata.hasSurveyAd(request)) {
                     @fragments.commercial.survey()
                 }
 

diff --git a/article/app/pages/StoryHtmlPage.scala b/article/app/pages/StoryHtmlPage.scala
@@ -68,7 +68,7 @@ object StoryHtmlPage {
       bodyTag(classes = bodyClasses)(
         skipToMainContent(),
         pageSkin() when page.metadata.hasPageSkin(request),
-        survey() when SurveySwitch.isSwitchedOn,
+        survey() when page.metadata.hasSurveyAd(request),
         header,
         mainContent(),
         content,

diff --git a/common/app/common/dfp/SurveySponsorshipAgent.scala b/common/app/common/dfp/SurveySponsorshipAgent.scala
@@ -3,7 +3,6 @@ package common.dfp
 import play.api.mvc.RequestHeader
 import model.{MetaData}
 import model.DotcomContentType
-import conf.switches.Switches.{SurveySwitch}
 import net.liftweb.json.Meta
 
 trait SurveySponsorshipAgent {
@@ -21,7 +20,7 @@ trait SurveySponsorshipAgent {
   }
 
   def hasSurveyAd(fullAdUnitPath: String, metadata: MetaData, request: RequestHeader): Boolean = {
-    if (metadata.contentType == Some(DotcomContentType.Article) && SurveySwitch.isSwitchedOn) {
+    if (metadata.contentType == Some(DotcomContentType.Article)) {
       val adTest = request.getQueryString("adtest")
 
       findSponsorships(fullAdUnitPath, metadata, adTest).nonEmpty

diff --git a/common/app/conf/switches/CommercialSwitches.scala b/common/app/conf/switches/CommercialSwitches.scala
@@ -27,16 +27,6 @@ trait CommercialSwitches {
     exposeClientSide = true,
   )
 
-  val SurveySwitch = Switch(
-    Commercial,
-    "surveys",
-    "For delivering surveys, enables the requesting of the out-of-page slot on non-fronts. Switch OFF if there are no surveys active in GAM",
-    owners = Seq(Owner.withName("unknown")),
-    safeState = Off,
-    sellByDate = never,
-    exposeClientSide = true,
-  )
-
   val ImrWorldwideSwitch = Switch(
     Commercial,
     "imr-worldwide",

diff --git a/common/app/views/main.scala.html b/common/app/views/main.scala.html
@@ -1,6 +1,5 @@
 @(projectName: Option[String] = None)(head: Html)(body: Html)(implicit page: model.Page, request: RequestHeader, context: model.ApplicationContext)
 @import common.{Edition, commercial}
-@import conf.switches.Switches.SurveySwitch
 @import model.Page.getContent
 @import views.support.{Commercial, RenderClasses}
 @import play.api.Mode.Dev
@@ -45,7 +44,7 @@
             @fragments.commercial.pageSkin()
         }
 
-        @if(!page.metadata.isFront && SurveySwitch.isSwitchedOn) {
+        @if(!page.metadata.isFront && page.metadata.hasSurveyAd(request)) {
             @fragments.commercial.survey()
         }