server: Wrap the light wallet transactions response in a data field

wiringbits · Dec 29, 2018 · 36e0551 · 36e0551
1 parent 2db4f9f
commit 36e0551
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/server/app/com/xsn/explorer/models/WrappedResult.scala b/server/app/com/xsn/explorer/models/WrappedResult.scala
@@ -0,0 +1,10 @@
+package com.xsn.explorer.models
+
+import play.api.libs.json.{Json, Writes}
+
+case class WrappedResult[+T](data: T)
+
+object WrappedResult {
+
+  implicit def writes[T](implicit writesT: Writes[T]): Writes[WrappedResult[T]] = Json.writes[WrappedResult[T]]
+}
diff --git a/server/app/com/xsn/explorer/services/TransactionService.scala b/server/app/com/xsn/explorer/services/TransactionService.scala
@@ -150,7 +150,7 @@ class TransactionService @Inject() (
     result.toFuture
   }
 
-  def getLightWalletTransactions(addressString: String, limit: Limit, lastSeenTxidString: Option[String]): FutureApplicationResult[List[LightWalletTransaction]] = {
+  def getLightWalletTransactions(addressString: String, limit: Limit, lastSeenTxidString: Option[String]): FutureApplicationResult[WrappedResult[List[LightWalletTransaction]]] = {
     def buildData(address: Address, txValues: Transaction) = {
       val result = for {
         plain <- xsnService.getTransaction(txValues.id).toFutureOr
@@ -195,7 +195,7 @@ class TransactionService @Inject() (
 
       transactions <- transactionFutureDataHandler.getLatestBy(address, limit, lastSeenTxid).toFutureOr
       data <- transactions.map { transaction => buildData(address, transaction) }.toFutureOr
-    } yield data
+    } yield WrappedResult(data)
 
     result.toFuture
   }