Skip to content

Commit

Permalink
refactoring (simplifies handling of SupporterPlus 2024 notification d…
Browse files Browse the repository at this point in the history 
…ata)
  • Loading branch information
@shtukas
shtukas committed Sep 21, 2024
1 parent 6c257ca commit 1349068
Showing 1 changed file with 49 additions and 62 deletions.
111 changes: 49 additions & 62 deletions lambda/src/main/scala/pricemigrationengine/handlers/NotificationHandler.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ import pricemigrationengine.model.RateplansProbe
import java.time.{LocalDate, ZoneId}
import java.time.format.DateTimeFormatter

case class SupporterPlus2024NotificationData(
contributionAmount: Option[BigDecimal],
previousCombinedAmount: Option[BigDecimal],
newCombinedAmount: Option[BigDecimal]
)

object NotificationHandler extends CohortHandler {

private val batchSize = 150
Expand Down Expand Up @@ -155,19 +161,24 @@ object NotificationHandler extends CohortHandler {

// ----------------------------------------------------
// Data for SupporterPlus2024
subscription <- Zuora.fetchSubscription(cohortItem.subscriptionName)
sp2024ContributionAmountOpt <- ZIO.fromEither(sp2024ContributionAmount(cohortSpec, subscription))
sp2024PreviousCombinedAmountOpt <- ZIO.fromEither(sp2024PreviousCombinedAmount(cohortSpec, subscription))
sp2024NewCombinedAmountOpt <- ZIO.fromEither(sp2024NewCombinedAmount(cohortSpec, subscription))

sp2024ContributionAmountWithCurrencySymbolOpt = sp2024ContributionAmountOpt.map(a => s"${currencySymbol}${a}")
sp2024PreviousCombinedAmountWithCurrencySymbolOpt = sp2024PreviousCombinedAmountOpt.map(a =>
s"${currencySymbol}${a}"

supporterPlus2024NotificationData <- buildSupporterPlus2024NotificationData(
cohortSpec,
cohortItem.subscriptionName
)
sp2024NewCombinedAmountWithCurrencySymbolOpt = sp2024NewCombinedAmountOpt.map(a => s"${currencySymbol}${a}")

sp2024ContributionAmountWithCurrencySymbol = supporterPlus2024NotificationData.contributionAmount
.map(a => s"${currencySymbol}${a.toString()}")
.getOrElse("")
sp2024PreviousCombinedAmountWithCurrencySymbol = supporterPlus2024NotificationData.previousCombinedAmount
.map(a => s"${currencySymbol}${a.toString()}")
.getOrElse("")
sp2024NewCombinedAmountWithCurrencySymbol = supporterPlus2024NotificationData.newCombinedAmount
.map(a => s"${currencySymbol}${a.toString()}")
.getOrElse("")
// ----------------------------------------------------

brazeName <- ZIO.fromEither(brazeName(cohortSpec, subscription))
brazeName <- brazeName(cohortSpec, cohortItem.subscriptionName)

_ <- EmailSender.sendEmail(
message = EmailMessage(
Expand Down Expand Up @@ -200,9 +211,9 @@ object NotificationHandler extends CohortHandler {
// to be able to fill the email template. That distribution is given by the next section.

// SupporterPlus 2024 extension
sp2024_contribution_amount = sp2024ContributionAmountWithCurrencySymbolOpt.getOrElse(""),
sp2024_previous_combined_amount = sp2024PreviousCombinedAmountWithCurrencySymbolOpt.getOrElse(""),
sp2024_new_combined_amount = sp2024NewCombinedAmountWithCurrencySymbolOpt.getOrElse("")
sp2024_contribution_amount = sp2024ContributionAmountWithCurrencySymbol,
sp2024_previous_combined_amount = sp2024PreviousCombinedAmountWithCurrencySymbol,
sp2024_new_combined_amount = sp2024NewCombinedAmountWithCurrencySymbol
// -------------------------------------------------------------
)
)
Expand Down Expand Up @@ -497,55 +508,26 @@ object NotificationHandler extends CohortHandler {
}

// -------------------------------------------------------------------
// Supporter Plus 2024 extra functions

/*
Date: September 2024
Author: Pascal
Comment Group: 602514a6-5e53
These functions have been added to implement the extra fields added to EmailPayloadSubscriberAttributes
as part of the set up of the SupporterPlus 2024 migration (see Comment Group: 602514a6-5e53)
*/

def sp2024ContributionAmount(
cohortSpec: CohortSpec,
subscription: ZuoraSubscription
): Either[Failure, Option[String]] = {
// nb: Going against Coding Directive #1, we do not need to over specify the match, because we are expecting
// a non trivial behavior only for SupporterPlus2024
MigrationType(cohortSpec) match {
case SupporterPlus2024 =>
SupporterPlus2024Migration.contributionAmount(subscription).map(o => o.map(b => b.toString))
case _ => Right(None)
}
}
// Supporter Plus 2024 extra function

def sp2024PreviousCombinedAmount(
def buildSupporterPlus2024NotificationData(
cohortSpec: CohortSpec,
subscription: ZuoraSubscription
): Either[Failure, Option[String]] = {
// nb: Going against Coding Directive #1, we do not need to over specify the match, because we are expecting
// a non trivial behavior only for SupporterPlus2024
subscriptionNumber: String
): ZIO[Zuora, Failure, SupporterPlus2024NotificationData] = {
MigrationType(cohortSpec) match {
case SupporterPlus2024 =>
SupporterPlus2024Migration
.previousCombinedAmount(subscription)
.map(o => o.map(b => b.toString))
case _ => Right(None)
}
}

def sp2024NewCombinedAmount(
cohortSpec: CohortSpec,
subscription: ZuoraSubscription
): Either[Failure, Option[String]] = {
// nb: Going against Coding Directive #1, we do not need to over specify the match, because we are expecting
// a non trivial behavior only for SupporterPlus2024
MigrationType(cohortSpec) match {
case SupporterPlus2024 =>
SupporterPlus2024Migration.newCombinedAmount(subscription).map(o => o.map(b => b.toString))
case _ => Right(None)
case SupporterPlus2024 => {
for {
subscription <- Zuora.fetchSubscription(subscriptionNumber)
contributionAmountOpt <- ZIO.fromEither(SupporterPlus2024Migration.contributionAmount(subscription))
previousCombinedAmountOpt <- ZIO.fromEither(SupporterPlus2024Migration.previousCombinedAmount(subscription))
newCombinedAmountOpt <- ZIO.fromEither(SupporterPlus2024Migration.newCombinedAmount(subscription))
} yield SupporterPlus2024NotificationData(
contributionAmount = contributionAmountOpt,
previousCombinedAmount = previousCombinedAmountOpt,
newCombinedAmount = newCombinedAmountOpt
)
}
case _ => ZIO.succeed(SupporterPlus2024NotificationData(None, None, None))
}
}

Expand All @@ -563,10 +545,15 @@ object NotificationHandler extends CohortHandler {
// SupporterPlus2024 finished, we may decide to go back to a simpler format, or keep that function, depending
// on the likelihood of Marketing adopting this variation in the future.

def brazeName(cohortSpec: CohortSpec, subscription: ZuoraSubscription): Either[Failure, String] = {
def brazeName(cohortSpec: CohortSpec, subscriptionNumber: String): ZIO[Zuora, Failure, String] = {
MigrationType(cohortSpec) match {
case SupporterPlus2024 => SupporterPlus2024Migration.brazeName(subscription)
case _ => Right(cohortSpec.brazeCampaignName)
case SupporterPlus2024 => {
for {
subscription <- Zuora.fetchSubscription(subscriptionNumber)
bn <- ZIO.fromEither(SupporterPlus2024Migration.brazeName(subscription))
} yield bn
}
case _ => ZIO.succeed(cohortSpec.brazeCampaignName)
}
}
}

0 comments on commit 1349068

Please sign in to comment.