Merge 789cc3e into 1bd2afa

guardian · Sep 9, 2019 · 5cefc8d · 5cefc8d
2 parents 1bd2afa + 789cc3e
commit 5cefc8d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 25 deletions.
diff --git a/handlers/holiday-stop-api/src/main/scala/com/gu/holiday_stops/Handler.scala b/handlers/holiday-stop-api/src/main/scala/com/gu/holiday_stops/Handler.scala
@@ -167,30 +167,18 @@ object Handler extends Logging {
       pathParams <- req.pathParamsAsCaseClass[PotentialHolidayStopsV2PathParams]()(Json.reads[PotentialHolidayStopsV2PathParams])
       productNamePrefix <- req.headers.flatMap(_.get(HEADER_PRODUCT_NAME_PREFIX)).toApiGatewayOp(s"missing '$HEADER_PRODUCT_NAME_PREFIX' header")
       queryParams <- req.queryParamsAsCaseClass[PotentialHolidayStopsV2QueryParams]()
-      credit <- estimateCredit(queryParams, pathParams, config, backend)
-    } yield ApiGatewayResponse(
-      "200",
-      PotentialHolidayStopsResponse(
-        ActionCalculator.publicationDatesToBeStopped(queryParams.startDate, queryParams.endDate, ProductName(productNamePrefix))
-          .map(PotentialHolidayStop(_, credit))
-      )
-    )).apiResponse
-  }
-
-  def estimateCredit(
-    queryParams: PotentialHolidayStopsV2QueryParams,
-    pathParams: PotentialHolidayStopsV2PathParams,
-    config: Config,
-    backend: SttpBackend[Id, Nothing]
-  ): ApiGatewayOp[Option[Double]] = {
-    if (queryParams.estimateCredit == Some("true")) {
-      CreditCalculator
-        .guardianWeeklyCredit(config, pathParams.subscriptionName, backend, /* FIXME: estimation for N-for-N will be wrong */ LocalDate.now)
-        .toApiGatewayOp("Failed to calculate credit")
-        .map(Some(_))
-    } else {
-      ContinueProcessing(None)
-    }
+    } yield {
+      val potentialHolidayStops =
+        ActionCalculator
+          .publicationDatesToBeStopped(queryParams.startDate, queryParams.endDate, ProductName(productNamePrefix))
+          .map { stoppedPublicationDate => // unfortunately necessary due to GW N-for-N requiring stoppedPublicationDate to calculate correct credit estimation
+            if (queryParams.estimateCredit.contains("true"))
+              PotentialHolidayStop(stoppedPublicationDate, CreditCalculator(config, pathParams.subscriptionName, backend, stoppedPublicationDate).toOption)
+            else
+              PotentialHolidayStop(stoppedPublicationDate, None)
+          }
+      ApiGatewayResponse("200", PotentialHolidayStopsResponse(potentialHolidayStops))
+    }).apiResponse
   }
 
   case class ListExistingPathParams(subscriptionName: Option[SubscriptionName])

diff --git a/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/CreditCalculator.scala b/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/CreditCalculator.scala
@@ -6,7 +6,7 @@ import com.gu.salesforce.holiday_stops.SalesforceHolidayStopRequestsDetail.Subsc
 import com.softwaremill.sttp.{Id, SttpBackend}
 
 object CreditCalculator {
-  def guardianWeeklyCredit(
+  def apply(
     config: Config,
     subscriptionName: SubscriptionName,
     backend: SttpBackend[Id, Nothing],