FIX cypress dump

MAIF · Sep 7, 2023 · 42815ba · 42815ba
1 parent 987252a
commit 42815ba
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/daikoku/app/domain/json.scala b/daikoku/app/domain/json.scala
@@ -954,7 +954,9 @@ object json {
       "aggregationApiKeysSecurity" -> o.aggregationApiKeysSecurity
         .map(JsBoolean.apply)
         .getOrElse(JsBoolean(false))
-        .as[JsValue]
+        .as[JsValue],
+      "subscriptionProcess" -> SeqValidationStepFormat.writes(
+        o.subscriptionProcess)
     )
   }
   val FreeWithoutQuotasFormat = new Format[FreeWithoutQuotas] {

diff --git a/daikoku/app/storage/drivers/postgres/PostgresDataStore.scala b/daikoku/app/storage/drivers/postgres/PostgresDataStore.scala
@@ -824,6 +824,10 @@ class PostgresDataStore(configuration: Configuration, env: Env, pgPool: PgPool)
               subscriptionDemandRepo
                 .forAllTenant()
                 .save(json.SubscriptionDemandFormat.reads(payload).get)
+            case ("usageplans", payload) =>
+              usagePlanRepo
+                .forAllTenant()
+                .save(json.UsagePlanFormat.reads(payload).get)
             case (typ, _) =>
               logger.error(s"Unknown type: $typ")
               FastFuture.successful(false)

diff --git a/daikoku/javascript/cypress/cypress-test-export.ndjson b/daikoku/javascript/cypress/cypress-test-export.ndjson
@@ -34,7 +34,7 @@
 {"type":"api_subscriptions","payload":{"by":"SR9OKNdEcz1CZwe8WEMB6QYvFQPGfDTs6RXHDGYMCIva0SjEA11EOpmbMzYvBrQL","_id":"5ffd5faf260100461a3cc870","api":"5ffd5e4d260100461a3cc7b6","plan":"lhsc79x9s0p4drv8j3ebapwrbnqhu1nh","tags":[],"team":"5ffd5f7e260100461a3cc845","apiKey":{"clientId":"KN25jHI9jDMCP0xvhmvIM4dKDK7LxuSw","clientName":"daikoku-api-key-test-api-not-test-plan-consumers-1610440623012","clientSecret":"Fn5tUh6CgLgSaEJYX7QRZD2XeVPNm06s9aqJFiXHfErpBDyEQr1ezdH47MZ9iRVM"},"parent":null,"_tenant":"default","enabled":true,"_deleted":false,"metadata":{},"rotation":{"enabled":false,"gracePeriod":168,"rotationEvery":744,"pendingRotation":false},"createdAt":1610440623012,"customName":null,"customMetadata":null,"customReadOnly":null,"customMaxPerDay":null,"integrationToken":"FbpezJzgj2DnD7s3LUsSI4GPig6gtGHKuk5aSMjp7KGQxpLn0tUahkWCsUR0c9Gy","customMaxPerMonth":null,"customMaxPerSecond":null,"thirdPartySubscriptionInformations":null}}
 {"type":"api_documentation_pages","payload":{"_id":"fjbxdprhtd12f3u91gejepx21vkppatg","title":"Introduction","_tenant":"default","content":"# Introduction\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus gravida convallis leo et aliquet. Aenean venenatis, elit et dignissim scelerisque, urna dui mollis nunc, id eleifend velit sem et ante. Quisque pharetra sed tellus id finibus. In quis porta libero. Nunc egestas eros elementum lacinia blandit. Donec nisi lacus, tristique vel blandit in, sodales eget lacus. Phasellus ultrices magna vel odio vestibulum, a rhoncus nunc ornare. Sed laoreet finibus arcu vitae aliquam. Aliquam quis ex dui.\n\nCras ut ultrices quam. Nulla eu purus sed turpis consequat sodales. Aenean vitae efficitur velit, vel accumsan felis. Curabitur aliquam odio dictum urna convallis faucibus. Vivamus eu dignissim lorem. Donec sed hendrerit massa. Suspendisse volutpat, nisi at fringilla consequat, eros lacus aliquam metus, eu convallis nulla mauris quis lacus. Aliquam ultricies, mi eget feugiat vestibulum, enim nunc eleifend nisi, nec tincidunt turpis elit id diam. Nunc placerat accumsan tincidunt. Nulla ut interdum dui. Praesent venenatis cursus aliquet. Nunc pretium rutrum felis nec pharetra.\n\nVivamus sapien ligula, hendrerit a libero vitae, convallis maximus massa. Praesent ante leo, fermentum vitae libero finibus, blandit porttitor risus. Nulla ac hendrerit turpis. Sed varius velit at libero feugiat luctus. Nunc rhoncus sem dolor, nec euismod justo rhoncus vitae. Vivamus finibus nulla a purus vestibulum sagittis. Maecenas maximus orci at est lobortis, nec facilisis erat rhoncus. Sed tempus leo et est dictum lobortis. Vestibulum rhoncus, nisl ut porta sollicitudin, arcu urna egestas arcu, eget efficitur neque ipsum ut felis. Ut commodo purus quis turpis tempus tincidunt. Donec id hendrerit eros. Vestibulum vitae justo consectetur, egestas nisi ac, eleifend odio.\n\nDonec id mi cursus, volutpat dolor sed, bibendum sapien. Etiam vitae mauris sit amet urna semper tempus vel non metus. Integer sed ligula diam. Aenean molestie ultrices libero eget suscipit. Phasellus maximus euismod eros ut scelerisque. Ut quis tempus metus. Sed mollis volutpat velit eget pellentesque. Integer hendrerit ultricies massa eu tincidunt. Quisque at cursus augue. Sed diam odio, molestie sed dictum eget, efficitur nec nulla. Nullam vulputate posuere nunc nec laoreet. Integer varius sed erat vitae cursus. Vivamus auctor augue enim, a fringilla mauris molestie eget.\n\nProin vehicula ligula vel enim euismod, sed congue mi egestas. Nullam varius ut felis eu fringilla. Quisque sodales tortor nec justo tristique, sit amet consequat mi tincidunt. Suspendisse porttitor laoreet velit, non gravida nibh cursus at. Pellentesque faucibus, tellus in dapibus viverra, dolor mi dignissim tortor, id convallis ipsum lorem id nisl. Sed id nisi felis. Aliquam in ullamcorper ipsum, vel consequat magna. Donec nec mollis lacus, a euismod elit.","_deleted":false,"contentType":"text/markdown","_humanReadableId":"fjbxdprhtd12f3u91gejepx21vkppatg","remoteContentUrl":null,"lastModificationAt":1610440383046,"remoteContentEnabled":false,"remoteContentHeaders":{}}}
 {"type":"notifications","payload":{"_id":"5ffd5db5260100461a3cc75b","date":1610440117890,"team":null,"action":{"team":"5ffd5d30260100461a3cc730","type":"TeamInvitation","user":"mom9ff7opam5nv576rpo98n9sqpxag5l"},"sender":{"id":null,"name":"Admin","email":"admin@foo.bar"},"status":{"date":1610440134095,"status":"Accepted"},"_tenant":"default","_deleted":false,"notificationType":"AcceptOrReject"}}
-{"type":"notifications","payload":{"_id":"64afc0a14401004c626d7e7a","date":1689239713306,"team":"5ffd5d30260100461a3cc730","action":{"api":"5ffd5e4d260100461a3cc7b6","plan":"default","step":"COENV5oHzD9CBGW4K3JfFRKVrH2ReZBSqX67dzVGWwWwDKragGwYHYOAQIVsF6Za","team":"5ffd5f7e260100461a3cc845","type":"ApiSubscription","demand":"64afc0a14401004c626d7e79","motivation":"motivation","parentSubscriptionId":null},"sender":{"id":"SR9OKNdEcz1CZwe8WEMB6QYvFQPGfDTs6RXHDGYMCIva0SjEA11EOpmbMzYvBrQL","name":"Admin","email":"admin@foo.bar"},"status":{"status":"Pending"},"_tenant":"default","_deleted":false,"notificationType":"AcceptOrReject"}}
+{"type":"notifications","payload":{"_id":"64afc0a14401004c626d7e7a","date":1689239713306,"team":"5ffd5d30260100461a3cc730","action":{"api":"5ffd5e4d260100461a3cc7b6","plan":"lhsc79x9s0p4drv8j3ebapwrbnqhu1nq","step":"COENV5oHzD9CBGW4K3JfFRKVrH2ReZBSqX67dzVGWwWwDKragGwYHYOAQIVsF6Za","team":"5ffd5f7e260100461a3cc845","type":"ApiSubscription","demand":"64afc0a14401004c626d7e79","motivation":"motivation","parentSubscriptionId":null},"sender":{"id":"SR9OKNdEcz1CZwe8WEMB6QYvFQPGfDTs6RXHDGYMCIva0SjEA11EOpmbMzYvBrQL","name":"Admin","email":"admin@foo.bar"},"status":{"status":"Pending"},"_tenant":"default","_deleted":false,"notificationType":"AcceptOrReject"}}
 {"type":"consumptions","payload":{"to":1610440643277,"_id":"5ffd5fc3260100461a3cc898","api":"5ffd5e4d260100461a3cc7b6","from":1610406000000,"hits":17,"plan":"lhsc79x9s0p4drv8j3ebapwrbnqhu1nh","team":"5ffd5f7e260100461a3cc845","state":"completed","quotas":{"currentCallsPerDay":936,"currentCallsPerSec":1,"currentCallsPerMonth":528,"remainingCallsPerDay":64,"remainingCallsPerSec":9,"authorizedCallsPerDay":1000,"authorizedCallsPerSec":10,"remainingCallsPerMonth":472,"authorizedCallsPerMonth":1000},"_tenant":"default","billing":{"hits":17,"total":0},"_deleted":false,"clientId":"KN25jHI9jDMCP0xvhmvIM4dKDK7LxuSw","globalInformations":{"hits":17,"dataIn":0,"dataOut":0,"avgDuration":null,"avgOverhead":null}}}
 {"type":"consumptions","payload":{"to":1610460438126,"_id":"5ffdad16340100b496030b23","api":"5ffd5e4d260100461a3cc7b6","from":1610406000000,"hits":33,"plan":"lhsc79x9s0p4drv8j3ebapwrbnqhu1nh","team":"5ffd5d30260100461a3cc730","state":"completed","quotas":{"currentCallsPerDay":234,"currentCallsPerSec":5,"currentCallsPerMonth":600,"remainingCallsPerDay":766,"remainingCallsPerSec":5,"authorizedCallsPerDay":1000,"authorizedCallsPerSec":10,"remainingCallsPerMonth":400,"authorizedCallsPerMonth":1000},"_tenant":"default","billing":{"hits":33,"total":0},"_deleted":false,"clientId":"8YDhS4iph27bvPMgqGw6MyRnf4PcaT55","globalInformations":{"hits":33,"dataIn":0,"dataOut":0,"avgDuration":null,"avgOverhead":null}}}
-{"type":"subscription_demands","payload":{"_id":"64afc0a14401004c626d7e79","api":"5ffd5e4d260100461a3cc7b6","date":1689239713283,"from":"SR9OKNdEcz1CZwe8WEMB6QYvFQPGfDTs6RXHDGYMCIva0SjEA11EOpmbMzYvBrQL","plan":"default","team":"5ffd5f7e260100461a3cc845","state":"inProgress","steps":[{"_id":"COENV5oHzD9CBGW4K3JfFRKVrH2ReZBSqX67dzVGWwWwDKragGwYHYOAQIVsF6Za","step":{"id":"123","team":"5ffd5d30260100461a3cc730","type":"teamAdmin","title":"team admin"},"state":"inProgress","metadata":{}}],"_tenant":"default","_deleted":false,"motivation":"motivation","customMetadata":null,"customReadOnly":null,"customMaxPerDay":null,"customMaxPerMonth":null,"customMaxPerSecond":null,"parentSubscription":null}}
+{"type":"subscription_demands","payload":{"_id":"64afc0a14401004c626d7e79","api":"5ffd5e4d260100461a3cc7b6","date":1689239713283,"from":"SR9OKNdEcz1CZwe8WEMB6QYvFQPGfDTs6RXHDGYMCIva0SjEA11EOpmbMzYvBrQL","plan":"lhsc79x9s0p4drv8j3ebapwrbnqhu1nq","team":"5ffd5f7e260100461a3cc845","state":"inProgress","steps":[{"_id":"COENV5oHzD9CBGW4K3JfFRKVrH2ReZBSqX67dzVGWwWwDKragGwYHYOAQIVsF6Za","step":{"id":"123","team":"5ffd5d30260100461a3cc730","type":"teamAdmin","title":"team admin"},"state":"inProgress","metadata":{}}],"_tenant":"default","_deleted":false,"motivation":"motivation","customMetadata":null,"customReadOnly":null,"customMaxPerDay":null,"customMaxPerMonth":null,"customMaxPerSecond":null,"parentSubscription":null}}