alerts-server: BitsoBook functionality moved to Book

AlexITC · Oct 6, 2018 · 2fdeeb1 · 2fdeeb1
1 parent 3bd37b1
commit 2fdeeb1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 21 deletions.
diff --git a/alerts-server/app/com/alexitc/coinalerts/models/Book.scala b/alerts-server/app/com/alexitc/coinalerts/models/Book.scala
@@ -15,21 +15,18 @@ object Book {
           } yield Book(market, currency)
         }
   }
-}
-
-object BitsoBook {
 
   /**
-   * BITSO represents a book in the reversed order than us
-   */
-  def fromString(string: String): Option[Book] = {
+    * BITSO represents a book in the reversed order than us
+    */
+  def fromBitsoString(string: String): Option[Book] = {
     Option(string.toUpperCase.split("_"))
-        .filter(_.length == 2)
-        .flatMap { parts =>
-          for {
-            currency <- Currency.from(parts(0))
-            market <- Market.from(parts(1))
-          } yield Book(market, currency)
-        }
+      .filter(_.length == 2)
+      .flatMap { parts =>
+        for {
+          currency <- Currency.from(parts(0))
+          market <- Market.from(parts(1))
+        } yield Book(market, currency)
+      }
   }
 }
diff --git a/alerts-server/app/com/alexitc/coinalerts/services/external/BitsoService.scala b/alerts-server/app/com/alexitc/coinalerts/services/external/BitsoService.scala
@@ -3,7 +3,7 @@ package com.alexitc.coinalerts.services.external
 import javax.inject.Inject
 
 import com.alexitc.coinalerts.config.ExternalServiceExecutionContext
-import com.alexitc.coinalerts.models.{BitsoBook, Book}
+import com.alexitc.coinalerts.models.Book
 import com.alexitc.coinalerts.tasks.models.Ticker
 import com.bitso.{Bitso, BitsoTicker}
 import org.slf4j.LoggerFactory
@@ -21,7 +21,7 @@ class BitsoService @Inject() (
   override def availableBooks(): Future[List[Book]] = {
     val result = Future {
       bitso.getTicker.toList.flatMap { ticker =>
-        BitsoBook.fromString(ticker.getBook)
+        Book.fromBitsoString(ticker.getBook)
             .orElse {
               logger.warn(s"Unable to create book from string = [${ticker.getBook}]")
               None
@@ -51,7 +51,7 @@ class BitsoService @Inject() (
   }
 
   private def createTicker(bitsoTicker: BitsoTicker): Option[Ticker] = {
-    BitsoBook.fromString(bitsoTicker.getBook)
+    Book.fromBitsoString(bitsoTicker.getBook)
         .map { book =>
           Ticker(book, bitsoTicker.getLast)
         }

diff --git a/alerts-server/app/com/alexitc/coinalerts/services/external/KucoinService.scala b/alerts-server/app/com/alexitc/coinalerts/services/external/KucoinService.scala
@@ -3,7 +3,7 @@ package com.alexitc.coinalerts.services.external
 import javax.inject.Inject
 
 import com.alexitc.coinalerts.config.ExternalServiceExecutionContext
-import com.alexitc.coinalerts.models.{BitsoBook, Book, Currency, Market}
+import com.alexitc.coinalerts.models.{Book, Currency, Market}
 import com.alexitc.coinalerts.tasks.models.Ticker
 import org.slf4j.LoggerFactory
 import play.api.libs.functional.syntax._
@@ -92,7 +92,7 @@ class KucoinService @Inject() (
 
   private def createBook(string: String): Option[Book] = {
     // the book format is reversed to the one in our app
-    BitsoBook.fromString(string.replace("-", "_"))
+    Book.fromBitsoString(string.replace("-", "_"))
         .orElse {
           logger.warn(s"Unable to create book from string = [$string]")
           None

diff --git a/alerts-server/app/com/alexitc/coinalerts/tasks/collectors/BitsoTickerCollector.scala b/alerts-server/app/com/alexitc/coinalerts/tasks/collectors/BitsoTickerCollector.scala
@@ -13,6 +13,6 @@ class BitsoTickerCollector @Inject() (bitsoService: BitsoService) extends Ticker
   override val exchange: Exchange = Exchange.BITSO
 
   override def getTickerList: Future[List[Ticker]] = {
-    bitsoService.getTickerList
+    bitsoService.getTickerList()
   }
 }
diff --git a/alerts-server/test/com/alexitc/coinalerts/models/BookSpec.scala b/alerts-server/test/com/alexitc/coinalerts/models/BookSpec.scala
@@ -9,7 +9,7 @@ class BookSpec extends WordSpec with MustMatchers {
       val bookString = "LTC_BTC"
       val expectedBookString = "BTC_LTC"
 
-      val actualBook = BitsoBook.fromString(bookString).get
+      val actualBook = Book.fromBitsoString(bookString).get
 
       actualBook.string mustEqual expectedBookString
     }
@@ -18,7 +18,7 @@ class BookSpec extends WordSpec with MustMatchers {
       val bookString = "R_BTC"
       val expectedBookString = "BTC_R"
 
-      val actualBook = BitsoBook.fromString(bookString).get
+      val actualBook = Book.fromBitsoString(bookString).get
 
       actualBook.string mustEqual expectedBookString
     }