slick/slick

Hi All,

I'm trying to trying to translate this query to Scala Slick but I'm having a hard time.

select x2."retrieval_reference_no",
       x2."transaction_timestamp",
       x3."account_id",
       x3."entry_code",
       x3."amount",
       x3."current",
       x3."hold",
       x3."pending",
       x3."account_type",
       (select coalesce(x4."description", x3."entry_code")
        from "transaction_description" x4
        where x4."entry_code" = x3."entry_code"),
       x2."response_code",
       x2."response_detail",
       x2."transaction_id",
       x2."original_transaction_id",
       x2."transaction_type"
from "transaction" x2,
     "transaction_history" x3
where ((x2."transaction_id" = x3."transaction_id") and (x2."tenant_id" = x3."tenant_id"))
  and (((x3."tenant_id" = 'SampleTenantId') and (x3."account_id" = 'SrcAcctId')))
order by x2."transaction_timestamp" desc

Here is my attempt to translate this to Slick Query.

 def getEntryDescription(
      entryCode: Rep[String]
  ): Query[Rep[String], String, Seq] = {
    transactionDescriptionQuery
      .filter(_.entryCode === entryCode)
      .map(row => row.description.ifNull(entryCode))
  }

    val whereCondition = for {
      (txn, history) <- joinHistoryTables
      if history.tenantId === params.tenantId && history.accountId === params.accountId
      description <- getEntryDescription(history.entryCode)
    } yield {
      (txn, history, description)
    }

    whereCondition
      .sortBy { case (txn, _) => txn.transactionTimestamp.desc }
      .map { case (txn, history, description) =>
        (
          txn.retrievalReferenceNo,
          txn.transactionTimestamp,
          history.accountId,
          history.entryCode,
          history.amount,
          history.current,
          history.hold,
          history.pending,
          history.accountType,
          description,
          txn.responseCode,
          txn.responseDetail,
          txn.transactionId,
          txn.originalTransactionId,
          txn.transactionType
        ) <> (TransactionHistoryDetails.tupled, TransactionHistoryDetails.unapply)
      }
      .drop(params.offset)
      .take(params.limit)

But this give me:

select x2."retrieval_reference_no",
       x2."transaction_timestamp",
       x3."account_id",
       x3."entry_code",
       x3."amount",
       x3."current",
       x3."hold",
       x3."pending",
       x3."account_type",
       coalesce(x4."description", x3."entry_code")),
       x2."response_code",
       x2."response_detail",
       x2."transaction_id",
       x2."original_transaction_id",
       x2."transaction_type"
from "transaction" x2,
     "transaction_history" x3
where ((x2."transaction_id" = x3."transaction_id") and (x2."tenant_id" = x3."tenant_id"))
  and (((x3."tenant_id" = 'SampleTenantId') and (x3."account_id" = 'SrcAcctId'))) and x4."entry_code" = x3."entry_code"
order by x2."transaction_timestamp" desc