From 608676c8e26d73b191914960dbcc8b84effb6c7d Mon Sep 17 00:00:00 2001
From: Hrithikesh <61539176+hrithikesh026@users.noreply.github.com>
Date: Thu, 12 Sep 2024 19:18:01 +0530
Subject: [PATCH] refactor: return optional request body from build_request_v2
 in ConnectorIntegrationV2 trait (#5865)

---
 crates/common_utils/src/request.rs            |  5 +++
 .../src/connector_integration_v2.rs           | 34 ++++++++++++-------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/crates/common_utils/src/request.rs b/crates/common_utils/src/request.rs
index 264179fc60..38244e2a3d 100644
--- a/crates/common_utils/src/request.rs
+++ b/crates/common_utils/src/request.rs
@@ -152,6 +152,11 @@ impl RequestBuilder {
         self
     }
 
+    pub fn set_optional_body<T: Into<RequestContent>>(mut self, body: Option<T>) -> Self {
+        body.map(|body| self.body.replace(body.into()));
+        self
+    }
+
     pub fn set_body<T: Into<RequestContent>>(mut self, body: T) -> Self {
         self.body.replace(body.into());
         self
diff --git a/crates/hyperswitch_interfaces/src/connector_integration_v2.rs b/crates/hyperswitch_interfaces/src/connector_integration_v2.rs
index 90c3f950a4..9384ed0a0c 100644
--- a/crates/hyperswitch_interfaces/src/connector_integration_v2.rs
+++ b/crates/hyperswitch_interfaces/src/connector_integration_v2.rs
@@ -1,7 +1,7 @@
 //! definition of the new connector integration trait
 use common_utils::{
     errors::CustomResult,
-    request::{Method, Request, RequestContent},
+    request::{Method, Request, RequestBuilder, RequestContent},
 };
 use hyperswitch_domain_models::{router_data::ErrorResponse, router_data_v2::RouterDataV2};
 use masking::Maskable;
@@ -65,6 +65,11 @@ pub trait ConnectorIntegrationV2<Flow, ResourceCommonData, Req, Resp>:
         &self,
         _req: &RouterDataV2<Flow, ResourceCommonData, Req, Resp>,
     ) -> CustomResult<String, errors::ConnectorError> {
+        metrics::UNIMPLEMENTED_FLOW.add(
+            &metrics::CONTEXT,
+            1,
+            &add_attributes([("connector", self.id())]),
+        );
         Ok(String::new())
     }
 
@@ -72,8 +77,8 @@ pub trait ConnectorIntegrationV2<Flow, ResourceCommonData, Req, Resp>:
     fn get_request_body(
         &self,
         _req: &RouterDataV2<Flow, ResourceCommonData, Req, Resp>,
-    ) -> CustomResult<RequestContent, errors::ConnectorError> {
-        Ok(RequestContent::Json(Box::new(json!(r#"{}"#))))
+    ) -> CustomResult<Option<RequestContent>, errors::ConnectorError> {
+        Ok(None)
     }
 
     /// returns form data
@@ -87,14 +92,19 @@ pub trait ConnectorIntegrationV2<Flow, ResourceCommonData, Req, Resp>:
     /// builds the request and returns it
     fn build_request_v2(
         &self,
-        _req: &RouterDataV2<Flow, ResourceCommonData, Req, Resp>,
+        req: &RouterDataV2<Flow, ResourceCommonData, Req, Resp>,
     ) -> CustomResult<Option<Request>, errors::ConnectorError> {
-        metrics::UNIMPLEMENTED_FLOW.add(
-            &metrics::CONTEXT,
-            1,
-            &add_attributes([("connector", self.id())]),
-        );
-        Ok(None)
+        Ok(Some(
+            RequestBuilder::new()
+                .method(self.get_http_method())
+                .url(self.get_url(req)?.as_str())
+                .attach_default_headers()
+                .headers(self.get_headers(req)?)
+                .set_optional_body(self.get_request_body(req)?)
+                .add_certificate(self.get_certificate(req)?)
+                .add_certificate_key(self.get_certificate_key(req)?)
+                .build(),
+        ))
     }
 
     /// accepts the raw api response and decodes it
@@ -167,7 +177,7 @@ pub trait ConnectorIntegrationV2<Flow, ResourceCommonData, Req, Resp>:
     fn get_certificate(
         &self,
         _req: &RouterDataV2<Flow, ResourceCommonData, Req, Resp>,
-    ) -> CustomResult<Option<String>, errors::ConnectorError> {
+    ) -> CustomResult<Option<masking::Secret<String>>, errors::ConnectorError> {
         Ok(None)
     }
 
@@ -175,7 +185,7 @@ pub trait ConnectorIntegrationV2<Flow, ResourceCommonData, Req, Resp>:
     fn get_certificate_key(
         &self,
         _req: &RouterDataV2<Flow, ResourceCommonData, Req, Resp>,
-    ) -> CustomResult<Option<String>, errors::ConnectorError> {
+    ) -> CustomResult<Option<masking::Secret<String>>, errors::ConnectorError> {
         Ok(None)
     }
 }