From 101214e4dac9a762ea18762de156bcddb656086b Mon Sep 17 00:00:00 2001
From: Ivan Grebenshchikov <maslevian@yandex.ru>
Date: Mon, 15 Jan 2024 17:12:29 +0100
Subject: [PATCH] LITE-29057 Output product version for Deployment Request

---
 Dockerfile                      | 2 +-
 connect_ext_ppr/service.py      | 3 +--
 connect_ext_ppr/utils.py        | 8 +++-----
 tests/api/test_pprs.py          | 3 +++
 ui/src/pages/RequestDetails.vue | 4 +++-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 84069e2..a5003d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM cloudblueconnect/connect-extension-runner:29.4
+FROM cloudblueconnect/connect-extension-runner:30.0
 
 COPY pyproject.toml /install_temp/.
 COPY poetry.* /install_temp/.
diff --git a/connect_ext_ppr/service.py b/connect_ext_ppr/service.py
index dada108..cd46f74 100644
--- a/connect_ext_ppr/service.py
+++ b/connect_ext_ppr/service.py
@@ -185,7 +185,7 @@ def create_ppr(ppr, user_id, deployment, db, client, logger):
     config_json = {}
     status = PPRVersion.STATUS.ready
     active_configuration = None
-    product_version = None
+    product_version = deployment.product.version
     if not file_data:
         active_configuration = (
             db.query(Configuration)
@@ -209,7 +209,6 @@ def create_ppr(ppr, user_id, deployment, db, client, logger):
             .first()
         )
         data = None
-        product_version = deployment.product.version
         product_info = (
             f"(product_id={deployment.product_id}, "
             f"product_version={deployment.product.version})"
diff --git a/connect_ext_ppr/utils.py b/connect_ext_ppr/utils.py
index 47ac464..423252c 100644
--- a/connect_ext_ppr/utils.py
+++ b/connect_ext_ppr/utils.py
@@ -242,12 +242,10 @@ def get_deployment_reference_schema(deployment, hub):
 
 def get_deployment_request_schema(deployment_request, hub):
     """
-    Returns DeploymentSchema for the deployment
-    :param deployment: Deployment model
-    :param product: Product model from Connect
-    :param vendor: Vendor Account model from Connect
+    Returns DeploymentRequestSchema for the deployment request
+    :param deployment_request: DeploymentRequest model
     :param hub: Hub model from Connect
-    :rtype: DeploymentSchema
+    :rtype: DeploymentRequestSchema
     """
     ppr = deployment_request.ppr
     ppr_schema = PPRVersionReferenceSchema(
diff --git a/tests/api/test_pprs.py b/tests/api/test_pprs.py
index 41beb7a..58c6491 100644
--- a/tests/api/test_pprs.py
+++ b/tests/api/test_pprs.py
@@ -318,6 +318,7 @@ def test_upload_ppr(
         },
         'description': '\n**Description**\nWhat a lovely day\n\n\n',
         'status': 'ready',
+        'product_version': 3,
     }
     assert id[:6] == 'PPRFL-'
     assert isinstance(events['created']['at'], str)
@@ -382,6 +383,7 @@ def test_upload_ppr_invalid(
             "does not contain items matching the given schema\n\n"
         ),
         'status': 'failed',
+        'product_version': 3,
     }
     assert id[:6] == 'PPRFL-'
     assert isinstance(events['created']['at'], str)
@@ -444,6 +446,7 @@ def test_post_ppr_new_version(
         },
         'description': '\n**Description**\nWhat a lovely day\n\n\n',
         'status': 'ready',
+        'product_version': 3,
     }
     assert id[:6] == 'PPRFL-'
     assert isinstance(events['created']['at'], str)
diff --git a/ui/src/pages/RequestDetails.vue b/ui/src/pages/RequestDetails.vue
index 1c1f372..27a69ea 100644
--- a/ui/src/pages/RequestDetails.vue
+++ b/ui/src/pages/RequestDetails.vue
@@ -59,7 +59,7 @@ c-view.request-details(
       )
         template(#value="")
           detail-item(
-            :body-text="request.deployment?.product?.name",
+            :body-text="`${request.deployment?.product?.name} (version ${productVersion})`",
             dense,
           )
             template(#image="")
@@ -184,6 +184,7 @@ export default {
     currentTab: null,
     loading: true,
     request: null,
+    productVersion: null,
     isAbortingRequest: false,
     isRetryingRequest: false,
     areTasksUpdating: false,
@@ -231,6 +232,7 @@ export default {
     async getPprFileUrl() {
       const ppr = await getPPR(this.request.deployment.id, this.request.ppr.id);
       this.pprFileUrl = ppr.file.location;
+      this.productVersion = ppr.product_version;
     },
 
     downloadPPR() {