DL-17946: HIP logs clean up

Author: krishnaram88

app/connectors/HipConnector.scala

@@ -16,11 +16,9 @@
 
 package connectors
 
-import play.api.Logging
 import play.api.libs.json.{JsValue, Json, Writes}
 import uk.gov.hmrc.http.client.HttpClientV2
 import uk.gov.hmrc.http.{HeaderCarrier, HttpReads, HttpResponse, StringContextOps}
-import uk.gov.hmrc.play.audit.http.connector.AuditConnector
 import uk.gov.hmrc.play.bootstrap.config.ServicesConfig
 
 import java.time.format.DateTimeFormatter
@@ -30,10 +28,9 @@ import javax.inject.Inject
 import scala.concurrent.{ExecutionContext, Future}
 
 class HipConnector @Inject() (http: HttpClientV2,
-                              val auditConnector: AuditConnector,
                               config: ServicesConfig)
                              (implicit ec: ExecutionContext)
-  extends RawResponseReads  with Logging {
+  extends RawResponseReads {
 
   lazy val serviceURL: String = config.baseUrl("hip")
   val baseURI: String = "/etmp/RESTAdapter/awrs"
@@ -68,23 +65,17 @@ class HipConnector @Inject() (http: HttpClientV2,
     http.get(url"$url").setHeader(headers: _*).execute[A]
 
   @inline def cPOST[I, O](url: String, body: I)(implicit wts: Writes[I], rds: HttpReads[O], hc: HeaderCarrier): Future[O] = {
-    //For debugging purpose only. Remove this before deploying to production
-    logger.warn(s"[cPOST] Headers being sent: ${headers.mkString(", ")}")
     http.post(url"$url").withBody(Json.toJson(body)).setHeader(headers: _*).execute[O]
   }
 
   @inline def cPUT[I, O](url: String, body: I)(implicit wts: Writes[I], rds: HttpReads[O], hc: HeaderCarrier): Future[O] =
     http.put(url"$url").withBody(Json.toJson(body)).setHeader(headers: _*).execute[O]
 
   def deRegister(awrsRefNo: String, deRegDetails: JsValue)(implicit headerCarrier: HeaderCarrier): Future[HttpResponse] = {
-//    The below log message have to be removed and should not be deployed to production
-    logger.warn(s"Deregistration Request: $deRegDetails")
     cPOST(s"""$serviceURL$baseURI$subscriptionURI$deRegistrationURI/$awrsRefNo""", deRegDetails)
   }
 
   def withdrawal(awrsRefNo: String, withdrawalData: JsValue)(implicit headerCarrier: HeaderCarrier): Future[HttpResponse] = {
-    //    The below log message have to be removed and should not be deployed to production
-    logger.warn(s"Withdrawal Request: $withdrawalData")
     cPOST( s"""$serviceURL$baseURI$subscriptionURI$withdrawalURI/$awrsRefNo""", withdrawalData)
   }
 
@@ -97,14 +88,10 @@ class HipConnector @Inject() (http: HttpClientV2,
   }
 
   def subscribe(registerData: JsValue, safeId: String)(implicit headerCarrier: HeaderCarrier): Future[HttpResponse] = {
-    //    The below log message have to be removed and should not be deployed to production
-    logger.warn(s"Create Request: $registerData")
     cPOST( s"""$serviceURL$baseURI$subscriptionURI$subscriptionCreateURI/$safeId""", registerData)
   }
 
   def updateSubscription(updateData: JsValue, awrsRefNo: String)(implicit headerCarrier: HeaderCarrier): Future[HttpResponse] = {
-    //    The below log message have to be removed and should not be deployed to production
-    logger.warn(s"Update Request: $updateData")
     cPUT(s"""$serviceURL$baseURI$subscriptionURI$updateURI/$awrsRefNo""", updateData)
   }
 }

app/services/LookupService.scala

@@ -20,7 +20,7 @@ import connectors.{EtmpConnector, HipConnector}
 import play.api.http.Status
 import play.api.libs.json.Json
 import uk.gov.hmrc.http.{HeaderCarrier, HttpResponse}
-import utils.Utility.{logger, mapCrnForDesResponse}
+import utils.Utility.logger
 import utils.{AWRSFeatureSwitches, Utility}
 
 import javax.inject.Inject

app/services/SubscriptionService.scala

@@ -63,8 +63,6 @@ class SubscriptionService @Inject()(
             submitResponse <- hipConnector.subscribe(updatedInputJson, safeId)
             jsonWithoutSuccessNode = Utility.stripSuccessNode(submitResponse.json)
             modifiedSubmitResponse = {
-//              This Log message have to be removed while deploying HIP
-              logger.warn(s"[SubscriptionService][createSubscription] Response from HIP endpoint: status=${submitResponse.status}, body=${submitResponse.body}")
               HttpResponse(submitResponse.status, Json.stringify(jsonWithoutSuccessNode))
             }
             enrolmentResponse <- addKnownFacts(modifiedSubmitResponse, safeId, utr, businessType, postcode)

test/connector/HipConnectorTest.scala

@@ -22,7 +22,6 @@ import org.scalatest.wordspec.AnyWordSpecLike
 import play.api.libs.json.{JsValue, Json}
 import play.mvc.Http.Status
 import uk.gov.hmrc.http.{HeaderCarrier, HttpResponse}
-import uk.gov.hmrc.play.audit.http.connector.AuditConnector
 import uk.gov.hmrc.play.bootstrap.config.ServicesConfig
 import utils.BaseSpec
 
@@ -32,11 +31,10 @@ import scala.concurrent.{ExecutionContext, Future}
 class HipConnectorTest extends BaseSpec with AnyWordSpecLike {
   implicit val ec: ExecutionContext = scala.concurrent.ExecutionContext.Implicits.global
 
-  val mockAuditConnector: AuditConnector = mock[AuditConnector]
   val config: ServicesConfig = app.injector.instanceOf[ServicesConfig]
 
   trait Setup extends ConnectorTest {
-    object TestHipConnector extends HipConnector (mockHttpClient, mockAuditConnector, config)
+    object TestHipConnector extends HipConnector (mockHttpClient, config)
     val awrsRefNo = "XAAW0000010001"
     implicit val hc: HeaderCarrier = HeaderCarrier()
   }