-
Notifications
You must be signed in to change notification settings - Fork 16
PTAD-239: Add LEPP tile behind feature toggle #1072
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.
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
Open
olakunlekuye2
wants to merge
8
commits into
main
Choose a base branch
from
PTAD-239
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
e0df7d7
PTAD-239: Add LEPP tile behind feature toggle
okuye 4e70e18
PTAD-239 fix: add low-earners-pensions-payment service config to Inte…
okuye f477022
PTAD-239 fix: add LeppConnector binding to RLSInterruptPageSpec overr…
okuye f19db42
PTAD-239 fix: configure LEPP URLs as localhost service host like othe…
okuye cc1080c
PTAD-239 fix: refactor LEPP config to standard pattern and remove unr…
okuye 62e8a13
PTAD-239 fix: refactor LEPP config to standard pattern and remove unr…
okuye 3c4b222
PTAD-239 cleanup: remove unused label.online_deadline_tax_returns
okuye 22c6993
PTAD-239 fix: restore unrelated view spec tests
okuye File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /* | ||
| * Copyright 2026 HM Revenue & Customs | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package connectors | ||
|
|
||
| import cats.data.EitherT | ||
| import com.google.common.util.concurrent.RateLimiter | ||
| import com.google.inject.name.Named | ||
| import com.google.inject.{Inject, Singleton} | ||
| import config.ConfigDecorator | ||
| import models.LeppSummaryResponse | ||
| import play.api.Logging | ||
| import play.api.mvc.Request | ||
| import services.CacheService | ||
| import uk.gov.hmrc.http.HttpReads.Implicits.* | ||
| import uk.gov.hmrc.http.client.HttpClientV2 | ||
| import uk.gov.hmrc.http.{HeaderCarrier, HttpResponse, StringContextOps, UpstreamErrorResponse} | ||
| import uk.gov.hmrc.play.bootstrap.config.ServicesConfig | ||
| import util.{Limiters, Throttle} | ||
|
|
||
| import java.util.UUID.randomUUID | ||
| import scala.concurrent.duration.DurationInt | ||
| import scala.concurrent.{ExecutionContext, Future} | ||
|
|
||
| trait LeppConnector { | ||
| def getLeppSummary(implicit | ||
| hc: HeaderCarrier, | ||
| ec: ExecutionContext, | ||
| request: Request[?] | ||
| ): EitherT[Future, UpstreamErrorResponse, LeppSummaryResponse] | ||
| } | ||
|
|
||
| @Singleton | ||
| class DefaultLeppConnector @Inject() ( | ||
| val httpClientV2: HttpClientV2, | ||
| servicesConfig: ServicesConfig, | ||
| httpClientResponse: HttpClientResponse, | ||
| configDecorator: ConfigDecorator, | ||
| limiters: Limiters | ||
| ) extends LeppConnector | ||
| with Throttle | ||
| with Logging { | ||
|
|
||
| override val rateLimiter: RateLimiter = limiters.rateLimiterForLeppSummary | ||
| private lazy val baseUrl: String = servicesConfig.baseUrl("low-earners-pensions-payment") | ||
|
|
||
| override def getLeppSummary(implicit | ||
| hc: HeaderCarrier, | ||
| ec: ExecutionContext, | ||
| request: Request[?] | ||
| ): EitherT[Future, UpstreamErrorResponse, LeppSummaryResponse] = { | ||
| val url = s"$baseUrl/low-earners-pensions-payment/get-lepp-summary" | ||
|
|
||
| implicit val leppHeaderCarrier: HeaderCarrier = hc.withExtraHeaders( | ||
| "correlationId" -> randomUUID.toString | ||
| ) | ||
|
|
||
| val response: Future[Either[UpstreamErrorResponse, HttpResponse]] = | ||
| withThrottle { | ||
| httpClientV2 | ||
| .get(url"$url")(leppHeaderCarrier) | ||
| .transform(_.withRequestTimeout(configDecorator.leppTimeoutInMilliseconds.milliseconds)) | ||
| .execute[Either[UpstreamErrorResponse, HttpResponse]](readEitherOf(readRaw), ec) | ||
| } | ||
|
|
||
| httpClientResponse.read(response).map(_.json.as[LeppSummaryResponse]) | ||
| } | ||
| } | ||
|
|
||
| @Singleton | ||
| class CachingLeppConnector @Inject() ( | ||
| @Named("default") underlying: LeppConnector, | ||
| cacheService: CacheService | ||
| ) extends LeppConnector { | ||
|
|
||
| override def getLeppSummary(implicit | ||
| hc: HeaderCarrier, | ||
| ec: ExecutionContext, | ||
| request: Request[?] | ||
| ): EitherT[Future, UpstreamErrorResponse, LeppSummaryResponse] = | ||
| cacheService.cache("leppSummary") { | ||
| underlying.getLeppSummary | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * Copyright 2026 HM Revenue & Customs | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package models | ||
|
|
||
| import play.api.libs.json.{Json, OFormat} | ||
|
|
||
| case class LeppSummaryResponse(status: String) | ||
|
|
||
| object LeppSummaryResponse { | ||
| implicit val formats: OFormat[LeppSummaryResponse] = Json.format[LeppSummaryResponse] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lots of unrelated changes