Remove unnecessary argument

The additional argument snuck upon rebase confusing us how certain values are calculated. This removes the argument and formatting issues that came along.
snowplow · Jan 15, 2024 · 47e12a9 · 47e12a9
1 parent 3ebed61
commit 47e12a9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 27 deletions.
diff --git a/core/src/main/scala/com.snowplowanalytics.snowplow.collector.core/Routes.scala b/core/src/main/scala/com.snowplowanalytics.snowplow.collector.core/Routes.scala
@@ -53,7 +53,6 @@ class Routes[F[_]: Sync](
         path          = path,
         request       = req,
         pixelExpected = false,
-        doNotTrack    = false,
         contentType   = req.contentType.map(_.value.toLowerCase)
       )
 
@@ -64,7 +63,6 @@ class Routes[F[_]: Sync](
         path          = path,
         request       = req,
         pixelExpected = true,
-        doNotTrack    = false,
         contentType   = None
       )
 
@@ -74,7 +72,6 @@ class Routes[F[_]: Sync](
         path          = req.pathInfo.renderString,
         request       = req,
         pixelExpected = true,
-        doNotTrack    = false,
         contentType   = None
       )
   }

diff --git a/core/src/main/scala/com.snowplowanalytics.snowplow.collector.core/Service.scala b/core/src/main/scala/com.snowplowanalytics.snowplow.collector.core/Service.scala
@@ -40,7 +40,6 @@ trait IService[F[_]] {
     path: String,
     request: Request[F],
     pixelExpected: Boolean,
-    doNotTrack: Boolean,
     contentType: Option[String] = None
   ): F[Response[F]]
   def determinePath(vendor: String, version: String): String
@@ -73,7 +72,6 @@ class Service[F[_]: Sync](
     path: String,
     request: Request[F],
     pixelExpected: Boolean,
-    doNotTrack: Boolean,
     contentType: Option[String] = None
   ): F[Response[F]] =
     for {
@@ -87,15 +85,13 @@ class Service[F[_]: Sync](
       queryString     = Some(request.queryString)
       cookie          = extractCookie(request)
       doNotTrack      = checkDoNotTrackCookie(request)
-      alreadyBouncing = queryString.contains(config.cookieBounce.name)
+      alreadyBouncing = config.cookieBounce.enabled && queryString.contains(config.cookieBounce.name)
       nuidOpt         = networkUserId(request, cookie, spAnonymous)
       nuid = nuidOpt.getOrElse {
         if (alreadyBouncing) config.cookieBounce.fallbackNetworkUserId
         else UUID.randomUUID().toString
       }
-      shouldBounce = config.cookieBounce.enabled && nuidOpt.isEmpty && !alreadyBouncing &&
-        pixelExpected && !redirect
-
+      shouldBounce              = config.cookieBounce.enabled && nuidOpt.isEmpty && !alreadyBouncing && pixelExpected && !redirect
       (ipAddress, partitionKey) = ipAndPartitionKey(ip, config.streams.useIpAddressAsPartitionKey)
       event = buildEvent(
         queryString,

diff --git a/core/src/test/scala/com.snowplowanalytics.snowplow.collector.core/RoutesSpec.scala b/core/src/test/scala/com.snowplowanalytics.snowplow.collector.core/RoutesSpec.scala
@@ -45,7 +45,6 @@ class RoutesSpec extends Specification {
       path: String,
       request: Request[IO],
       pixelExpected: Boolean,
-      doNotTrack: Boolean,
       contentType: Option[String]
     ): IO[Response[IO]] =
       IO.delay {
@@ -54,7 +53,7 @@ class RoutesSpec extends Specification {
           path,
           request,
           pixelExpected,
-          doNotTrack,
+          false,
           contentType
         )
         Response(status = Ok, body = Stream.emit("cookie").through(text.utf8.encode))

diff --git a/core/src/test/scala/com.snowplowanalytics.snowplow.collector.core/ServiceSpec.scala b/core/src/test/scala/com.snowplowanalytics.snowplow.collector.core/ServiceSpec.scala
@@ -79,7 +79,6 @@ class ServiceSpec extends Specification {
             path          = "p",
             request       = request,
             pixelExpected = false,
-            doNotTrack    = false,
             contentType   = None
           )
           .unsafeRunSync()
@@ -100,7 +99,6 @@ class ServiceSpec extends Specification {
             path          = "p",
             request       = req,
             pixelExpected = false,
-            doNotTrack    = false,
             contentType   = Some("image/gif")
           )
           .unsafeRunSync()
@@ -124,7 +122,6 @@ class ServiceSpec extends Specification {
             path          = "p",
             request       = req,
             pixelExpected = false,
-            doNotTrack    = false,
             contentType   = Some("image/gif")
           )
           .unsafeRunSync()
@@ -150,7 +147,6 @@ class ServiceSpec extends Specification {
             path          = "p",
             request       = req,
             pixelExpected = false,
-            doNotTrack    = false,
             contentType   = Some("image/gif")
           )
           .unsafeRunSync()
@@ -173,7 +169,6 @@ class ServiceSpec extends Specification {
             path          = "p",
             request       = req,
             pixelExpected = false,
-            doNotTrack    = false,
             contentType   = Some("image/gif")
           )
           .unsafeRunSync()
@@ -199,7 +194,6 @@ class ServiceSpec extends Specification {
             path          = "p",
             request       = req,
             pixelExpected = false,
-            doNotTrack    = false,
             contentType   = Some("image/gif")
           )
           .unsafeRunSync()
@@ -228,7 +222,6 @@ class ServiceSpec extends Specification {
             path          = "p",
             request       = req,
             pixelExpected = false,
-            doNotTrack    = false,
             contentType   = Some("image/gif")
           )
           .unsafeRunSync()
@@ -275,7 +268,6 @@ class ServiceSpec extends Specification {
             path          = "p",
             request       = req,
             pixelExpected = false,
-            doNotTrack    = false,
             contentType   = Some("image/gif")
           )
           .unsafeRunSync()
@@ -303,7 +295,6 @@ class ServiceSpec extends Specification {
             path          = "p",
             request       = Request[IO](),
             pixelExpected = true,
-            doNotTrack    = false,
             contentType   = None
           )
           .unsafeRunSync()
@@ -320,7 +311,6 @@ class ServiceSpec extends Specification {
             path          = "p",
             request       = Request[IO](),
             pixelExpected = true,
-            doNotTrack    = false,
             contentType   = None
           )
           .unsafeRunSync()
@@ -354,7 +344,6 @@ class ServiceSpec extends Specification {
             path          = "p",
             request       = request,
             pixelExpected = true,
-            doNotTrack    = false,
             contentType   = None
           )
           .unsafeRunSync()
@@ -384,7 +373,6 @@ class ServiceSpec extends Specification {
             path          = testPath,
             request       = req,
             pixelExpected = false,
-            doNotTrack    = false,
             contentType   = None
           )
           .unsafeRunSync()
@@ -673,8 +661,8 @@ class ServiceSpec extends Specification {
           headers       = Headers.empty,
           cookieConfig  = testCookieConfig.copy(enabled = false),
           networkUserId = "nuid",
-          doNotTrack    = false,
           spAnonymous   = None,
+          doNotTrack    = true,
           now           = now
         ) shouldEqual None
       }
@@ -683,8 +671,8 @@ class ServiceSpec extends Specification {
           headers       = Headers.empty,
           cookieConfig  = testCookieConfig,
           networkUserId = "nuid",
-          doNotTrack    = true,
           spAnonymous   = None,
+          doNotTrack    = true,
           now           = now
         ) shouldEqual None
       }
@@ -693,8 +681,8 @@ class ServiceSpec extends Specification {
           headers       = Headers.empty,
           cookieConfig  = testCookieConfig,
           networkUserId = "nuid",
-          doNotTrack    = true,
           spAnonymous   = Some("*"),
+          doNotTrack    = true,
           now           = now
         ) shouldEqual None
       }
@@ -710,8 +698,8 @@ class ServiceSpec extends Specification {
             headers       = Headers.empty,
             cookieConfig  = conf,
             networkUserId = nuid,
-            doNotTrack    = false,
             spAnonymous   = None,
+            doNotTrack    = false,
             now           = now
           )
         cookie.secure must beTrue