Merge branch 'develop' of github.com:OpenBankProject/OBP-API into develop

# Conflicts:
#	obp-api/src/main/scala/code/api/v3_0_0/Http4s300.scala
#	obp-api/src/main/scala/code/api/v3_1_0/Http4s310.scala
#	obp-api/src/main/scala/code/api/v4_0_0/Http4s400.scala

Author: constantine2nd

obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala

@@ -132,7 +132,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth
         case ApiVersion.v3_0_0 => OBPAPI3_0_0.allResourceDocs
         case ApiVersion.v2_2_0 => OBPAPI2_2_0.allResourceDocs
         case ApiVersion.v2_1_0 => OBPAPI2_1_0.allResourceDocs
-        case ApiVersion.v2_0_0 => Implementations2_0_0.resourceDocs ++ Implementations1_4_0.resourceDocs ++ Implementations1_3_0.resourceDocs ++ Implementations1_2_1.resourceDocs
+        case ApiVersion.v2_0_0 => OBPAPI2_0_0.allResourceDocs
         case ApiVersion.v1_4_0 => Implementations1_4_0.resourceDocs ++ Implementations1_3_0.resourceDocs ++ Implementations1_2_1.resourceDocs
         case ApiVersion.v1_3_0 => Implementations1_3_0.resourceDocs ++ Implementations1_2_1.resourceDocs
         case ApiVersion.v1_2_1 => code.api.v1_2_1.Http4s121.resourceDocs
@@ -183,6 +183,9 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth
         case ApiVersion.v4_0_0 => resourceDocs  // fully on http4s — no Lift route filter
         case ApiVersion.v3_1_0 => resourceDocs  // fully on http4s — no Lift route filter
         case ApiVersion.v3_0_0 => resourceDocs  // fully on http4s — no Lift route filter
+        case ApiVersion.v2_2_0 => resourceDocs  // fully on http4s — no Lift route filter
+        case ApiVersion.v2_1_0 => resourceDocs  // fully on http4s — no Lift route filter
+        case ApiVersion.v2_0_0 => resourceDocs  // fully on http4s — no Lift route filter
         case _ => resourceDocs.filter(rd => versionRoutesClasses.contains(rd.partialFunction.getClass))
       }
 

obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala

@@ -167,6 +167,19 @@ object Http4s200 {
       List(apiTagAccountPublic, apiTagAccount, apiTagPublicData), None,
       http4sPartialFunction = Some(publicAccountsAllBanks))
 
+    def processAccounts(privateViews: List[com.openbankproject.commons.model.View],
+                        accounts: List[com.openbankproject.commons.model.BankAccount]
+                       ): net.liftweb.json.JsonAST.JValue = {
+      val accJson = accounts.map { account =>
+        val viewsAvailable = privateViews
+          .filter(v => v.bankId == account.bankId && v.accountId == account.accountId && v.isPrivate)
+          .map(createBasicViewJSON)
+          .distinct
+        createBasicAccountJSON(account, viewsAvailable)
+      }
+      net.liftweb.json.Extraction.decompose(accJson)
+    }
+
     // ─── getPrivateAccountsAtOneBank ──────────────────────────────────────────
 
     val getPrivateAccountsAtOneBank: HttpRoutes[IO] = HttpRoutes.of[IO] {

obp-api/src/main/scala/code/api/v2_0_0/Http4s200.scala

@@ -1,205 +1,30 @@
-/**
-Open Bank Project - API
-Copyright (C) 2011-2019, TESOBE GmbH.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Email: contact@tesobe.com
-TESOBE GmbH.
-Osloer Strasse 16/17
-Berlin 13359, Germany
-
-This product includes software developed at
-TESOBE (http://www.tesobe.com/)
-
-  */
 package code.api.v2_0_0
 
 import scala.language.reflectiveCalls
 import code.api.OBPRestHelper
-import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
-import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus}
+import code.api.util.APIUtil.OBPEndpoint
 import code.api.util.VersionedOBPApis
-import code.api.v1_3_0.APIMethods130
-import code.api.v1_4_0.APIMethods140
+import code.api.v1_4_0.OBPAPI1_4_0
 import code.util.Helper.MdcLoggable
+import com.openbankproject.commons.util.{ApiVersion, ApiVersionStatus}
 
-object OBPAPI2_0_0 extends OBPRestHelper with APIMethods130 with APIMethods140 with APIMethods200 with MdcLoggable with VersionedOBPApis{
-
+/*
+This file defines which endpoints from all the versions are available in v2.0.0.
+All v2.0.0 endpoints have been migrated to Http4s200 — this object is retained
+only for resource-doc aggregation and the Lift dispatch registry.
+ */
+object OBPAPI2_0_0 extends OBPRestHelper with MdcLoggable with VersionedOBPApis {
 
-  val version : ApiVersion = ApiVersion.v2_0_0 // "2.0.0"
+  val version: ApiVersion = ApiVersion.v2_0_0
   val versionStatus = ApiVersionStatus.DEPRECATED.toString
 
+  val Implementations2_0_0 = Http4s200.Implementations2_0_0
 
-  // Note: Since we pattern match on these routes, if two implementations match a given url the first will match
-
-  lazy val endpointsOf1_2_1 =  List(
-    Implementations1_2_1.getBanks,
-    Implementations1_2_1.bankById,
-    // Now in 2_0_0
-//  Implementations1_2_1.allAccountsAllBanks,
-//  Implementations1_2_1.privateAccountsAllBanks,
-//  Implementations1_2_1.publicAccountsAllBanks,
-//  Implementations1_2_1.allAccountsAtOneBank,
-//  Implementations1_2_1.privateAccountsAtOneBank,
-//  Implementations1_2_1.publicAccountsAtOneBank,
-//  Implementations1_2_1.accountById,
-    Implementations1_2_1.updateAccountLabel,
-    Implementations1_2_1.getViewsForBankAccount,
-    Implementations1_2_1.createViewForBankAccount,
-    Implementations1_2_1.updateViewForBankAccount,
-    Implementations1_2_1.deleteViewForBankAccount,
-//    Implementations1_2_1.getPermissionsForBankAccount,
-//    Implementations1_2_1.getPermissionForUserForBankAccount,
-    Implementations1_2_1.addPermissionForUserForBankAccountForMultipleViews,
-    Implementations1_2_1.addPermissionForUserForBankAccountForOneView,
-    Implementations1_2_1.removePermissionForUserForBankAccountForOneView,
-    Implementations1_2_1.removePermissionForUserForBankAccountForAllViews,
-    Implementations1_2_1.getOtherAccountsForBankAccount,
-    Implementations1_2_1.getOtherAccountByIdForBankAccount,
-    Implementations1_2_1.getOtherAccountMetadata,
-    Implementations1_2_1.getCounterpartyPublicAlias,
-    Implementations1_2_1.addCounterpartyPublicAlias,
-    Implementations1_2_1.updateCounterpartyPublicAlias,
-    Implementations1_2_1.deleteCounterpartyPublicAlias,
-    Implementations1_2_1.getOtherAccountPrivateAlias,
-    Implementations1_2_1.addOtherAccountPrivateAlias,
-    Implementations1_2_1.updateCounterpartyPrivateAlias,
-    Implementations1_2_1.deleteCounterpartyPrivateAlias,
-    Implementations1_2_1.addCounterpartyMoreInfo,
-    Implementations1_2_1.updateCounterpartyMoreInfo,
-    Implementations1_2_1.deleteCounterpartyMoreInfo,
-    Implementations1_2_1.addCounterpartyUrl,
-    Implementations1_2_1.updateCounterpartyUrl,
-    Implementations1_2_1.deleteCounterpartyUrl,
-    Implementations1_2_1.addCounterpartyImageUrl,
-    Implementations1_2_1.updateCounterpartyImageUrl,
-    Implementations1_2_1.deleteCounterpartyImageUrl,
-    Implementations1_2_1.addCounterpartyOpenCorporatesUrl,
-    Implementations1_2_1.updateCounterpartyOpenCorporatesUrl,
-    Implementations1_2_1.deleteCounterpartyOpenCorporatesUrl,
-    Implementations1_2_1.addCounterpartyCorporateLocation,
-    Implementations1_2_1.updateCounterpartyCorporateLocation,
-    Implementations1_2_1.deleteCounterpartyCorporateLocation,
-    Implementations1_2_1.addCounterpartyPhysicalLocation,
-    Implementations1_2_1.updateCounterpartyPhysicalLocation,
-    Implementations1_2_1.deleteCounterpartyPhysicalLocation,
-    Implementations1_2_1.getTransactionsForBankAccount,
-    Implementations1_2_1.getTransactionByIdForBankAccount,
-    Implementations1_2_1.getTransactionNarrative,
-    Implementations1_2_1.addTransactionNarrative,
-    Implementations1_2_1.updateTransactionNarrative,
-    Implementations1_2_1.deleteTransactionNarrative,
-    Implementations1_2_1.getCommentsForViewOnTransaction,
-    Implementations1_2_1.addCommentForViewOnTransaction,
-    Implementations1_2_1.deleteCommentForViewOnTransaction,
-    Implementations1_2_1.getTagsForViewOnTransaction,
-    Implementations1_2_1.addTagForViewOnTransaction,
-    Implementations1_2_1.deleteTagForViewOnTransaction,
-    Implementations1_2_1.getImagesForViewOnTransaction,
-    Implementations1_2_1.addImageForViewOnTransaction,
-    Implementations1_2_1.deleteImageForViewOnTransaction,
-    Implementations1_2_1.getWhereTagForViewOnTransaction,
-    Implementations1_2_1.addWhereTagForViewOnTransaction,
-    Implementations1_2_1.updateWhereTagForViewOnTransaction,
-    Implementations1_2_1.deleteWhereTagForViewOnTransaction,
-    Implementations1_2_1.getOtherAccountForTransaction
-    //Implementations1_2_1.makePayment
-  )
-
-    // New in 1.3.0
-    val endpointsOf1_3_0 = Implementations1_3_0.getCards ::
-    Implementations1_3_0.getCardsForBank::
-    Nil
-
-    // New in 1.4.0
-    // Possible Endpoints 2.0.0 (less info about the views)
-    val endpointsOf1_4_0 = List(   Implementations1_4_0.getCustomer,
-    //  Now in 2.0.0 Implementations1_4_0.addCustomer,
-    Implementations1_4_0.getCustomersMessages,
-    Implementations1_4_0.addCustomerMessage,
-    Implementations1_4_0.getBranches,
-    Implementations1_4_0.getAtms,
-    Implementations1_4_0.getProducts,
-    Implementations1_4_0.getCrmEvents,
-    Implementations1_4_0.getTransactionRequestTypes)
-
-    // Updated in 2.0.0 (less info about the views)
-    val endpointsOf2_0_0 =  List(
-      Implementations2_0_0.root,
-      Implementations2_0_0.getPrivateAccountsAllBanks,
-      Implementations2_0_0.corePrivateAccountsAllBanks,
-      Implementations2_0_0.publicAccountsAllBanks,
-      Implementations2_0_0.getPrivateAccountsAtOneBank,
-      Implementations2_0_0.corePrivateAccountsAtOneBank, // this is /my accounts
-      Implementations2_0_0.privateAccountsAtOneBank, // This was missing for a while from v2.0.0
-      Implementations2_0_0.publicAccountsAtOneBank,
-      // Updated in 2.0.0 (added sorting and better guards / error messages)
-      Implementations2_0_0.accountById,
-      Implementations2_0_0.getPermissionsForBankAccount,
-      Implementations2_0_0.getPermissionForUserForBankAccount,
-      // New in 2.0.0
-      Implementations2_0_0.getKycDocuments,
-      Implementations2_0_0.getKycMedia,
-      Implementations2_0_0.getKycStatuses,
-      Implementations2_0_0.getKycChecks,
-      Implementations2_0_0.getSocialMediaHandles,
-      Implementations2_0_0.addKycDocument,
-      Implementations2_0_0.addKycMedia,
-      Implementations2_0_0.addKycStatus,
-      Implementations2_0_0.addKycCheck,
-      Implementations2_0_0.addSocialMediaHandle,
-      Implementations2_0_0.getCoreAccountById,
-      Implementations2_0_0.getCoreTransactionsForBankAccount,
-      Implementations2_0_0.createAccount,
-      Implementations2_0_0.getTransactionTypes,
-      Implementations2_0_0.createUser,
-//      Implementations2_0_0.createMeeting,
-//      Implementations2_0_0.getMeetings,
-//      Implementations2_0_0.getMeeting,
-      Implementations2_0_0.createCustomer,
-      Implementations2_0_0.getCurrentUser,
-      Implementations2_0_0.getUser,
-      Implementations2_0_0.createUserCustomerLinks,
-      Implementations2_0_0.addEntitlement,
-      Implementations2_0_0.getEntitlements,
-      Implementations2_0_0.deleteEntitlement,
-      Implementations2_0_0.getAllEntitlements,
-      Implementations2_0_0.elasticSearchWarehouse,
-      Implementations2_0_0.elasticSearchMetrics,
-      Implementations2_0_0.getCustomers
-  )
-
-
-  val allResourceDocs =
-    Implementations2_0_0.resourceDocs ++
-      Implementations1_4_0.resourceDocs ++
-      Implementations1_3_0.resourceDocs ++
-      Implementations1_2_1.resourceDocs
-
-  // Filter the possible endpoints by the disabled / enabled Props settings and add them together
-  val routes : List[OBPEndpoint] =
-    getAllowedEndpoints(endpointsOf1_2_1, Implementations1_2_1.resourceDocs) :::
-      getAllowedEndpoints(endpointsOf1_3_0, Implementations1_3_0.resourceDocs) :::
-      getAllowedEndpoints(endpointsOf1_4_0, Implementations1_4_0.resourceDocs) :::
-      getAllowedEndpoints(endpointsOf2_0_0, Implementations2_0_0.resourceDocs)
-
-
-
-  registerRoutes(routes, allResourceDocs, apiPrefix)
+  def allResourceDocs = collectResourceDocs(OBPAPI1_4_0.allResourceDocs, Http4s200.resourceDocs)
 
-  logger.info(s"version $version has been run! There are ${routes.length} routes.")
+  val routes: List[OBPEndpoint] = Nil
 
+  registerRoutes(routes, allResourceDocs, apiPrefix, true)
 
+  logger.info(s"version $version has been run! There are ${routes.length} routes, ${allResourceDocs.length} allResourceDocs.")
 }