LITE-28565: Add pricelists to request create wizard

* fix marketplaces in POST payload
cloudblue · Sep 18, 2023 · ebd7043 · ebd7043
1 parent 120fb56
commit ebd7043
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 34 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM cloudblueconnect/connect-extension-runner:28.8
+FROM cloudblueconnect/connect-extension-runner:28.9
 
 COPY pyproject.toml /install_temp/.
 COPY poetry.* /install_temp/.

diff --git a/connect_ext_ppr/filters.py b/connect_ext_ppr/filters.py
@@ -1,5 +1,7 @@
 from typing import List, Optional
 
+
+from pydantic import BaseModel
 from fastapi_filter import FilterDepends, with_prefix
 from fastapi_filter.contrib.sqlalchemy import Filter
 
@@ -60,3 +62,7 @@ class DeploymentRequestExtendedFilter(DeploymentRequestFilter):
 
     class Constants(Filter.Constants):
         model = DeploymentRequest
+
+
+class PricingBatchFilter(BaseModel):
+    marketplace_id: Optional[str]
diff --git a/connect_ext_ppr/schemas.py b/connect_ext_ppr/schemas.py
@@ -63,6 +63,12 @@ class PrimaryKeyReference(BaseModel):
     id: str
 
 
+class ReferenceSchema(NonNullSchema):
+    id: str
+    name: Optional[str]
+    icon: Optional[str]
+
+
 class ChoicesSchema(BaseModel):
     choices: Optional[List[PrimaryKeyReference]] = []
     all: bool
@@ -74,23 +80,11 @@ def check_choices_exists_if_all_is_false(cls, values):
         return values
 
 
-class VendorSchema(NonNullSchema):
-    id: str
-    name: str
-    icon: Optional[str]
-
-
-class ProductReferenceSchema(NonNullSchema):
-    id: str
-    name: str
-    icon: Optional[str]
-
-
 class ProductSchema(NonNullSchema):
     id: str
     name: str
     icon: Optional[str]
-    owner: VendorSchema
+    owner: ReferenceSchema
 
 
 class HubReferenceSchema(NonNullSchema):
@@ -106,10 +100,10 @@ class HubSchema(NonNullSchema):
 
 class DeploymentSchema(NonNullSchema):
     id: str
-    product: ProductReferenceSchema
+    product: ReferenceSchema
     hub: HubReferenceSchema
     account_id: str
-    owner: VendorSchema
+    owner: ReferenceSchema
     last_sync_at: datetime
     status: DeploymentStatusChoices
     events: Events
@@ -167,7 +161,7 @@ class PPRVersionReferenceSchema(NonNullSchema):
 
 class DeploymentReferenceSchema(NonNullSchema):
     id: str
-    product: ProductReferenceSchema
+    product: ReferenceSchema
     hub: HubReferenceSchema
 
 
@@ -184,10 +178,17 @@ class Config:
         orm_mode = True
 
 
+class StreamContextSchema(NonNullSchema):
+    account: ReferenceSchema
+    product: ReferenceSchema
+    marketplace: ReferenceSchema
+
+
 class StreamSchema(NonNullSchema):
     id: str
     name: str
     status: str
+    context: StreamContextSchema
 
 
 class BatchSchema(NonNullSchema):

diff --git a/..._ppr/static/index.36fb1b65206989e793c7.js → ..._ppr/static/index.2e78270930bf4bf36c38.js b/..._ppr/static/index.36fb1b65206989e793c7.js → ..._ppr/static/index.2e78270930bf4bf36c38.js
diff --git a/connect_ext_ppr/static/index.html b/connect_ext_ppr/static/index.html
@@ -12,7 +12,7 @@
     <link href="https://fonts.googleapis.com/css2?family=Roboto+Mono&family=Roboto:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&display=swap" rel="stylesheet">
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <title>Index</title>
-<script defer src="vendors.3c43b45d3e9e7cbf9863.js"></script><script defer src="index.36fb1b65206989e793c7.js"></script><link href="index.7f54bf0dcbb9dc626487.css" rel="stylesheet"></head>
+<script defer src="vendors.3c43b45d3e9e7cbf9863.js"></script><script defer src="index.2e78270930bf4bf36c38.js"></script><link href="index.7f54bf0dcbb9dc626487.css" rel="stylesheet"></head>
 
 <body>
     <div id="app"></div>

diff --git a/connect_ext_ppr/utils.py b/connect_ext_ppr/utils.py
@@ -36,10 +36,9 @@
     PPRVersionReferenceSchema,
     PPRVersionSchema,
     PrimaryKeyReference,
-    ProductReferenceSchema,
     ProductSchema,
+    ReferenceSchema,
     TaskSchema,
-    VendorSchema,
 )
 
 
@@ -224,7 +223,7 @@ def get_deployment_schema(deployment, product, vendor, hub):
 
 def get_deployment_reference_schema(deployment, hub):
     product = deployment.product
-    product_schema = ProductReferenceSchema(id=product.id, name=product.name, icon=product.logo)
+    product_schema = ReferenceSchema(id=product.id, name=product.name, icon=product.logo)
     hub_id = deployment.hub_id
     hub_schema = HubReferenceSchema(id=hub_id, name=hub['name'])
     return DeploymentReferenceSchema(id=deployment.id, product=product_schema, hub=hub_schema)
@@ -392,7 +391,7 @@ def get_product_schema(product):
         id=product.id,
         name=product.name,
         icon=product.logo,
-        owner=VendorSchema(
+        owner=ReferenceSchema(
             id=vendor.id, name=vendor.name, icon=vendor.logo,
         ),
     )