From ecfddeeb43316f8058031f89fd7e320832082949 Mon Sep 17 00:00:00 2001
From: Kumar <chandeshwar.kumar2@cognizant.com>
Date: Thu, 28 Jul 2022 10:18:16 +0530
Subject: [PATCH 1/2] bug fixed for section 4 and section 6 details

---
 .../event-management/controller/eventManagement.ts   | 12 ++++++++++++
 .../event-management/views/awardEventManagement.njk  |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/src/main/features/event-management/controller/eventManagement.ts b/src/main/features/event-management/controller/eventManagement.ts
index e5854581f3..f912b455e9 100644
--- a/src/main/features/event-management/controller/eventManagement.ts
+++ b/src/main/features/event-management/controller/eventManagement.ts
@@ -227,6 +227,18 @@ export const EVENT_MANAGEMENT = async (req: express.Request, res: express.Respon
         const scontractAwardDetail = await (await TenderApi.Instance(SESSION_ID).get(contractURL)).data;
         supplierDetails.supplierSignedContractDate = moment(scontractAwardDetail?.dateSigned).format('DD MMMM YYYY');
       }
+      
+      const baseSuuplierURL = `/tenders/projects/${req.session.projectId}/events/${req.session.eventId}/suppliers/US-DUNS-215577839`;
+      const supplierData = await TenderApi.Instance(SESSION_ID).get(baseSuuplierURL);
+      
+      if(supplierData != undefined && supplierData  != null && supplierData.data != undefined && supplierData.data !=null )
+      {
+        supplierDetails.supplierAddress = supplierData.data?.address;
+        supplierDetails.supplierContactName = supplierData.data?.contactPoint.name;
+        supplierDetails.supplierContactEmail = supplierData.data?.contactPoint?.email;
+        //supplierDetails.supplierWebsite = supplierData.data?.website;
+      }
+      
 
       //if (status == "Published" || status == "Response period closed" || status == "Response period open" || status=="To be evaluated" ) {
       //Get Q&A Count
diff --git a/src/main/features/event-management/views/awardEventManagement.njk b/src/main/features/event-management/views/awardEventManagement.njk
index 2eb80c4765..05365abbc0 100644
--- a/src/main/features/event-management/views/awardEventManagement.njk
+++ b/src/main/features/event-management/views/awardEventManagement.njk
@@ -261,6 +261,9 @@ or messages in your inbox.See supplier's answer to your published project.</p>
         <p> {{supplierDetails.supplierAddress.streetAddress}}</p>
        <p> {{supplierDetails.supplierAddress.locality}}</p>
        <p> {{supplierDetails.supplierAddress.region}}</p>
+       {#<p> {{supplierDetails.supplierAddress.postalCode}}</p>
+       <p> {{supplierDetails.supplierAddress.countryName}}</p>
+       #}
        </br></br>
 
        <p> <strong>Contact Name:</strong></p>

From b08544577d6b021c7c7275e5823f040f995b038d Mon Sep 17 00:00:00 2001
From: Kumar <chandeshwar.kumar2@cognizant.com>
Date: Thu, 28 Jul 2022 10:31:30 +0530
Subject: [PATCH 2/2] Updated supplier Id dynamic

---
 .../controller/eventManagement.ts             | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/features/event-management/controller/eventManagement.ts b/src/main/features/event-management/controller/eventManagement.ts
index f912b455e9..0476497506 100644
--- a/src/main/features/event-management/controller/eventManagement.ts
+++ b/src/main/features/event-management/controller/eventManagement.ts
@@ -228,18 +228,19 @@ export const EVENT_MANAGEMENT = async (req: express.Request, res: express.Respon
         supplierDetails.supplierSignedContractDate = moment(scontractAwardDetail?.dateSigned).format('DD MMMM YYYY');
       }
       
-      const baseSuuplierURL = `/tenders/projects/${req.session.projectId}/events/${req.session.eventId}/suppliers/US-DUNS-215577839`;
-      const supplierData = await TenderApi.Instance(SESSION_ID).get(baseSuuplierURL);
-      
-      if(supplierData != undefined && supplierData  != null && supplierData.data != undefined && supplierData.data !=null )
+      if(supplierDetails!=null && supplierDetails.supplierId != undefined && supplierDetails.supplierId !=null)
       {
-        supplierDetails.supplierAddress = supplierData.data?.address;
-        supplierDetails.supplierContactName = supplierData.data?.contactPoint.name;
-        supplierDetails.supplierContactEmail = supplierData.data?.contactPoint?.email;
-        //supplierDetails.supplierWebsite = supplierData.data?.website;
+        const baseSuuplierURL = `/tenders/projects/${req.session.projectId}/events/${req.session.eventId}/suppliers/${supplierDetails.supplierId}`;
+        const supplierResponse = await TenderApi.Instance(SESSION_ID).get(baseSuuplierURL);
+
+        const supplierData = supplierResponse?.data;
+
+        supplierDetails.supplierAddress = supplierData?.address;
+        supplierDetails.supplierContactName = supplierData?.contactPoint.name;
+        supplierDetails.supplierContactEmail = supplierData?.contactPoint?.email;
+        //supplierDetails.supplierWebsite = supplierData?.website;
       }
       
-
       //if (status == "Published" || status == "Response period closed" || status == "Response period open" || status=="To be evaluated" ) {
       //Get Q&A Count
       const baseQandAURL = `/tenders/projects/${req.session.projectId}/events/${req.session.eventId}/q-and-a`;