ConsentItem table and class name

Author: simonredfern

obp-api/src/main/scala/bootstrap/liftweb/Boot.scala

@@ -63,7 +63,7 @@ import code.branches.MappedBranch
 import code.cardattribute.MappedCardAttribute
 import code.cards.{MappedPhysicalCard, PinReset}
 import code.connectormethod.ConnectorMethod
-import code.consent.{ConsentRequest, MappedConsent, MappedConsentItems}
+import code.consent.{ConsentItem, ConsentRequest, MappedConsent}
 import code.consumer.Consumers
 import code.model.Consumer
 import code.context.{MappedConsentAuthContext, MappedUserAuthContext, MappedUserAuthContextUpdate}
@@ -1120,7 +1120,7 @@ object ToSchemify {
     MappedCustomerIdMapping,
     MappedProductAttribute,
     MappedConsent,
-    MappedConsentItems,
+    ConsentItem,
     ConsentRequest,
     MigrationScriptLog,
     MethodRouting,

obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala

@@ -12127,6 +12127,10 @@ trait APIMethods400 extends MdcLoggable {
          |
          |${userAuthenticationMessage(true)}
          |
+         |1 limit (for pagination: defaults to 50)  eg:limit=200
+         |
+         |2 offset (for pagination: zero index, defaults to 0) eg: offset=10
+         |
          |""".stripMargin,
       EmptyBody,
       apiCollectionsJson400,
@@ -12140,12 +12144,22 @@ trait APIMethods400 extends MdcLoggable {
     lazy val getMyApiCollections: OBPEndpoint = {
       case "my" :: "api-collections" :: Nil JsonGet _ => { cc =>
         implicit val ec = EndpointContext(Some(cc))
+        val url = cc.url
+        val limitParam = getHttpRequestUrlParam(url, "limit") match {
+          case s if s.nonEmpty => scala.util.Try(s.toInt).getOrElse(50)
+          case _ => 50
+        }
+        val offsetParam = getHttpRequestUrlParam(url, "offset") match {
+          case s if s.nonEmpty => scala.util.Try(s.toInt).getOrElse(0)
+          case _ => 0
+        }
         for {
           (apiCollections, callContext) <- NewStyle.function
             .getApiCollectionsByUserId(cc.userId, Some(cc))
         } yield {
+          val paginated = apiCollections.drop(offsetParam).take(limitParam)
           (
-            JSONFactory400.createApiCollectionsJsonV400(apiCollections),
+            JSONFactory400.createApiCollectionsJsonV400(paginated),
             HttpCode.`200`(callContext)
           )
         }

obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala

@@ -1816,7 +1816,7 @@ trait APIMethods510 {
          |4 sort_by (defaults to created_date:desc)  eg: sort_by=created_date:desc
          |
          |Note: This endpoint only returns consents that explicitly reference the specified BANK_ID.
-         |Consents created before the consent_items join table was introduced will not appear in results.
+         |Consents created before the consent_item join table was introduced will not appear in results.
          |
          |eg: /banks/BANK_ID/my/consents?limit=10&offset=0&sort_by=created_date:desc
          |

…la/code/consent/MappedConsentItems.scala …ain/scala/code/consent/ConsentItem.scalaobp-api/src/main/scala/code/consent/MappedConsentItems.scala renamed to obp-api/src/main/scala/code/consent/ConsentItem.scala obp-api/src/main/scala/code/consent/MappedConsentItems.scala renamed to obp-api/src/main/scala/code/consent/ConsentItem.scala

@@ -3,11 +3,11 @@ package code.consent
 import code.util.MappedUUID
 import net.liftweb.mapper._
 
-// consent_items denormalises key fields (bank_id, account_id, view_id, role_name) from the consent JWT
+// consent_item denormalises key fields (bank_id, account_id, view_id, role_name) from the consent JWT
 // so that bank-scoped queries can be done via a simple indexed SQL join instead of extracting and
 // parsing every JWT. Rows are written at consent creation time alongside JWT generation.
-class MappedConsentItems extends LongKeyedMapper[MappedConsentItems] with IdPK {
-  def getSingleton = MappedConsentItems
+class ConsentItem extends LongKeyedMapper[ConsentItem] with IdPK {
+  def getSingleton = ConsentItem
 
   object consentItemId extends MappedUUID(this) {
     override def dbColumnName = "consent_item_id"
@@ -35,7 +35,7 @@ class MappedConsentItems extends LongKeyedMapper[MappedConsentItems] with IdPK {
   }
 }
 
-object MappedConsentItems extends MappedConsentItems with LongKeyedMetaMapper[MappedConsentItems] {
-  override def dbTableName = "consent_items"
+object ConsentItem extends ConsentItem with LongKeyedMetaMapper[ConsentItem] {
+  override def dbTableName = "consent_item"
   override def dbIndexes = UniqueIndex(consentItemId) :: Index(consentReferenceId) :: Index(bankId) :: Index(consentReferenceId, bankId) :: super.dbIndexes
 }

obp-api/src/main/scala/code/consent/DoobieConsentQueries.scala

@@ -186,15 +186,15 @@ object DoobieConsentQueries {
       val bankId = view.bank_id
       val accountId: Option[String] = Option(view.account_id).filter(_.nonEmpty)
       val viewId: Option[String] = Option(view.view_id).filter(_.nonEmpty)
-      fr"""INSERT INTO consent_items (consent_item_id, consent_reference_id, item_type, bank_id, account_id, view_id)
+      fr"""INSERT INTO consent_item (consent_item_id, consent_reference_id, item_type, bank_id, account_id, view_id)
            VALUES ($consentItemId, $consentReferenceId, $itemType, $bankId, $accountId, $viewId)""".update.run
     }
     val entitlementInserts = consentJWT.entitlements.filter(_.bank_id.nonEmpty).map { role =>
       val consentItemId = java.util.UUID.randomUUID().toString
       val itemType = "ENTITLEMENT"
       val bankId = role.bank_id
       val roleName: Option[String] = Option(role.role_name).filter(_.nonEmpty)
-      fr"""INSERT INTO consent_items (consent_item_id, consent_reference_id, item_type, bank_id, role_name)
+      fr"""INSERT INTO consent_item (consent_item_id, consent_reference_id, item_type, bank_id, role_name)
            VALUES ($consentItemId, $consentReferenceId, $itemType, $bankId, $roleName)""".update.run
     }
     val allInserts = viewInserts ++ entitlementInserts
@@ -206,7 +206,7 @@ object DoobieConsentQueries {
 
   /**
    * Get consents for a user filtered by bank_id, with pagination.
-   * Uses the consent_items join table for efficient bank-scoped queries.
+   * Uses the consent_item join table for efficient bank-scoped queries.
    */
   def getConsentsByUserAndBank(
     userId: String,
@@ -239,7 +239,7 @@ object DoobieConsentQueries {
            v.last_action_date, v.last_usage_date, v.created_date,
            v.note, v.frequency_per_day, v.uses_so_far_today_counter, v.jwt_payload, v.jwt_expires_at
            FROM v_consent v
-           JOIN consent_items cb ON cb.consent_reference_id = v.consent_reference_id
+           JOIN consent_item cb ON cb.consent_reference_id = v.consent_reference_id
            WHERE v.created_by_user_id = $userId
            AND cb.bank_id = $bankId""" ++ statusCond ++ fr" " ++ orderBy ++ fr" LIMIT $limit OFFSET $offset"
 

obp-api/src/main/scala/code/consent/MappedConsent.scala

@@ -328,7 +328,7 @@ object MappedConsentProvider extends ConsentProvider with code.util.Helper.MdcLo
           .mJsonWebTokenPayload(payload)
           .saveMe())
 
-        // Denormalise bank_id, account_id, view_id and role_name from the JWT into consent_items
+        // Denormalise bank_id, account_id, view_id and role_name from the JWT into consent_item
         // so that bank-scoped queries can use an indexed SQL join instead of extracting every JWT.
         result.foreach { savedConsent =>
           try {
@@ -337,7 +337,7 @@ object MappedConsentProvider extends ConsentProvider with code.util.Helper.MdcLo
             }
           } catch {
             case e: Exception =>
-              logger.error(s"setJsonWebToken says: Failed to populate consent_items for consent $consentId: ${e.getMessage}")
+              logger.error(s"setJsonWebToken says: Failed to populate consent_item for consent $consentId: ${e.getMessage}")
           }
         }
         result