Skip to content

Commit

Permalink
alerts-server: Let scalafmt format the code
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexITC committed Oct 7, 2018
1 parent ede23c2 commit 59a0ab4
Show file tree
Hide file tree
Showing 111 changed files with 1,380 additions and 1,259 deletions.
76 changes: 40 additions & 36 deletions alerts-server/app/com/alexitc/coinalerts/commons/PlayBinders.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@ import play.api.mvc.{PathBindable, QueryStringBindable}

object PlayBinders {

implicit def userVerificationTokenPathBinder(implicit binder: PathBindable[String]) = new PathBindable[UserVerificationToken] {
override def bind(key: String, value: String): Either[String, UserVerificationToken] = {
for {
string <- binder.bind(key, value).right
} yield UserVerificationToken(string)
}
implicit def userVerificationTokenPathBinder(implicit binder: PathBindable[String]) =
new PathBindable[UserVerificationToken] {
override def bind(key: String, value: String): Either[String, UserVerificationToken] = {
for {
string <- binder.bind(key, value).right
} yield UserVerificationToken(string)
}

override def unbind(key: String, token: UserVerificationToken): String = {
token.string
override def unbind(key: String, token: UserVerificationToken): String = {
token.string
}
}
}

implicit def fixedPriceAlertIdPathBinder(implicit binder: PathBindable[Long]) = new PathBindable[FixedPriceAlertId] {
override def bind(key: String, value: String): Either[String, FixedPriceAlertId] = {
Expand Down Expand Up @@ -52,9 +53,10 @@ object PlayBinders {
override def bind(key: String, value: String): Either[String, Market] = {
for {
string <- binder.bind(key, value).right
market <- Market.from(string)
.map(Right(_))
.getOrElse(Left("market.invalid.format"))
market <- Market
.from(string)
.map(Right(_))
.getOrElse(Left("market.invalid.format"))
} yield market
}

Expand All @@ -78,23 +80,24 @@ object PlayBinders {
private val DefaultOffset = 0
private val DefaultLimit = 20

implicit def paginatedQueryBinder(implicit binder: QueryStringBindable[Int]) = new QueryStringBindable[PaginatedQuery] {
override def bind(key: String, params: Map[String, Seq[String]]): Option[Either[String, PaginatedQuery]] = {
val result = for {
offsetInt <- binder.bind("offset", params).getOrElse(Right(DefaultOffset))
limitInt <- binder.bind("limit", params).getOrElse(Right(DefaultLimit))
} yield PaginatedQuery(Offset(offsetInt), Limit(limitInt))
implicit def paginatedQueryBinder(implicit binder: QueryStringBindable[Int]) =
new QueryStringBindable[PaginatedQuery] {
override def bind(key: String, params: Map[String, Seq[String]]): Option[Either[String, PaginatedQuery]] = {
val result = for {
offsetInt <- binder.bind("offset", params).getOrElse(Right(DefaultOffset))
limitInt <- binder.bind("limit", params).getOrElse(Right(DefaultLimit))
} yield PaginatedQuery(Offset(offsetInt), Limit(limitInt))

Some(result)
}
Some(result)
}

override def unbind(key: String, value: PaginatedQuery): String = {
val offsetParam = binder.unbind("offset", value.offset.int)
val limitParam = binder.unbind("limit", value.limit.int)
override def unbind(key: String, value: PaginatedQuery): String = {
val offsetParam = binder.unbind("offset", value.offset.int)
val limitParam = binder.unbind("limit", value.limit.int)

List(offsetParam, limitParam).mkString("&")
List(offsetParam, limitParam).mkString("&")
}
}
}

implicit def filterQueryBinder(implicit binder: QueryStringBindable[String]) = new QueryStringBindable[FilterQuery] {
override def bind(key: String, params: Map[String, Seq[String]]): Option[Either[String, FilterQuery]] = {
Expand All @@ -111,18 +114,19 @@ object PlayBinders {
}
}

implicit def orderingQueryBinder(implicit binder: QueryStringBindable[String]) = new QueryStringBindable[OrderingQuery] {
override def bind(key: String, params: Map[String, Seq[String]]): Option[Either[String, OrderingQuery]] = {
val result = for {
// the orderBy query is optional
string <- binder.bind("orderBy", params).getOrElse(Right(""))
} yield OrderingQuery(string)
implicit def orderingQueryBinder(implicit binder: QueryStringBindable[String]) =
new QueryStringBindable[OrderingQuery] {
override def bind(key: String, params: Map[String, Seq[String]]): Option[Either[String, OrderingQuery]] = {
val result = for {
// the orderBy query is optional
string <- binder.bind("orderBy", params).getOrElse(Right(""))
} yield OrderingQuery(string)

Some(result)
}
Some(result)
}

override def unbind(key: String, value: OrderingQuery): String = {
binder.unbind("orderBy", value.string)
override def unbind(key: String, value: OrderingQuery): String = {
binder.unbind("orderBy", value.string)
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ case class AppURL(string: String) extends AnyVal {
}
}

class PlayAppConfig @Inject() (config: Configuration) extends AppConfig {
class PlayAppConfig @Inject()(config: Configuration) extends AppConfig {

override def url: AppURL = {
val string = config.get[String]("app.url")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ trait ExchangeCurrencySeederTaskConfig {
def interval: FiniteDuration
}

class PlayExchangeCurrencySeederTaskConfig @Inject() (
configuration: Configuration)
class PlayExchangeCurrencySeederTaskConfig @Inject()(configuration: Configuration)
extends ExchangeCurrencySeederTaskConfig {

override def initialDelay: FiniteDuration = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ trait FixedPriceAlertConfig {
def maximumNumberOfAlertsPerUser: Count
}

class PlayFixedPriceAlertConfig @Inject() (config: Configuration) extends FixedPriceAlertConfig {
class PlayFixedPriceAlertConfig @Inject()(config: Configuration) extends FixedPriceAlertConfig {

private val defaultMaximumNumberOfAlertsPerUser = Count(15)

override def maximumNumberOfAlertsPerUser: Count = {
val intMaybe = config.getOptional[Int]("fixedPriceAlert.maximumNumberOfAlertsPerUser")

intMaybe
.filter(_ > 0)
.map(Count.apply)
.getOrElse(defaultMaximumNumberOfAlertsPerUser)
.filter(_ > 0)
.map(Count.apply)
.getOrElse(defaultMaximumNumberOfAlertsPerUser)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ trait FixedPriceAlertsTaskConfig {
def interval: FiniteDuration
}

class PlayFixedPriceAlertsTaskConfig @Inject() (configuration: Configuration) extends FixedPriceAlertsTaskConfig {
class PlayFixedPriceAlertsTaskConfig @Inject()(configuration: Configuration) extends FixedPriceAlertsTaskConfig {

override def initialDelay: FiniteDuration = {
configuration.getOptional[FiniteDuration]("fixedPriceAlertsTask.initialDelay").getOrElse(1.minute)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ trait JWTConfig {

case class JWTSecretKey(string: String) extends AnyVal

class PlayJWTConfig @Inject() (configuration: Configuration) extends JWTConfig {
class PlayJWTConfig @Inject()(configuration: Configuration) extends JWTConfig {

override def secretKey: JWTSecretKey = {
val string = configuration.get[String]("jwt.secret")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ case class MailgunAPISecretKey(string: String) extends AnyVal
case class MailgunFrom(string: String) extends AnyVal
case class MailgunDomain(string: String) extends AnyVal

class PlayMailgunConfig @Inject() (configuration: Configuration) extends MailgunConfig {
class PlayMailgunConfig @Inject()(configuration: Configuration) extends MailgunConfig {
override def apiSecretKey: MailgunAPISecretKey = {
val string = configuration.get[String]("mailgun.apiSecretKey")
MailgunAPISecretKey(string)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ trait ReCaptchaConfig {

class ReCaptchaSecretKey(val string: String) extends AnyVal

class PlayReCaptchaSecretKey @Inject() (config: Configuration) extends ReCaptchaConfig {
class PlayReCaptchaSecretKey @Inject()(config: Configuration) extends ReCaptchaConfig {

override def secretKey: ReCaptchaSecretKey = {
val string = config.get[String]("recaptcha.secretKey")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ import play.api.libs.json.{JsObject, JsString, Writes}
case class AuthorizationToken(string: String)
object AuthorizationToken {
implicit val writes: Writes[AuthorizationToken] = Writes[AuthorizationToken] { token =>
JsObject( List("token" -> JsString(token.string)) )
JsObject(List("token" -> JsString(token.string)))
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import scala.concurrent.{Await, Future}
import scala.util.control.NonFatal

@Singleton
class ShutdownHandler @Inject() (application: ApplicationLifecycle) {
class ShutdownHandler @Inject()(application: ApplicationLifecycle) {

private val logger = LoggerFactory.getLogger(this.getClass)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ trait ExchangeCurrencyDataHandler[F[_]] {

def getBy(exchangeCurrencyId: ExchangeCurrencyId): F[Option[ExchangeCurrency]]

def getBy(exchange: Exchange, market: Market, currency: Currency, currencyName: CurrencyName): F[Option[ExchangeCurrency]]
def getBy(
exchange: Exchange,
market: Market,
currency: Currency,
currencyName: CurrencyName): F[Option[ExchangeCurrency]]

def getBy(exchange: Exchange, market: Market): F[List[ExchangeCurrency]]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ trait FixedPriceAlertDataHandler[F[_]] {

def markAsTriggered(alertId: FixedPriceAlertId): F[Unit]

def findPendingAlertsForPrice(currencyId: ExchangeCurrencyId, currentPrice: BigDecimal): F[List[FixedPriceAlertWithCurrency]]
def findPendingAlertsForPrice(
currencyId: ExchangeCurrencyId,
currentPrice: BigDecimal): F[List[FixedPriceAlertWithCurrency]]

def getAlerts(
filterConditions: FixedPriceAlertFilter.Conditions,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import com.alexitc.playsonify.models.{PaginatedQuery, PaginatedResult}
import org.scalactic.Good
import play.api.db.Database

class DailyPriceAlertPostgresDataHandler @Inject() (
class DailyPriceAlertPostgresDataHandler @Inject()(
protected val database: Database,
dailyPriceAlertDAO: DailyPriceAlertPostgresDAO)
extends DailyPriceAlertBlockingDataHandler
with AnormPostgresDAL {
with AnormPostgresDAL {

override def create(
userId: UserId,
Expand All @@ -33,13 +33,11 @@ class DailyPriceAlertPostgresDataHandler @Inject() (
}
}

override def getAlerts(
userId: UserId,
query: PaginatedQuery): ApplicationResult[PaginatedResult[DailyPriceAlert]] = withConnection { implicit conn =>

val alerts = dailyPriceAlertDAO.getAlerts(userId, query)
val total = dailyPriceAlertDAO.countAlerts(userId)
val result = PaginatedResult(query.offset, query.limit, total, alerts)
Good(result)
}
override def getAlerts(userId: UserId, query: PaginatedQuery): ApplicationResult[PaginatedResult[DailyPriceAlert]] =
withConnection { implicit conn =>
val alerts = dailyPriceAlertDAO.getAlerts(userId, query)
val total = dailyPriceAlertDAO.countAlerts(userId)
val result = PaginatedResult(query.offset, query.limit, total, alerts)
Good(result)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,45 +10,41 @@ import com.alexitc.playsonify.core.ApplicationResult
import org.scalactic.{Good, One, Or}
import play.api.db.Database

class ExchangeCurrencyPostgresDataHandler @Inject() (
class ExchangeCurrencyPostgresDataHandler @Inject()(
protected val database: Database,
exchangeCurrencyDAO: ExchangeCurrencyPostgresDAO)
extends ExchangeCurrencyBlockingDataHandler
with AnormPostgresDAL {

override def create(createModel: CreateExchangeCurrencyModel): ApplicationResult[ExchangeCurrency] = withConnection { implicit conn =>
override def create(createModel: CreateExchangeCurrencyModel): ApplicationResult[ExchangeCurrency] = withConnection {
implicit conn =>
val exchangeCurrencyMaybe = exchangeCurrencyDAO.create(createModel)

val exchangeCurrencyMaybe = exchangeCurrencyDAO.create(createModel)

Or.from(exchangeCurrencyMaybe, One(RepeatedExchangeCurrencyError))
Or.from(exchangeCurrencyMaybe, One(RepeatedExchangeCurrencyError))
}

override def getBy(exchangeCurrencyId: ExchangeCurrencyId): ApplicationResult[Option[ExchangeCurrency]] = withConnection { implicit conn =>
val exchangeCurrencyMaybe = exchangeCurrencyDAO.getBy(exchangeCurrencyId)
Good(exchangeCurrencyMaybe)
}
override def getBy(exchangeCurrencyId: ExchangeCurrencyId): ApplicationResult[Option[ExchangeCurrency]] =
withConnection { implicit conn =>
val exchangeCurrencyMaybe = exchangeCurrencyDAO.getBy(exchangeCurrencyId)
Good(exchangeCurrencyMaybe)
}

override def getBy(
exchange: Exchange,
market: Market,
currency: Currency,
currencyName: CurrencyName): ApplicationResult[Option[ExchangeCurrency]] = withConnection { implicit conn =>

val exchangeCurrencyMaybe = exchangeCurrencyDAO.getBy(exchange, market, currency, currencyName)
Good(exchangeCurrencyMaybe)
}

override def getBy(
exchange: Exchange,
market: Market): ApplicationResult[List[ExchangeCurrency]] = withConnection { implicit conn =>

val result = exchangeCurrencyDAO.getBy(exchange, market)
Good(result)
override def getBy(exchange: Exchange, market: Market): ApplicationResult[List[ExchangeCurrency]] = withConnection {
implicit conn =>
val result = exchangeCurrencyDAO.getBy(exchange, market)
Good(result)
}

override def getMarkets(
exchange: Exchange): ApplicationResult[List[Market]] = withConnection { implicit conn =>

override def getMarkets(exchange: Exchange): ApplicationResult[List[Market]] = withConnection { implicit conn =>
val result = exchangeCurrencyDAO.getMarkets(exchange)
Good(result)
}
Expand Down
Loading

0 comments on commit 59a0ab4

Please sign in to comment.