Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ trait CharitiesDataSource {
class CharitiesDatacacheRepository @Inject() (db: Database)(implicit ec: ExecutionContext) extends CharitiesDataSource with Logging {

def getAgentName(agentRef: String): Future[Option[String]] = {
logger.info(s"Input request, p_agent_ref: <$agentRef>")
Future {
db.withConnection { connection =>
val storedProcedure = connection.prepareCall("{call CHAR_DC_AGENT_PK.getAgentName(?, ?)}")
Expand All @@ -47,15 +46,12 @@ class CharitiesDatacacheRepository @Inject() (db: Database)(implicit ec: Executi

storedProcedure.close()

val result = Option(agentName)
logger.info(s"Agent name from SQL Stored Procedure: ${result.getOrElse("null")}")
result
Option(agentName)
}
}
}

def getOrganisationName(charityRef: String): Future[Option[String]] = {
logger.info(s"Input request, p_charity_ref: <$charityRef>")
Future {
db.withConnection { connection =>
val storedProcedure = connection.prepareCall("{call CHAR_DC_PK.getOrgName(?, ?)}")
Expand All @@ -69,9 +65,7 @@ class CharitiesDatacacheRepository @Inject() (db: Database)(implicit ec: Executi

storedProcedure.close()

val result = Option(organisationName)
logger.info(s"Organisation name from SQL Stored Procedure: ${result.getOrElse("null")}")
result
Option(organisationName)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import scala.concurrent.Future
class CharitiesStub @Inject() () extends CharitiesDataSource with Logging:

def getAgentName(agentRef: String): Future[Option[String]] = {
logger.info(s"[CHARITIES-STUB] getAgentName -> agentRef: $agentRef")

val result = agentRef match {
case "NOT_FOUND" | "" => None
case _ => Some("John Doe")
Expand All @@ -36,8 +34,6 @@ class CharitiesStub @Inject() () extends CharitiesDataSource with Logging:
}

def getOrganisationName(charityRef: String): Future[Option[String]] = {
logger.info(s"[CHARITIES-STUB] getOrganisationName -> charityRef: $charityRef")

val result = charityRef match {
case "NOT_FOUND" | "" => None
case _ => Some("ABC Ltd")
Expand Down