Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

derived_tstamp and etl_tstamp should always be defined #80

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

derived_tstamp and etl_tstamp should always be defined #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/src/main/scala/com/snowplowanalytics/snowplow/eventgen/enrich/SdkEvent.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ object SdkEvent {
case _ => None
}

val defaultEnrichment = enrichments.flatMap(_.defaultEnrichment)
val defaultEnrichment = enrichments.map(_.defaultEnrichment)
val ipEnrichment = enrichments.flatMap(_.ipEnrichment)
val urlEnrichment = enrichments.flatMap(_.urlEnrichment)
val refererEnrichment = enrichments.flatMap(_.refererEnrichment)
Expand Down Expand Up @@ -225,14 +225,14 @@ object SdkEvent {
refr_dvce_tstamp = crossDomainEnrichment.flatMap(_.refr_dvce_tstamp),
derived_contexts = el.derivedContexts.forSdkEvent,
domain_sessionid = el.u.flatMap(_.sid.map(_.toString)),
derived_tstamp = defaultEnrichment.flatMap(_.derived_tstamp),
derived_tstamp = defaultEnrichment.map(_.derived_tstamp),
event_vendor = ueVendor,
event_name = eName,
event_format = ueFormat,
event_version = ueVersion,
event_fingerprint = eventFingerprintEnrichment.flatMap(_.event_fingerprint),
true_tstamp = el.dt.flatMap(_.ttm),
etl_tstamp = defaultEnrichment.flatMap(_.etl_tstamp)
etl_tstamp = defaultEnrichment.map(_.etl_tstamp)
)
}

Expand Down
8 changes: 4 additions & 4 deletions ...scala/com/snowplowanalytics/snowplow/eventgen/protocol/enrichment/DefaultEnrichment.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ import org.scalacheck.Gen
import org.scalacheck.cats.implicits._

case class DefaultEnrichment(
derived_tstamp: Option[Instant],
etl_tstamp: Option[Instant]
derived_tstamp: Instant,
etl_tstamp: Instant
)

object DefaultEnrichment {
def gen: Gen[DefaultEnrichment] =
(
genInstantOpt(Instant.now),
genInstantOpt(Instant.now)
genInstant(Instant.now),
genInstant(Instant.now)
).mapN(DefaultEnrichment.apply)
}
4 changes: 2 additions & 2 deletions .../main/scala/com/snowplowanalytics/snowplow/eventgen/protocol/enrichment/Enrichments.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import org.scalacheck.Gen
import org.scalacheck.cats.implicits._

final case class Enrichments(
defaultEnrichment: Option[DefaultEnrichment],
defaultEnrichment: DefaultEnrichment,
ipEnrichment: Option[IpEnrichment],
urlEnrichment: Option[UrlEnrichment],
refererEnrichment: Option[RefererEnrichment],
Expand All @@ -32,7 +32,7 @@ object Enrichments {

def gen: Gen[Enrichments] =
(
Gen.option(DefaultEnrichment.gen),
DefaultEnrichment.gen,
Gen.option(IpEnrichment.gen),
Gen.option(UrlEnrichment.gen),
Gen.option(RefererEnrichment.gen),
Expand Down
Loading