Skip to content

Few tweaks #2487

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

Merged
simonredfern merged 2 commits into from
Feb 5, 2025
Merged

Few tweaks #2487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b2c53d
feature/Query param in /obp/v5.1.0/management/consents?status
constantine2nd Feb 4, 2025
e1412fa
feature/frequencyPerDay in /obp/v5.1.0/management/consents/
constantine2nd Feb 4, 2025
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
4 changes: 4 additions & 0 deletions obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ case class AllConsentJsonV510(consent_reference_id: String,
last_action_date: String,
last_usage_date: String,
jwt_payload: Box[ConsentJWT],
frequency_per_day: Option[Int] = None,
remaining_requests: Option[Int] = None,
api_standard: String,
api_version: String,
)
Expand Down Expand Up @@ -895,6 +897,8 @@ object JSONFactory510 extends CustomJsonFormats {
last_action_date = if (c.lastActionDate != null) new SimpleDateFormat(DateWithDay).format(c.lastActionDate) else null,
last_usage_date = if (c.usesSoFarTodayCounterUpdatedAt != null) new SimpleDateFormat(DateWithSeconds).format(c.usesSoFarTodayCounterUpdatedAt) else null,
jwt_payload = jwtPayload,
frequency_per_day = if(c.apiStandard == "BG") Some(c.frequencyPerDay) else None,
remaining_requests = if(c.apiStandard == "BG") Some(c.frequencyPerDay - c.usesSoFarTodayCounter) else None,
api_standard = c.apiStandard,
api_version = c.apiVersion
)
Expand Down
14 changes: 8 additions & 6 deletions obp-api/src/main/scala/code/consent/MappedConsent.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,15 @@ object MappedConsentProvider extends ConsentProvider {


private def getQueryParams(queryParams: List[OBPQueryParam]) = {
val limit = queryParams.collect { case OBPLimit(value) => MaxRows[MappedConsent](value) }.headOption
val offset = queryParams.collect { case OBPOffset(value) => StartAt[MappedConsent](value) }.headOption
val limit = queryParams.collectFirst { case OBPLimit(value) => MaxRows[MappedConsent](value) }
val offset = queryParams.collectFirst { case OBPOffset(value) => StartAt[MappedConsent](value) }
// The optional variables:
val consumerId = queryParams.collect { case OBPConsumerId(value) => By(MappedConsent.mConsumerId, value)}.headOption
val consentId = queryParams.collect { case OBPConsentId(value) => By(MappedConsent.mConsentId, value)}.headOption
val userId = queryParams.collect { case OBPUserId(value) => By(MappedConsent.mUserId, value)}.headOption
val status = queryParams.collect { case OBPStatus(value) => By(MappedConsent.mStatus, value.toUpperCase())}.headOption
val consumerId = queryParams.collectFirst { case OBPConsumerId(value) => By(MappedConsent.mConsumerId, value) }
val consentId = queryParams.collectFirst { case OBPConsentId(value) => By(MappedConsent.mConsentId, value) }
val userId = queryParams.collectFirst { case OBPUserId(value) => By(MappedConsent.mUserId, value) }
val status = queryParams.collectFirst {
case OBPStatus(value) => ByList(MappedConsent.mStatus, List(value.toLowerCase(), value.toUpperCase()))
}

Seq(
offset.toSeq,
Expand Down