fix api urls in swagger

.github/workflows/release.yml

@@ -1,40 +0,0 @@
-name: release
-
-on:
-  push:
-    tags:
-      - '*.*.*'
-
-jobs:
-  make-release:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: extract version
-        id: version
-        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
-      - name: create changelog
-        id: changelog
-        uses: jaywcjlove/changelog-generator@main
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          filter: 'Release \d+\.\d+\.\d+'
-      - name: setup JDK
-        uses: actions/setup-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-      - name: create dist
-        run: sbt -v dist
-      - name: release
-        uses: softprops/action-gh-release@v1
-        with:
-          body: |
-            ${{ steps.changelog.outputs.compareurl }}
-            ${{ steps.changelog.outputs.changelog }}
-          files: target/universal/ffxivbis-*.zip
-          fail_on_unmatched_files: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/run-tests.yml

@@ -1,22 +0,0 @@
-name: tests
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  run-tests:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: setup JDK
-        uses: actions/setup-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-      - name: run tests
-        run: sbt -v +test

.scalafmt.conf

@@ -1,35 +0,0 @@
-version = 3.3.1
-
-runner.dialect = "scala213"
-
-maxColumn = 120
-
-align.preset = none
-
-continuationIndent {
-    defnSite = 2
-    extendSite = 2
-}
-
-rewrite {
-    rules = [
-        AvoidInfix,
-        RedundantBraces,
-        RedundantParens,
-        SortImports,
-        SortModifiers
-    ]
-
-    redundantBraces {
-        generalExpressions = yes
-        ifElseExpressions = yes
-        includeUnitMethods = yes
-        methodBodies = yes
-        parensForOneLineApply = yes
-        stringInterpolation = yes
-    }
-
-}
-
-importSelectors = singleLine
-trailingCommas = preserve

.travis.yml

@@ -0,0 +1,9 @@
+language: scala
+scala:
+  - 2.13.1
+
+sbt_args: -no-colors
+
+script:
+  - sbt compile
+  - sbt test

README.md

@@ -1,8 +1,8 @@
 # FFXIV BiS
 
-[![Build status](https://github.com/arcan1s/ffxivbis/actions/workflows/run-tests.yml/badge.svg)](https://github.com/arcan1s/ffxivbis/actions/workflows/run-tests.yml) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/arcan1s/ffxivbis)
+[![Build Status](https://travis-ci.org/arcan1s/ffxivbis.svg?branch=master)](https://travis-ci.org/arcan1s/ffxivbis) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/arcan1s/ffxivbis)
 
-Service which allows managing savage loot distribution easy.
+Service which allows to manage savage loot distribution easy.
 
 ## Installation and usage
 
@@ -12,7 +12,7 @@ In general compilation process looks like:
 sbt dist
 ```
 
-Or alternatively you can download the latest distribution zip from the releases page. Service can be run by using command:
+Or alternatively you can download latest distribution zip from the releases page. Service can be run by using command:
 
 ```bash
 bin/ffxivbis
@@ -28,4 +28,4 @@ REST API documentation is available at `http://0.0.0.0:8000/swagger`. HTML repre
 
 ## Public service
 
-There is also public service which is available at http://ffxivbis.arcanis.me.
+There is also public service which is available at https://ffxivbis.arcanis.me.

build.sbt

@@ -1,6 +1,6 @@
 name := "ffxivbis"
 
-scalaVersion := "2.13.6"
+scalaVersion := "2.13.1"
 
 scalacOptions ++= Seq("-deprecation", "-feature")
 

extract_items.py

@@ -1,56 +0,0 @@
-import json
-import requests
-
-# NOTE: it does not cover all items, just workaround to extract most gear pieces from patches
-MIN_ILVL = 580
-MAX_ILVL = 605
-
-TOME = (
-    'radiant',
-)
-SAVAGE = (
-    'asphodelos',
-)
-
-
-payload = {
-    'queries': [
-        {
-            'slots': []
-        },
-        {
-            'jobs': [],
-            'minItemLevel': 580,
-            'maxItemLevel': 605
-        }
-    ],
-    'existing': []
-}
-# it does not support application/json
-r = requests.post('https://ffxiv.ariyala.com/items.app', data=json.dumps(payload))
-r.raise_for_status()
-
-result = []
-
-for item in r.json():
-    item_id = item['itemID']
-    source_dict = item['source']
-    name = item['name']['en']
-    if 'crafting' in source_dict:
-        source = 'Crafted'
-    elif 'gathering' in source_dict:
-        continue  # some random shit
-    elif 'purchase' in source_dict:
-        if any(tome in name.lower() for tome in TOME):
-            source = 'Tome'
-        elif any(savage in name.lower() for savage in SAVAGE):
-            source = 'Savage'
-        else:
-            source = None
-            continue
-    else:
-        raise RuntimeError(f'Unknown source {source_dict}')
-    result.append({'id': item_id, 'source': source, 'name': name})
-
-output = {'cached-items': result}
-print(json.dumps(output, indent=4, sort_keys=True))

libraries.sbt

@@ -1,33 +1,19 @@
-val AkkaVersion = "2.6.17"
+libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3"
-val AkkaHttpVersion = "10.2.7"
+libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2"
-val ScalaTestVersion = "3.2.10"
-val SlickVersion = "3.3.3"
 
-libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.9"
+libraryDependencies += "com.typesafe.akka" %% "akka-http"   % "10.1.10"
-libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.4"
+libraryDependencies += "com.typesafe.akka" %% "akka-http-spray-json" % "10.1.10"
+libraryDependencies += "com.typesafe.akka" %% "akka-stream" % "2.5.23"
+libraryDependencies += "com.github.swagger-akka-http" %% "swagger-akka-http" % "2.0.4"
+libraryDependencies += "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1"
 
-libraryDependencies += "com.typesafe.akka" %% "akka-http" % AkkaHttpVersion
+libraryDependencies += "io.spray" %%  "spray-json" % "1.3.5"
-libraryDependencies += "com.typesafe.akka" %% "akka-http-spray-json" % AkkaHttpVersion
+libraryDependencies += "com.lihaoyi" %% "scalatags" % "0.7.0"
-libraryDependencies += "com.typesafe.akka" %% "akka-actor-typed" % AkkaVersion
-libraryDependencies += "com.typesafe.akka" %% "akka-stream" % AkkaVersion
-libraryDependencies += "com.github.swagger-akka-http" %% "swagger-akka-http" % "2.6.0"
-libraryDependencies += "jakarta.platform" % "jakarta.jakartaee-web-api" % "9.1.0"
 
-libraryDependencies += "io.spray" %%  "spray-json" % "1.3.6"
+libraryDependencies += "com.typesafe.slick" %% "slick" % "3.3.2"
-libraryDependencies += "com.lihaoyi" %% "scalatags" % "0.9.2"
+libraryDependencies += "com.typesafe.slick" %% "slick-hikaricp" % "3.3.2"
+libraryDependencies += "org.flywaydb" % "flyway-core" % "6.0.6"
+libraryDependencies += "org.xerial" % "sqlite-jdbc" % "3.28.0"
+libraryDependencies += "org.postgresql" % "postgresql" % "9.3-1104-jdbc4"
 
-libraryDependencies += "com.typesafe.slick" %% "slick" % SlickVersion
+libraryDependencies += "org.mindrot" % "jbcrypt" % "0.3m"
-libraryDependencies += "com.typesafe.slick" %% "slick-hikaricp" % SlickVersion
-libraryDependencies += "org.flywaydb" % "flyway-core" % "8.2.2"
-libraryDependencies += "org.xerial" % "sqlite-jdbc" % "3.36.0.3"
-libraryDependencies += "org.postgresql" % "postgresql" % "42.3.1"
-
-libraryDependencies += "org.mindrot" % "jbcrypt" % "0.4"
-
-// testing
-libraryDependencies += "org.scalactic" %% "scalactic" % ScalaTestVersion % "test"
-libraryDependencies += "org.scalatest" %% "scalatest" % ScalaTestVersion % "test"
-
-libraryDependencies += "com.typesafe.akka" %% "akka-actor-testkit-typed" % AkkaVersion % "test"
-libraryDependencies += "com.typesafe.akka" %% "akka-stream-testkit" % AkkaVersion % "test"
-libraryDependencies += "com.typesafe.akka" %% "akka-http-testkit" % AkkaHttpVersion % "test"

project/plugins.sbt

@@ -1,4 +1,3 @@
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.4")
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")

src/main/resources/db/migration/postgresql/V3_0__Party_aliases.sql

@@ -1,5 +0,0 @@
-create table parties (
-    player_id bigserial unique,
-    party_name text not null,
-    party_alias text);
-create unique index parties_party_name_idx on parties(party_name);

src/main/resources/db/migration/postgresql/V4_0__Crafted_items.sql

@@ -1,17 +0,0 @@
--- loot
-alter table loot add column piece_type text;
-
-update loot set piece_type = 'Tome' where is_tome = 1;
-update loot set piece_type = 'Savage' where is_tome = 0;
-
-alter table loot alter column piece_type set not null;
-alter table loot drop column is_tome;
-
--- bis
-alter table bis add column piece_type text;
-
-update bis set piece_type = 'Tome' where is_tome = 1;
-update bis set piece_type = 'Savage' where is_tome = 0;
-
-alter table bis alter column piece_type set not null;
-alter table bis drop column is_tome;

src/main/resources/db/migration/postgresql/V5_0__Free_loot.sql

@@ -1 +0,0 @@
-alter table loot add column is_free_loot integer not null default 0;

src/main/resources/db/migration/postgresql/V6_0__Multipieces_bis.sql

@@ -1,2 +0,0 @@
-drop index bis_piece_player_id_idx;
-create index bis_piece_type_player_id_idx on bis(player_id, piece, piece_type);

src/main/resources/db/migration/postgresql/V6_1__Fix_column_name.sql

@@ -1 +0,0 @@
-alter table parties rename column player_id to party_id;

src/main/resources/db/migration/sqlite/V3_0__Party_aliases.sql

@@ -1,5 +0,0 @@
-create table parties (
-    player_id integer primary key autoincrement,
-    party_name text not null,
-    party_alias text);
-create unique index parties_party_name_idx on parties(party_name);

src/main/resources/db/migration/sqlite/V4_0__Crafted_items.sql

@@ -1,42 +0,0 @@
--- loot
-alter table loot add column piece_type text;
-
-update loot set piece_type = 'Tome' where is_tome = 1;
-update loot set piece_type = 'Savage' where is_tome = 0;
-
-create table loot_new (
-    loot_id integer primary key autoincrement,
-    player_id integer not null,
-    created integer not null,
-    piece text not null,
-    piece_type text not null,
-    job text not null,
-    foreign key (player_id) references players(player_id) on delete cascade);
-insert into loot_new select loot_id, player_id, created, piece, piece_type, job from loot;
-
-drop index loot_owner_idx;
-drop table loot;
-
-alter table loot_new rename to loot;
-create index loot_owner_idx on loot(player_id);
-
--- bis
-alter table bis add column piece_type text;
-
-update bis set piece_type = 'Tome' where is_tome = 1;
-update bis set piece_type = 'Savage' where is_tome = 0;
-
-create table bis_new (
-    player_id integer not null,
-    created integer not null,
-    piece text not null,
-    piece_type text not null,
-    job text not null,
-    foreign key (player_id) references players(player_id) on delete cascade);
-insert into bis_new select player_id, created, piece, piece_type, job from bis;
-
-drop index bis_piece_player_id_idx;
-drop table bis;
-
-alter table bis_new rename to bis;
-create unique index bis_piece_player_id_idx on bis(player_id, piece);

src/main/resources/db/migration/sqlite/V5_0__Free_loot.sql

@@ -1,20 +0,0 @@
-alter table loot add column is_free_loot integer;
-
-update loot set is_free_loot = 0;
-
-create table loot_new (
-    loot_id integer primary key autoincrement,
-    player_id integer not null,
-    created integer not null,
-    piece text not null,
-    piece_type text not null,
-    job text not null,
-    is_free_loot integer not null,
-    foreign key (player_id) references players(player_id) on delete cascade);
-insert into loot_new select loot_id, player_id, created, piece, piece_type, job, is_free_loot from loot;
-
-drop index loot_owner_idx;
-drop table loot;
-
-alter table loot_new rename to loot;
-create index loot_owner_idx on loot(player_id);

src/main/resources/db/migration/sqlite/V6_0__Multipieces_bis.sql

@@ -1,2 +0,0 @@
-drop index bis_piece_player_id_idx;
-create index bis_piece_type_player_id_idx on bis(player_id, piece, piece_type);

src/main/resources/db/migration/sqlite/V6_1__Fix_column_name.sql

@@ -1,11 +0,0 @@
-create table parties_new (
-    party_id integer primary key autoincrement,
-    party_name text not null,
-    party_alias text);
-insert into parties_new select player_id, party_name, party_alias from parties;
-
-drop index parties_party_name_idx;
-drop table parties;
-
-alter table parties_new rename to parties;
-create unique index parties_party_name_idx on parties(party_name);

src/main/resources/logback.xml

@@ -8,10 +8,9 @@
     </root>
 
     <logger name="me.arcanis.ffxivbis" level="DEBUG" />
-    <logger name="http" level="DEBUG" additivity="false">
+    <logger name="http" level="DEBUG">
         <appender-ref ref="http" />
     </logger>
     <logger name="slick" level="INFO" />
-    <logger name="org.flywaydb.core.internal" level="INFO" />
 
 </configuration>

src/main/resources/reference.conf

@@ -1,8 +1,7 @@
 me.arcanis.ffxivbis {
-
+  ariyala {
-  bis-provider {
+    # ariyala base url, string, required
-    include "item_data.json"
+    ariyala-url = "https://ffxiv.ariyala.com"
-
     # xivapi base url, string, required
     xivapi-url = "https://xivapi.com"
     # xivapi developer key, string, optional
@@ -57,6 +56,12 @@ me.arcanis.ffxivbis {
     port = 8000
     # hostname to use in docs, if not set host:port will be used
     #hostname = "127.0.0.1:8000"
+
+    # rate limits
+    limits {
+      intetval = 1m
+      max-count = 60
+    }
   }
 
   default-dispatcher {

src/main/resources/swagger/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>FFXIV loot tracker API</title>
+    <title>ReDoc</title>
     <!-- needed for adaptive design -->
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1">

src/main/scala/me/arcanis/ffxivbis/Application.scala

@@ -8,66 +8,45 @@
  */
 package me.arcanis.ffxivbis
 
-import akka.actor.typed.{Behavior, PostStop, Signal}
+import akka.actor.{Actor, Props}
-import akka.actor.typed.scaladsl.{AbstractBehavior, ActorContext, Behaviors}
 import akka.http.scaladsl.Http
-import akka.http.scaladsl.server.Route
+import akka.stream.ActorMaterializer
-import akka.stream.Materializer
 import com.typesafe.scalalogging.StrictLogging
 import me.arcanis.ffxivbis.http.RootEndpoint
-import me.arcanis.ffxivbis.service.bis.BisProvider
+import me.arcanis.ffxivbis.service.impl.DatabaseImpl
-import me.arcanis.ffxivbis.service.database.Database
+import me.arcanis.ffxivbis.service.{Ariyala, PartyService}
-import me.arcanis.ffxivbis.service.PartyService
 import me.arcanis.ffxivbis.storage.Migration
 
-import scala.concurrent.ExecutionContext
+import scala.concurrent.duration.Duration
-import scala.jdk.CollectionConverters._
+import scala.concurrent.{Await, ExecutionContext}
 import scala.util.{Failure, Success}
 
-class Application(context: ActorContext[Nothing]) extends AbstractBehavior[Nothing](context) with StrictLogging {
+class Application extends Actor with StrictLogging {
+  implicit private val executionContext: ExecutionContext = context.system.dispatcher
+  implicit private val materializer: ActorMaterializer = ActorMaterializer()
 
-  logger.info("root supervisor started")
+  private val config = context.system.settings.config
-  startApplication()
+  private val host = config.getString("me.arcanis.ffxivbis.web.host")
+  private val port = config.getInt("me.arcanis.ffxivbis.web.port")
 
-  override def onMessage(msg: Nothing): Behavior[Nothing] = Behaviors.unhandled
+  override def receive: Receive = Actor.emptyBehavior
 
-  override def onSignal: PartialFunction[Signal, Behavior[Nothing]] = { case PostStop =>
+  Migration(config).onComplete {
-    logger.info("root supervisor stopped")
+    case Success(_) =>
-    Behaviors.same
+      val ariyala = context.system.actorOf(Ariyala.props, "ariyala")
-  }
+      val storage = context.system.actorOf(DatabaseImpl.props, "storage")
+      val party = context.system.actorOf(PartyService.props(storage), "party")
+      val http = new RootEndpoint(context.system, party, ariyala)
 
-  private def startApplication(): Unit = {
+      logger.info(s"start server at $host:$port")
-    val config = context.system.settings.config
+      val bind = Http()(context.system).bindAndHandle(http.route, host, port)
-    val host = config.getString("me.arcanis.ffxivbis.web.host")
+      Await.result(context.system.whenTerminated, Duration.Inf)
-    val port = config.getInt("me.arcanis.ffxivbis.web.port")
+      bind.foreach(_.unbind())
 
-    implicit val executionContext: ExecutionContext = context.system.executionContext
+    case Failure(exception) => throw exception
-    implicit val materializer: Materializer = Materializer(context)
-
-    Migration(config) match {
-      case Success(result) if result.success =>
-        val bisProvider = context.spawn(BisProvider(), "bis-provider")
-        val storage = context.spawn(Database(), "storage")
-        val party = context.spawn(PartyService(storage), "party")
-        val http = new RootEndpoint(context.system, party, bisProvider)
-
-        val flow = Route.toFlow(http.route)(context.system)
-        Http(context.system).newServerAt(host, port).bindFlow(flow)
-
-      case Success(result) =>
-        logger.error(s"migration completed with error, executed ${result.migrationsExecuted}")
-        result.migrations.asScala.foreach(o => logger.info(s"=> ${o.description} (${o.executionTime})"))
-        context.system.terminate()
-
-      case Failure(exception) =>
-        logger.error("exception during migration", exception)
-        context.system.terminate()
-    }
   }
 }
 
 object Application {
-
+  def props: Props = Props(new Application)
-  def apply(): Behavior[Nothing] =
-    Behaviors.setup[Nothing](context => new Application(context))
 }

src/main/scala/me/arcanis/ffxivbis/ffxivbis.scala

@@ -8,13 +8,13 @@
  */
 package me.arcanis.ffxivbis
 
-import akka.actor.typed.ActorSystem
+import akka.actor.ActorSystem
 import com.typesafe.config.ConfigFactory
 
 object ffxivbis {
-
   def main(args: Array[String]): Unit = {
     val config = ConfigFactory.load()
-    ActorSystem[Nothing](Application(), "ffxivbis", config)
+    val actorSystem = ActorSystem("ffxivbis", config)
+    actorSystem.actorOf(Application.props, "ffxivbis")
   }
 }

src/main/scala/me/arcanis/ffxivbis/http/AriyalaHelper.scala

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019 Evgeniy Alekseev.
+ *
+ * This file is part of ffxivbis
+ * (see https://github.com/arcan1s/ffxivbis).
+ *
+ * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
+ */
+package me.arcanis.ffxivbis.http
+
+import akka.actor.ActorRef
+import akka.pattern.ask
+import akka.util.Timeout
+import me.arcanis.ffxivbis.models.{BiS, Job}
+import me.arcanis.ffxivbis.service.Ariyala
+
+import scala.concurrent.{ExecutionContext, Future}
+
+class AriyalaHelper(ariyala: ActorRef) {
+
+  def downloadBiS(link: String, job: Job.Job)
+                 (implicit executionContext: ExecutionContext, timeout: Timeout): Future[BiS] =
+    (ariyala ? Ariyala.GetBiS(link, job)).mapTo[BiS]
+}

src/main/scala/me/arcanis/ffxivbis/http/Authorization.scala

@@ -8,24 +8,25 @@
  */
 package me.arcanis.ffxivbis.http
 
-import akka.actor.typed.scaladsl.AskPattern.Askable
+import akka.actor.ActorRef
-import akka.actor.typed.{ActorRef, Scheduler}
 import akka.http.scaladsl.model.headers._
 import akka.http.scaladsl.server.AuthenticationFailedRejection._
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
+import akka.pattern.ask
 import akka.util.Timeout
-import me.arcanis.ffxivbis.messages.{GetUser, Message}
+import me.arcanis.ffxivbis.models.{Permission, User}
-import me.arcanis.ffxivbis.models.Permission
+import me.arcanis.ffxivbis.service.impl.DatabaseUserHandler
 
 import scala.concurrent.{ExecutionContext, Future}
 
 // idea comes from https://synkre.com/bcrypt-for-akka-http-password-encryption/
 trait Authorization {
 
-  def storage: ActorRef[Message]
+  def storage: ActorRef
 
-  def authenticateBasicBCrypt[T](realm: String, authenticate: (String, String) => Future[Option[T]]): Directive1[T] = {
+  def authenticateBasicBCrypt[T](realm: String,
+                                 authenticate: (String, String) => Future[Option[T]]): Directive1[T] = {
     def challenge = HttpChallenges.basic(realm)
 
     extractCredentials.flatMap {
@@ -38,34 +39,23 @@ trait Authorization {
     }
   }
 
-  def authenticator(scope: Permission.Value, partyId: String)(username: String, password: String)(implicit
+  def authenticator(scope: Permission.Value)(partyId: String)
-    executionContext: ExecutionContext,
+                   (username: String, password: String)
-    timeout: Timeout,
+                   (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Option[String]] =
-    scheduler: Scheduler
+    (storage ? DatabaseUserHandler.GetUser(partyId, username)).mapTo[Option[User]].map {
-  ): Future[Option[String]] =
-    storage.ask(GetUser(partyId, username, _)).map {
       case Some(user) if user.verify(password) && user.verityScope(scope) => Some(username)
       case _ => None
     }
 
-  def authAdmin(partyId: String)(username: String, password: String)(implicit
+  def authAdmin(partyId: String)(username: String, password: String)
-    executionContext: ExecutionContext,
+               (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Option[String]] =
-    timeout: Timeout,
+    authenticator(Permission.admin)(partyId)(username, password)
-    scheduler: Scheduler
-  ): Future[Option[String]] =
-    authenticator(Permission.admin, partyId)(username, password)
 
-  def authGet(partyId: String)(username: String, password: String)(implicit
+  def authGet(partyId: String)(username: String, password: String)
-    executionContext: ExecutionContext,
+             (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Option[String]] =
-    timeout: Timeout,
+    authenticator(Permission.get)(partyId)(username, password)
-    scheduler: Scheduler
-  ): Future[Option[String]] =
-    authenticator(Permission.get, partyId)(username, password)
 
-  def authPost(partyId: String)(username: String, password: String)(implicit
+  def authPost(partyId: String)(username: String, password: String)
-    executionContext: ExecutionContext,
+              (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Option[String]] =
-    timeout: Timeout,
+    authenticator(Permission.post)(partyId)(username, password)
-    scheduler: Scheduler
-  ): Future[Option[String]] =
-    authenticator(Permission.post, partyId)(username, password)
 }

src/main/scala/me/arcanis/ffxivbis/http/BiSHelper.scala

@@ -8,51 +8,40 @@
  */
 package me.arcanis.ffxivbis.http
 
-import akka.actor.typed.scaladsl.AskPattern.Askable
+import akka.actor.ActorRef
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.pattern.ask
 import akka.util.Timeout
 import me.arcanis.ffxivbis.http.api.v1.json.ApiAction
-import me.arcanis.ffxivbis.messages.{AddPieceToBis, GetBiS, Message, RemovePieceFromBiS, RemovePiecesFromBiS}
 import me.arcanis.ffxivbis.models.{Piece, Player, PlayerId}
+import me.arcanis.ffxivbis.service.impl.DatabaseBiSHandler
 
 import scala.concurrent.{ExecutionContext, Future}
 
-trait BiSHelper extends BisProviderHelper {
+class BiSHelper(storage: ActorRef, ariyala: ActorRef) extends AriyalaHelper(ariyala) {
 
-  def storage: ActorRef[Message]
+  def addPieceBiS(playerId: PlayerId, piece: Piece)
+                 (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    (storage ? DatabaseBiSHandler.AddPieceToBis(playerId, piece.withJob(playerId.job))).mapTo[Int]
 
-  def addPieceBiS(playerId: PlayerId, piece: Piece)(implicit timeout: Timeout, scheduler: Scheduler): Future[Unit] =
+  def bis(partyId: String, playerId: Option[PlayerId])
-    storage.ask(AddPieceToBis(playerId, piece.withJob(playerId.job), _))
+         (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Seq[Player]] =
+    (storage ? DatabaseBiSHandler.GetBiS(partyId, playerId)).mapTo[Seq[Player]]
 
-  def bis(partyId: String, playerId: Option[PlayerId])(implicit
+  def doModifyBiS(action: ApiAction.Value, playerId: PlayerId, piece: Piece)
-    timeout: Timeout,
+                 (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
-    scheduler: Scheduler
-  ): Future[Seq[Player]] =
-    storage.ask(GetBiS(partyId, playerId, _))
-
-  def doModifyBiS(action: ApiAction.Value, playerId: PlayerId, piece: Piece)(implicit
-    timeout: Timeout,
-    scheduler: Scheduler
-  ): Future[Unit] =
     action match {
       case ApiAction.add => addPieceBiS(playerId, piece)
       case ApiAction.remove => removePieceBiS(playerId, piece)
     }
 
-  def putBiS(playerId: PlayerId, link: String)(implicit
+  def putBiS(playerId: PlayerId, link: String)
-    executionContext: ExecutionContext,
+            (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Unit] =
-    timeout: Timeout,
+    downloadBiS(link, playerId.job).flatMap { bis =>
-    scheduler: Scheduler
+      Future.traverse(bis.pieces)(addPieceBiS(playerId, _))
-  ): Future[Unit] =
+    }.map(_ => ())
-    storage.ask(RemovePiecesFromBiS(playerId, _)).flatMap { _ =>
-      downloadBiS(link, playerId.job)
-        .flatMap { bis =>
-          Future.traverse(bis.pieces)(addPieceBiS(playerId, _))
-        }
-        .map(_ => ())
-    }
 
-  def removePieceBiS(playerId: PlayerId, piece: Piece)(implicit timeout: Timeout, scheduler: Scheduler): Future[Unit] =
+  def removePieceBiS(playerId: PlayerId, piece: Piece)
-    storage.ask(RemovePieceFromBiS(playerId, piece, _))
+                    (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    (storage ? DatabaseBiSHandler.RemovePieceFromBiS(playerId, piece)).mapTo[Int]
 
 }

src/main/scala/me/arcanis/ffxivbis/http/BisProviderHelper.scala

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2019 Evgeniy Alekseev.
- *
- * This file is part of ffxivbis
- * (see https://github.com/arcan1s/ffxivbis).
- *
- * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
- */
-package me.arcanis.ffxivbis.http
-
-import akka.actor.typed.{ActorRef, Scheduler}
-import akka.actor.typed.scaladsl.AskPattern.Askable
-import akka.util.Timeout
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, DownloadBiS}
-import me.arcanis.ffxivbis.models.{BiS, Job}
-
-import scala.concurrent.Future
-
-trait BisProviderHelper {
-
-  def provider: ActorRef[BiSProviderMessage]
-
-  def downloadBiS(link: String, job: Job.Job)(implicit timeout: Timeout, scheduler: Scheduler): Future[BiS] =
-    provider.ask(DownloadBiS(link, job, _))
-}

src/main/scala/me/arcanis/ffxivbis/http/LootHelper.scala

@@ -8,48 +8,38 @@
  */
 package me.arcanis.ffxivbis.http
 
-import akka.actor.typed.scaladsl.AskPattern.Askable
+import akka.actor.ActorRef
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.pattern.ask
 import akka.util.Timeout
 import me.arcanis.ffxivbis.http.api.v1.json.ApiAction
-import me.arcanis.ffxivbis.messages.{AddPieceTo, GetLoot, Message, RemovePieceFrom, SuggestLoot}
 import me.arcanis.ffxivbis.models.{Piece, Player, PlayerId, PlayerIdWithCounters}
+import me.arcanis.ffxivbis.service.LootSelector.LootSelectorResult
+import me.arcanis.ffxivbis.service.impl.DatabaseLootHandler
 
 import scala.concurrent.{ExecutionContext, Future}
 
-trait LootHelper {
+class LootHelper(storage: ActorRef) {
 
-  def storage: ActorRef[Message]
+  def addPieceLoot(playerId: PlayerId, piece: Piece)
+                  (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    (storage ? DatabaseLootHandler.AddPieceTo(playerId, piece)).mapTo[Int]
 
-  def addPieceLoot(playerId: PlayerId, piece: Piece, isFreeLoot: Boolean)(implicit
+  def doModifyLoot(action: ApiAction.Value, playerId: PlayerId, piece: Piece)
-    timeout: Timeout,
+                  (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
-    scheduler: Scheduler
+    action match {
-  ): Future[Unit] =
+      case ApiAction.add => addPieceLoot(playerId, piece)
-    storage.ask(AddPieceTo(playerId, piece, isFreeLoot, _))
+      case ApiAction.remove => removePieceLoot(playerId, piece)
-
-  def doModifyLoot(action: ApiAction.Value, playerId: PlayerId, piece: Piece, maybeFree: Option[Boolean])(implicit
-    timeout: Timeout,
-    scheduler: Scheduler
-  ): Future[Unit] =
-    (action, maybeFree) match {
-      case (ApiAction.add, Some(isFreeLoot)) => addPieceLoot(playerId, piece, isFreeLoot)
-      case (ApiAction.remove, _) => removePieceLoot(playerId, piece)
-      case _ => throw new IllegalArgumentException(s"Invalid combinantion of action $action and fee loot $maybeFree")
     }
 
-  def loot(partyId: String, playerId: Option[PlayerId])(implicit
+  def loot(partyId: String, playerId: Option[PlayerId])
-    timeout: Timeout,
+          (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Seq[Player]] =
-    scheduler: Scheduler
+    (storage ? DatabaseLootHandler.GetLoot(partyId, playerId)).mapTo[Seq[Player]]
-  ): Future[Seq[Player]] =
-    storage.ask(GetLoot(partyId, playerId, _))
 
-  def removePieceLoot(playerId: PlayerId, piece: Piece)(implicit timeout: Timeout, scheduler: Scheduler): Future[Unit] =
+  def removePieceLoot(playerId: PlayerId, piece: Piece)
-    storage.ask(RemovePieceFrom(playerId, piece, _))
+                     (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    (storage ? DatabaseLootHandler.RemovePieceFrom(playerId, piece)).mapTo[Int]
 
-  def suggestPiece(partyId: String, piece: Piece)(implicit
+  def suggestPiece(partyId: String, piece: Piece)
-    executionContext: ExecutionContext,
+                  (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Seq[PlayerIdWithCounters]] =
-    timeout: Timeout,
+    (storage ? DatabaseLootHandler.SuggestLoot(partyId, piece)).mapTo[LootSelectorResult].map(_.result)
-    scheduler: Scheduler
-  ): Future[Seq[PlayerIdWithCounters]] =
-    storage.ask(SuggestLoot(partyId, piece, _)).map(_.result)
 }

src/main/scala/me/arcanis/ffxivbis/http/PlayerHelper.scala

@@ -8,67 +8,46 @@
  */
 package me.arcanis.ffxivbis.http
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
-import akka.actor.typed.scaladsl.AskPattern.Askable
+import akka.pattern.ask
 import akka.util.Timeout
 import me.arcanis.ffxivbis.http.api.v1.json.ApiAction
-import me.arcanis.ffxivbis.messages.{AddPieceToBis, AddPlayer, GetParty, GetPartyDescription, GetPlayer, Message, RemovePlayer, UpdateParty}
+import me.arcanis.ffxivbis.models.{Party, Player, PlayerId}
-import me.arcanis.ffxivbis.models.{PartyDescription, Player, PlayerId}
+import me.arcanis.ffxivbis.service.impl.{DatabaseBiSHandler, DatabasePartyHandler}
 
 import scala.concurrent.{ExecutionContext, Future}
 
-trait PlayerHelper extends BisProviderHelper {
+class PlayerHelper(storage: ActorRef, ariyala: ActorRef) extends AriyalaHelper(ariyala) {
 
-  def storage: ActorRef[Message]
+  def addPlayer(player: Player)
-
+               (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
-  def addPlayer(
+    (storage ? DatabasePartyHandler.AddPlayer(player)).mapTo[Int].map { res =>
-    player: Player
+      player.link match {
-  )(implicit executionContext: ExecutionContext, timeout: Timeout, scheduler: Scheduler): Future[Unit] =
+        case Some(link) =>
-    storage
+          downloadBiS(link, player.job).map { bis =>
-      .ask(ref => AddPlayer(player, ref))
+            bis.pieces.map(storage ? DatabaseBiSHandler.AddPieceToBis(player.playerId, _))
-      .map { res =>
+          }.map(_ => res)
-        player.link.map(_.trim).filter(_.nonEmpty) match {
+        case None => Future.successful(res)
-          case Some(link) =>
-            downloadBiS(link, player.job)
-              .map { bis =>
-                bis.pieces.map(piece => storage.ask(AddPieceToBis(player.playerId, piece, _)))
-              }
-              .map(_ => res)
-          case None => Future.successful(res)
-        }
       }
-      .flatten
+    }.flatten
 
-  def doModifyPlayer(action: ApiAction.Value, player: Player)(implicit
+  def doModifyPlayer(action: ApiAction.Value, player: Player)
-    executionContext: ExecutionContext,
+                    (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
-    timeout: Timeout,
-    scheduler: Scheduler
-  ): Future[Unit] =
     action match {
       case ApiAction.add => addPlayer(player)
       case ApiAction.remove => removePlayer(player.playerId)
     }
 
-  def getPartyDescription(partyId: String)(implicit timeout: Timeout, scheduler: Scheduler): Future[PartyDescription] =
+  def getPlayers(partyId: String, maybePlayerId: Option[PlayerId])
-    storage.ask(GetPartyDescription(partyId, _))
+                (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Seq[Player]] =
-
-  def getPlayers(partyId: String, maybePlayerId: Option[PlayerId])(implicit
-    executionContext: ExecutionContext,
-    timeout: Timeout,
-    scheduler: Scheduler
-  ): Future[Seq[Player]] =
     maybePlayerId match {
       case Some(playerId) =>
-        storage.ask(GetPlayer(playerId, _)).map(_.toSeq)
+        (storage ? DatabasePartyHandler.GetPlayer(playerId)).mapTo[Option[Player]].map(_.toSeq)
       case None =>
-        storage.ask(GetParty(partyId, _)).map(_.players.values.toSeq)
+        (storage ? DatabasePartyHandler.GetParty(partyId)).mapTo[Party].map(_.players.values.toSeq)
     }
 
-  def removePlayer(playerId: PlayerId)(implicit timeout: Timeout, scheduler: Scheduler): Future[Unit] =
+  def removePlayer(playerId: PlayerId)
-    storage.ask(RemovePlayer(playerId, _))
+                  (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
-
+    (storage ? DatabasePartyHandler.RemovePlayer(playerId)).mapTo[Int]
-  def updateDescription(
-    partyDescription: PartyDescription
-  )(implicit executionContext: ExecutionContext, timeout: Timeout, scheduler: Scheduler): Future[Unit] =
-    storage.ask(UpdateParty(partyDescription, _))
 }

src/main/scala/me/arcanis/ffxivbis/http/RootEndpoint.scala

@@ -10,27 +10,25 @@ package me.arcanis.ffxivbis.http
 
 import java.time.Instant
 
-import akka.actor.typed.{ActorRef, ActorSystem, Scheduler}
+import akka.actor.{ActorRef, ActorSystem}
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
 import akka.util.Timeout
 import com.typesafe.scalalogging.{Logger, StrictLogging}
 import me.arcanis.ffxivbis.http.api.v1.RootApiV1Endpoint
 import me.arcanis.ffxivbis.http.view.RootView
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, Message}
 
-class RootEndpoint(system: ActorSystem[Nothing], storage: ActorRef[Message], provider: ActorRef[BiSProviderMessage])
+class RootEndpoint(system: ActorSystem, storage: ActorRef, ariyala: ActorRef)
   extends StrictLogging {
   import me.arcanis.ffxivbis.utils.Implicits._
 
   private val config = system.settings.config
 
-  implicit val scheduler: Scheduler = system.scheduler
   implicit val timeout: Timeout =
     config.getDuration("me.arcanis.ffxivbis.settings.request-timeout")
 
-  private val rootApiV1Endpoint: RootApiV1Endpoint = new RootApiV1Endpoint(storage, provider, config)
+  private val rootApiV1Endpoint: RootApiV1Endpoint = new RootApiV1Endpoint(storage, ariyala, config)
-  private val rootView: RootView = new RootView(storage, provider)
+  private val rootView: RootView = new RootView(storage, ariyala)
   private val swagger: Swagger = new Swagger(config)
   private val httpLogger = Logger("http")
 
@@ -39,36 +37,35 @@ class RootEndpoint(system: ActorSystem[Nothing], storage: ActorRef[Message], pro
       val start = Instant.now.toEpochMilli
       mapResponse { response =>
         val time = (Instant.now.toEpochMilli - start) / 1000.0
-        httpLogger.debug(
+        httpLogger.debug(s"""- - [${Instant.now}] "${context.request.method.name()} ${context.request.uri.path}" ${response.status.intValue()} ${response.entity.getContentLengthOption.getAsLong} $time""")
-          s"""- - [${Instant.now}] "${context.request.method.name()} ${context.request.uri.path}" ${response.status
-            .intValue()} ${response.entity.getContentLengthOption.getAsLong} $time"""
-        )
         response
       }
     }
 
   def route: Route =
     withHttpLog {
-      ignoreTrailingSlash {
+      apiRoute ~ htmlRoute ~ swagger.routes ~ swaggerUIRoute
-        apiRoute ~ htmlRoute ~ swagger.routes ~ swaggerUIRoute
-      }
     }
 
   private def apiRoute: Route =
-    pathPrefix("api") {
+    ignoreTrailingSlash {
-      pathPrefix(Segment) {
+      pathPrefix("api") {
-        case "v1" => rootApiV1Endpoint.route
+        pathPrefix(Segment) {
-        case _ => reject
+          case "v1" => rootApiV1Endpoint.route
+          case _ => reject
+        }
       }
     }
 
   private def htmlRoute: Route =
-    pathPrefix("static") {
+    ignoreTrailingSlash {
-      getFromResourceDirectory("static")
+      pathPrefix("static") {
-    } ~ rootView.route
+        getFromResourceDirectory("static")
+      } ~ rootView.route
+    }
 
   private def swaggerUIRoute: Route =
     path("swagger") {
-      getFromResource("html/swagger.html")
+      getFromResource("swagger/index.html")
-    }
+    } ~ getFromResourceDirectory("swagger")
 }

src/main/scala/me/arcanis/ffxivbis/http/Swagger.scala

@@ -16,13 +16,9 @@ import io.swagger.v3.oas.models.security.SecurityScheme
 import scala.io.Source
 
 class Swagger(config: Config) extends SwaggerHttpService {
-
   override val apiClasses: Set[Class[_]] = Set(
-    classOf[api.v1.BiSEndpoint],
+    classOf[api.v1.BiSEndpoint], classOf[api.v1.LootEndpoint],
-    classOf[api.v1.LootEndpoint],
+    classOf[api.v1.PlayerEndpoint], classOf[api.v1.TypesEndpoint],
-    classOf[api.v1.PartyEndpoint],
-    classOf[api.v1.PlayerEndpoint],
-    classOf[api.v1.TypesEndpoint],
     classOf[api.v1.UserEndpoint]
   )
 

src/main/scala/me/arcanis/ffxivbis/http/UserHelper.scala

@@ -8,30 +8,33 @@
  */
 package me.arcanis.ffxivbis.http
 
-import akka.actor.typed.scaladsl.AskPattern.Askable
+import akka.actor.ActorRef
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.pattern.ask
 import akka.util.Timeout
-import me.arcanis.ffxivbis.messages.{AddUser, DeleteUser, GetNewPartyId, GetUser, GetUsers, Message}
 import me.arcanis.ffxivbis.models.User
+import me.arcanis.ffxivbis.service.PartyService
+import me.arcanis.ffxivbis.service.impl.DatabaseUserHandler
 
-import scala.concurrent.Future
+import scala.concurrent.{ExecutionContext, Future}
 
-trait UserHelper {
+class UserHelper(storage: ActorRef) {
 
-  def storage: ActorRef[Message]
+  def addUser(user: User, isHashedPassword: Boolean)
+             (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    (storage ? DatabaseUserHandler.AddUser(user, isHashedPassword)).mapTo[Int]
 
-  def addUser(user: User, isHashedPassword: Boolean)(implicit timeout: Timeout, scheduler: Scheduler): Future[Unit] =
+  def newPartyId(implicit executionContext: ExecutionContext, timeout: Timeout): Future[String] =
-    storage.ask(AddUser(user, isHashedPassword, _))
+    (storage ? PartyService.GetNewPartyId).mapTo[String]
 
-  def newPartyId(implicit timeout: Timeout, scheduler: Scheduler): Future[String] =
+  def user(partyId: String, username: String)
-    storage.ask(GetNewPartyId)
+          (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Option[User]] =
+    (storage ? DatabaseUserHandler.GetUser(partyId, username)).mapTo[Option[User]]
 
-  def user(partyId: String, username: String)(implicit timeout: Timeout, scheduler: Scheduler): Future[Option[User]] =
+  def users(partyId: String)
-    storage.ask(GetUser(partyId, username, _))
+           (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Seq[User]] =
+    (storage ? DatabaseUserHandler.GetUsers(partyId)).mapTo[Seq[User]]
 
-  def users(partyId: String)(implicit timeout: Timeout, scheduler: Scheduler): Future[Seq[User]] =
+  def removeUser(partyId: String, username: String)
-    storage.ask(GetUsers(partyId, _))
+                (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
-
+    (storage ? DatabaseUserHandler.DeleteUser(partyId, username)).mapTo[Int]
-  def removeUser(partyId: String, username: String)(implicit timeout: Timeout, scheduler: Scheduler): Future[Unit] =
-    storage.ask(DeleteUser(partyId, username, _))
 }

src/main/scala/me/arcanis/ffxivbis/http/api/v1/BiSEndpoint.scala

@@ -8,7 +8,7 @@
  */
 package me.arcanis.ffxivbis.http.api.v1
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
 import akka.http.scaladsl.model.{HttpEntity, StatusCodes}
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
@@ -19,60 +19,38 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody
 import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.security.SecurityRequirement
 import io.swagger.v3.oas.annotations.{Operation, Parameter}
-import jakarta.ws.rs._
+import javax.ws.rs._
 import me.arcanis.ffxivbis.http.api.v1.json._
 import me.arcanis.ffxivbis.http.{Authorization, BiSHelper}
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, Message}
 import me.arcanis.ffxivbis.models.PlayerId
 
 import scala.util.{Failure, Success}
 
-@Path("/api/v1")
+@Path("api/v1")
-class BiSEndpoint(override val storage: ActorRef[Message], override val provider: ActorRef[BiSProviderMessage])(implicit
+class BiSEndpoint(override val storage: ActorRef, ariyala: ActorRef)(implicit timeout: Timeout)
-  timeout: Timeout,
+  extends BiSHelper(storage, ariyala) with Authorization with JsonSupport {
-  scheduler: Scheduler
-) extends BiSHelper
-  with Authorization
-  with JsonSupport {
 
   def route: Route = createBiS ~ getBiS ~ modifyBiS
 
   @PUT
   @Path("party/{partyId}/bis")
   @Consumes(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "create best in slot", description = "Create the best in slot set",
-    summary = "create best in slot",
-    description = "Create the best in slot set",
     parameters = Array(
       new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
     ),
-    requestBody = new RequestBody(
+    requestBody = new RequestBody(description = "player best in slot description", required = true,
-      description = "player best in slot description",
+      content = Array(new Content(schema = new Schema(implementation = classOf[PlayerBiSLinkResponse])))),
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[PlayerBiSLinkResponse])))
-    ),
     responses = Array(
       new ApiResponse(responseCode = "201", description = "Best in slot set has been created"),
-      new ApiResponse(
+      new ApiResponse(responseCode = "400", description = "Invalid parameters were supplied",
-        responseCode = "400",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        description = "Invalid parameters were supplied",
+      new ApiResponse(responseCode = "401", description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-      ),
+      new ApiResponse(responseCode = "403", description = "Access is forbidden",
-      new ApiResponse(
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        responseCode = "401",
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-        description = "Supplied authorization is invalid",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("post"))),
     tags = Array("best in slot"),
@@ -97,44 +75,23 @@ class BiSEndpoint(override val storage: ActorRef[Message], override val provider
   @GET
   @Path("party/{partyId}/bis")
   @Produces(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "get best in slot", description = "Return the best in slot items",
-    summary = "get best in slot",
-    description = "Return the best in slot items",
     parameters = Array(
       new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
-      new Parameter(
+      new Parameter(name = "nick", in = ParameterIn.QUERY, description = "player nick name to filter", example = "Siuan Sanche"),
-        name = "nick",
-        in = ParameterIn.QUERY,
-        description = "player nick name to filter",
-        example = "Siuan Sanche"
-      ),
       new Parameter(name = "job", in = ParameterIn.QUERY, description = "player job to filter", example = "DNC"),
     ),
     responses = Array(
-      new ApiResponse(
+      new ApiResponse(responseCode = "200", description = "Best in slot",
-        responseCode = "200",
+        content = Array(new Content(
-        description = "Best in slot",
+          array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerResponse]))
-        content = Array(
+        ))),
-          new Content(
+      new ApiResponse(responseCode = "401", description = "Supplied authorization is invalid",
-            array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerResponse]))
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-          )
+      new ApiResponse(responseCode = "403", description = "Access is forbidden",
-        )
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-      ),
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-      new ApiResponse(
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("get"))),
     tags = Array("best in slot"),
@@ -160,39 +117,22 @@ class BiSEndpoint(override val storage: ActorRef[Message], override val provider
   @POST
   @Path("party/{partyId}/bis")
   @Consumes(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "modify best in slot", description = "Add or remove an item from the best in slot",
-    summary = "modify best in slot",
-    description = "Add or remove an item from the best in slot",
     parameters = Array(
       new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
     ),
-    requestBody = new RequestBody(
+    requestBody = new RequestBody(description = "action and piece description", required = true,
-      description = "action and piece description",
+      content = Array(new Content(schema = new Schema(implementation = classOf[PieceActionResponse])))),
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[PieceActionResponse])))
-    ),
     responses = Array(
       new ApiResponse(responseCode = "202", description = "Best in slot set has been modified"),
-      new ApiResponse(
+      new ApiResponse(responseCode = "400", description = "Invalid parameters were supplied",
-        responseCode = "400",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        description = "Invalid parameters were supplied",
+      new ApiResponse(responseCode = "401", description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-      ),
+      new ApiResponse(responseCode = "403", description = "Access is forbidden",
-      new ApiResponse(
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        responseCode = "401",
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-        description = "Supplied authorization is invalid",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("post"))),
     tags = Array("best in slot"),

src/main/scala/me/arcanis/ffxivbis/http/api/v1/HttpHandler.scala

@@ -17,7 +17,7 @@ import spray.json._
 
 trait HttpHandler extends StrictLogging { this: JsonSupport =>
 
-  def exceptionHandler: ExceptionHandler = ExceptionHandler {
+  implicit def exceptionHandler: ExceptionHandler = ExceptionHandler {
     case ex: IllegalArgumentException =>
       complete(StatusCodes.BadRequest, ErrorResponse(ex.getMessage))
 
@@ -26,12 +26,12 @@ trait HttpHandler extends StrictLogging { this: JsonSupport =>
       complete(StatusCodes.InternalServerError, ErrorResponse("unknown server error"))
   }
 
-  def rejectionHandler: RejectionHandler =
+  implicit def rejectionHandler: RejectionHandler =
     RejectionHandler.default
       .mapRejectionResponse {
         case response @ HttpResponse(_, _, entity: HttpEntity.Strict, _) =>
           val message = ErrorResponse(entity.data.utf8String).toJson
-          response.withEntity(HttpEntity(ContentTypes.`application/json`, message.compactPrint))
+          response.copy(entity = HttpEntity(ContentTypes.`application/json`, message.compactPrint))
         case other => other
       }
 }

src/main/scala/me/arcanis/ffxivbis/http/api/v1/LootEndpoint.scala

@@ -8,7 +8,7 @@
  */
 package me.arcanis.ffxivbis.http.api.v1
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
 import akka.http.scaladsl.model.{HttpEntity, StatusCodes}
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
@@ -19,64 +19,39 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody
 import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.security.SecurityRequirement
 import io.swagger.v3.oas.annotations.{Operation, Parameter}
-import jakarta.ws.rs._
+import javax.ws.rs._
 import me.arcanis.ffxivbis.http.api.v1.json._
 import me.arcanis.ffxivbis.http.{Authorization, LootHelper}
-import me.arcanis.ffxivbis.messages.Message
 import me.arcanis.ffxivbis.models.PlayerId
 
 import scala.util.{Failure, Success}
 
-@Path("/api/v1")
+@Path("api/v1")
-class LootEndpoint(override val storage: ActorRef[Message])(implicit timeout: Timeout, scheduler: Scheduler)
+class LootEndpoint(override val storage: ActorRef)(implicit timeout: Timeout)
-  extends LootHelper
+  extends LootHelper(storage) with Authorization with JsonSupport with HttpHandler {
-  with Authorization
-  with JsonSupport
-  with HttpHandler {
 
   def route: Route = getLoot ~ modifyLoot
 
   @GET
   @Path("party/{partyId}/loot")
   @Produces(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "get loot list", description = "Return the looted items",
-    summary = "get loot list",
-    description = "Return the looted items",
     parameters = Array(
       new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
-      new Parameter(
+      new Parameter(name = "nick", in = ParameterIn.QUERY, description = "player nick name to filter", example = "Siuan Sanche"),
-        name = "nick",
-        in = ParameterIn.QUERY,
-        description = "player nick name to filter",
-        example = "Siuan Sanche"
-      ),
       new Parameter(name = "job", in = ParameterIn.QUERY, description = "player job to filter", example = "DNC"),
     ),
     responses = Array(
-      new ApiResponse(
+      new ApiResponse(responseCode = "200", description = "Loot list",
-        responseCode = "200",
+        content = Array(new Content(
-        description = "Loot list",
+          array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerResponse]))
-        content = Array(
+        ))),
-          new Content(
+      new ApiResponse(responseCode = "401", description = "Supplied authorization is invalid",
-            array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerResponse]))
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-          )
+      new ApiResponse(responseCode = "403", description = "Access is forbidden",
-        )
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-      ),
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-      new ApiResponse(
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("get"))),
     tags = Array("loot"),
@@ -101,39 +76,22 @@ class LootEndpoint(override val storage: ActorRef[Message])(implicit timeout: Ti
   @POST
   @Consumes(value = Array("application/json"))
   @Path("party/{partyId}/loot")
-  @Operation(
+  @Operation(summary = "modify loot list", description = "Add or remove an item from the loot list",
-    summary = "modify loot list",
-    description = "Add or remove an item from the loot list",
     parameters = Array(
       new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
     ),
-    requestBody = new RequestBody(
+    requestBody = new RequestBody(description = "action and piece description", required = true,
-      description = "action and piece description",
+      content = Array(new Content(schema = new Schema(implementation = classOf[PieceActionResponse])))),
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[PieceActionResponse])))
-    ),
     responses = Array(
       new ApiResponse(responseCode = "202", description = "Loot list has been modified"),
-      new ApiResponse(
+      new ApiResponse(responseCode = "400", description = "Invalid parameters were supplied",
-        responseCode = "400",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        description = "Invalid parameters were supplied",
+      new ApiResponse(responseCode = "401", description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-      ),
+      new ApiResponse(responseCode = "403", description = "Access is forbidden",
-      new ApiResponse(
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        responseCode = "401",
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-        description = "Supplied authorization is invalid",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("post"))),
     tags = Array("loot"),
@@ -145,7 +103,7 @@ class LootEndpoint(override val storage: ActorRef[Message])(implicit timeout: Ti
           post {
             entity(as[PieceActionResponse]) { action =>
               val playerId = action.playerId.withPartyId(partyId)
-              onComplete(doModifyLoot(action.action, playerId, action.piece.toPiece, action.isFreeLoot)) {
+              onComplete(doModifyLoot(action.action, playerId, action.piece.toPiece)) {
                 case Success(_) => complete(StatusCodes.Accepted, HttpEntity.Empty)
                 case Failure(exception) => throw exception
               }
@@ -159,47 +117,25 @@ class LootEndpoint(override val storage: ActorRef[Message])(implicit timeout: Ti
   @Path("party/{partyId}/loot")
   @Consumes(value = Array("application/json"))
   @Produces(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "suggest loot", description = "Suggest loot piece to party",
-    summary = "suggest loot",
-    description = "Suggest loot piece to party",
     parameters = Array(
       new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
     ),
-    requestBody = new RequestBody(
+    requestBody = new RequestBody(description = "piece description", required = true,
-      description = "piece description",
+      content = Array(new Content(schema = new Schema(implementation = classOf[PieceResponse])))),
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[PieceResponse])))
-    ),
     responses = Array(
-      new ApiResponse(
+      new ApiResponse(responseCode = "200", description = "Players with counters ordered by priority to get this item",
-        responseCode = "200",
+        content = Array(new Content(
-        description = "Players with counters ordered by priority to get this item",
+          array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerIdWithCountersResponse])),
-        content = Array(
+        ))),
-          new Content(
+      new ApiResponse(responseCode = "400", description = "Invalid parameters were supplied",
-            array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerIdWithCountersResponse])),
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-          )
+      new ApiResponse(responseCode = "401", description = "Supplied authorization is invalid",
-        )
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-      ),
+      new ApiResponse(responseCode = "403", description = "Access is forbidden",
-      new ApiResponse(
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        responseCode = "400",
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-        description = "Invalid parameters were supplied",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("get"))),
     tags = Array("loot"),

src/main/scala/me/arcanis/ffxivbis/http/api/v1/PartyEndpoint.scala

@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2020 Evgeniy Alekseev.
- *
- * This file is part of ffxivbis
- * (see https://github.com/arcan1s/ffxivbis).
- *
- * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
- */
-package me.arcanis.ffxivbis.http.api.v1
-
-import akka.actor.typed.{ActorRef, Scheduler}
-import akka.http.scaladsl.model.{HttpEntity, StatusCodes}
-import akka.http.scaladsl.server.Directives._
-import akka.http.scaladsl.server._
-import akka.util.Timeout
-import io.swagger.v3.oas.annotations.enums.ParameterIn
-import io.swagger.v3.oas.annotations.media.{Content, Schema}
-import io.swagger.v3.oas.annotations.parameters.RequestBody
-import io.swagger.v3.oas.annotations.responses.ApiResponse
-import io.swagger.v3.oas.annotations.security.SecurityRequirement
-import io.swagger.v3.oas.annotations.{Operation, Parameter}
-import jakarta.ws.rs._
-import me.arcanis.ffxivbis.http.api.v1.json._
-import me.arcanis.ffxivbis.http.{Authorization, PlayerHelper}
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, Message}
-
-import scala.util.{Failure, Success}
-
-@Path("/api/v1")
-class PartyEndpoint(override val storage: ActorRef[Message], override val provider: ActorRef[BiSProviderMessage])(
-  implicit
-  timeout: Timeout,
-  scheduler: Scheduler
-) extends PlayerHelper
-  with Authorization
-  with JsonSupport
-  with HttpHandler {
-
-  def route: Route = getPartyDescription ~ modifyPartyDescription
-
-  @GET
-  @Path("party/{partyId}/description")
-  @Produces(value = Array("application/json"))
-  @Operation(
-    summary = "get party description",
-    description = "Return the party description",
-    parameters = Array(
-      new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
-    ),
-    responses = Array(
-      new ApiResponse(
-        responseCode = "200",
-        description = "Party description",
-        content = Array(new Content(schema = new Schema(implementation = classOf[PartyDescriptionResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-    ),
-    security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("get"))),
-    tags = Array("party"),
-  )
-  def getPartyDescription: Route =
-    path("party" / Segment / "description") { partyId =>
-      extractExecutionContext { implicit executionContext =>
-        authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
-          get {
-            onComplete(getPartyDescription(partyId)) {
-              case Success(response) => complete(PartyDescriptionResponse.fromDescription(response))
-              case Failure(exception) => throw exception
-            }
-          }
-        }
-      }
-    }
-
-  @POST
-  @Consumes(value = Array("application/json"))
-  @Path("party/{partyId}/description")
-  @Operation(
-    summary = "modify party description",
-    description = "Edit party description",
-    parameters = Array(
-      new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
-    ),
-    requestBody = new RequestBody(
-      description = "new party description",
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[PartyDescriptionResponse])))
-    ),
-    responses = Array(
-      new ApiResponse(responseCode = "202", description = "Party description has been modified"),
-      new ApiResponse(
-        responseCode = "400",
-        description = "Invalid parameters were supplied",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-    ),
-    security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("post"))),
-    tags = Array("party"),
-  )
-  def modifyPartyDescription: Route =
-    path("party" / Segment / "description") { partyId =>
-      extractExecutionContext { implicit executionContext =>
-        authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
-          post {
-            entity(as[PartyDescriptionResponse]) { partyDescription =>
-              val description = partyDescription.copy(partyId = partyId)
-              onComplete(updateDescription(description.toDescription)) {
-                case Success(_) => complete(StatusCodes.Accepted, HttpEntity.Empty)
-                case Failure(exception) => throw exception
-              }
-            }
-          }
-        }
-      }
-    }
-}

src/main/scala/me/arcanis/ffxivbis/http/api/v1/PlayerEndpoint.scala

@@ -8,7 +8,7 @@
  */
 package me.arcanis.ffxivbis.http.api.v1
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
 import akka.http.scaladsl.model.{HttpEntity, StatusCodes}
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
@@ -19,67 +19,39 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody
 import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.security.SecurityRequirement
 import io.swagger.v3.oas.annotations.{Operation, Parameter}
-import jakarta.ws.rs._
+import javax.ws.rs._
 import me.arcanis.ffxivbis.http.api.v1.json._
 import me.arcanis.ffxivbis.http.{Authorization, PlayerHelper}
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, Message}
 import me.arcanis.ffxivbis.models.PlayerId
 
 import scala.util.{Failure, Success}
 
-@Path("/api/v1")
+@Path("api/v1")
-class PlayerEndpoint(override val storage: ActorRef[Message], override val provider: ActorRef[BiSProviderMessage])(
+class PlayerEndpoint(override val storage: ActorRef, ariyala: ActorRef)(implicit timeout: Timeout)
-  implicit
+  extends PlayerHelper(storage, ariyala) with Authorization with JsonSupport with HttpHandler {
-  timeout: Timeout,
-  scheduler: Scheduler
-) extends PlayerHelper
-  with Authorization
-  with JsonSupport
-  with HttpHandler {
 
   def route: Route = getParty ~ modifyParty
 
   @GET
   @Path("party/{partyId}")
   @Produces(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "get party", description = "Return the players who belong to the party",
-    summary = "get party",
-    description = "Return the players who belong to the party",
     parameters = Array(
       new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
-      new Parameter(
+      new Parameter(name = "nick", in = ParameterIn.QUERY, description = "player nick name to filter", example = "Siuan Sanche"),
-        name = "nick",
-        in = ParameterIn.QUERY,
-        description = "player nick name to filter",
-        example = "Siuan Sanche"
-      ),
       new Parameter(name = "job", in = ParameterIn.QUERY, description = "player job to filter", example = "DNC"),
     ),
     responses = Array(
-      new ApiResponse(
+      new ApiResponse(responseCode = "200", description = "Players list",
-        responseCode = "200",
+        content = Array(new Content(
-        description = "Players list",
+          array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerResponse])),
-        content = Array(
+        ))),
-          new Content(
+      new ApiResponse(responseCode = "401", description = "Supplied authorization is invalid",
-            array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerResponse])),
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-          )
+      new ApiResponse(responseCode = "403", description = "Access is forbidden",
-        )
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-      ),
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-      new ApiResponse(
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("get"))),
     tags = Array("party"),
@@ -104,39 +76,22 @@ class PlayerEndpoint(override val storage: ActorRef[Message], override val provi
   @POST
   @Path("party/{partyId}")
   @Consumes(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "modify party", description = "Add or remove a player from party list",
-    summary = "modify party",
-    description = "Add or remove a player from party list",
     parameters = Array(
       new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
     ),
-    requestBody = new RequestBody(
+    requestBody = new RequestBody(description = "player description", required = true,
-      description = "player description",
+      content = Array(new Content(schema = new Schema(implementation = classOf[PlayerActionResponse])))),
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[PlayerActionResponse])))
-    ),
     responses = Array(
       new ApiResponse(responseCode = "202", description = "Party has been modified"),
-      new ApiResponse(
+      new ApiResponse(responseCode = "400", description = "Invalid parameters were supplied",
-        responseCode = "400",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        description = "Invalid parameters were supplied",
+      new ApiResponse(responseCode = "401", description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-      ),
+      new ApiResponse(responseCode = "403", description = "Access is forbidden",
-      new ApiResponse(
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        responseCode = "401",
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-        description = "Supplied authorization is invalid",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("post"))),
     tags = Array("party"),

src/main/scala/me/arcanis/ffxivbis/http/api/v1/RootApiV1Endpoint.scala

@@ -8,32 +8,28 @@
  */
 package me.arcanis.ffxivbis.http.api.v1
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.Route
 import akka.util.Timeout
 import com.typesafe.config.Config
 import me.arcanis.ffxivbis.http.api.v1.json.JsonSupport
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, Message}
 
-class RootApiV1Endpoint(storage: ActorRef[Message], provider: ActorRef[BiSProviderMessage], config: Config)(implicit
+class RootApiV1Endpoint(storage: ActorRef, ariyala: ActorRef, config: Config)
-  timeout: Timeout,
+                       (implicit timeout: Timeout)
-  scheduler: Scheduler
+  extends JsonSupport with HttpHandler {
-) extends JsonSupport
-  with HttpHandler {
 
-  private val biSEndpoint = new BiSEndpoint(storage, provider)
+  private val biSEndpoint = new BiSEndpoint(storage, ariyala)
   private val lootEndpoint = new LootEndpoint(storage)
-  private val partyEndpoint = new PartyEndpoint(storage, provider)
+  private val playerEndpoint = new PlayerEndpoint(storage, ariyala)
-  private val playerEndpoint = new PlayerEndpoint(storage, provider)
   private val typesEndpoint = new TypesEndpoint(config)
   private val userEndpoint = new UserEndpoint(storage)
 
   def route: Route =
     handleExceptions(exceptionHandler) {
       handleRejections(rejectionHandler) {
-        biSEndpoint.route ~ lootEndpoint.route ~ partyEndpoint.route ~
+        biSEndpoint.route ~ lootEndpoint.route ~ playerEndpoint.route ~
-          playerEndpoint.route ~ typesEndpoint.route ~ userEndpoint.route
+          typesEndpoint.route ~ userEndpoint.route
       }
     }
 }

src/main/scala/me/arcanis/ffxivbis/http/api/v1/TypesEndpoint.scala

@@ -14,36 +14,26 @@ import com.typesafe.config.Config
 import io.swagger.v3.oas.annotations.media.{ArraySchema, Content, Schema}
 import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.Operation
-import jakarta.ws.rs._
+import javax.ws.rs._
 import me.arcanis.ffxivbis.http.api.v1.json._
-import me.arcanis.ffxivbis.models.{Job, Party, Permission, Piece, PieceType}
+import me.arcanis.ffxivbis.models.{Job, Party, Permission, Piece}
 
-@Path("/api/v1")
+@Path("api/v1")
 class TypesEndpoint(config: Config) extends JsonSupport {
 
-  def route: Route = getJobs ~ getPermissions ~ getPieces ~ getPieceTypes ~ getPriority
+  def route: Route = getJobs ~ getPermissions ~ getPieces ~ getPriority
 
   @GET
   @Path("types/jobs")
   @Produces(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "jobs list", description = "Returns the available jobs",
-    summary = "jobs list",
-    description = "Returns the available jobs",
     responses = Array(
-      new ApiResponse(
+      new ApiResponse(responseCode = "200", description = "List of available jobs",
-        responseCode = "200",
+        content = Array(new Content(
-        description = "List of available jobs",
+          array = new ArraySchema(schema = new Schema(implementation = classOf[String]))
-        content = Array(
+        ))),
-          new Content(
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-            array = new ArraySchema(schema = new Schema(implementation = classOf[String]))
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-          )
-        )
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     tags = Array("types"),
   )
@@ -57,24 +47,14 @@ class TypesEndpoint(config: Config) extends JsonSupport {
   @GET
   @Path("types/permissions")
   @Produces(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "permissions list", description = "Returns the available permissions",
-    summary = "permissions list",
-    description = "Returns the available permissions",
     responses = Array(
-      new ApiResponse(
+      new ApiResponse(responseCode = "200", description = "List of available permissions",
-        responseCode = "200",
+        content = Array(new Content(
-        description = "List of available permissions",
+          array = new ArraySchema(schema = new Schema(implementation = classOf[String]))
-        content = Array(
+        ))),
-          new Content(
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-            array = new ArraySchema(schema = new Schema(implementation = classOf[String]))
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-          )
-        )
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     tags = Array("types"),
   )
@@ -88,24 +68,14 @@ class TypesEndpoint(config: Config) extends JsonSupport {
   @GET
   @Path("types/pieces")
   @Produces(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "pieces list", description = "Returns the available pieces",
-    summary = "pieces list",
-    description = "Returns the available pieces",
     responses = Array(
-      new ApiResponse(
+      new ApiResponse(responseCode = "200", description = "List of available pieces",
-        responseCode = "200",
+        content = Array(new Content(
-        description = "List of available pieces",
+          array = new ArraySchema(schema = new Schema(implementation = classOf[String]))
-        content = Array(
+        ))),
-          new Content(
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-            array = new ArraySchema(schema = new Schema(implementation = classOf[String]))
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-          )
-        )
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     tags = Array("types"),
   )
@@ -116,58 +86,17 @@ class TypesEndpoint(config: Config) extends JsonSupport {
       }
     }
 
-  @GET
-  @Path("types/pieces/types")
-  @Produces(value = Array("application/json"))
-  @Operation(
-    summary = "piece types list",
-    description = "Returns the available piece types",
-    responses = Array(
-      new ApiResponse(
-        responseCode = "200",
-        description = "List of available piece types",
-        content = Array(
-          new Content(
-            array = new ArraySchema(schema = new Schema(implementation = classOf[String]))
-          )
-        )
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-    ),
-    tags = Array("types"),
-  )
-  def getPieceTypes: Route =
-    path("types" / "pieces" / "types") {
-      get {
-        complete(PieceType.available.map(_.toString))
-      }
-    }
-
   @GET
   @Path("types/priority")
   @Produces(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "priority list", description = "Returns the current priority list",
-    summary = "priority list",
-    description = "Returns the current priority list",
     responses = Array(
-      new ApiResponse(
+      new ApiResponse(responseCode = "200", description = "Priority order",
-        responseCode = "200",
+        content = Array(new Content(
-        description = "Priority order",
+          array = new ArraySchema(schema = new Schema(implementation = classOf[String]))
-        content = Array(
+        ))),
-          new Content(
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-            array = new ArraySchema(schema = new Schema(implementation = classOf[String]))
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-          )
-        )
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     tags = Array("types"),
   )

src/main/scala/me/arcanis/ffxivbis/http/api/v1/UserEndpoint.scala

@@ -8,7 +8,7 @@
  */
 package me.arcanis.ffxivbis.http.api.v1
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
 import akka.http.scaladsl.model.{HttpEntity, StatusCodes}
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
@@ -19,50 +19,33 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody
 import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.security.SecurityRequirement
 import io.swagger.v3.oas.annotations.{Operation, Parameter}
-import jakarta.ws.rs._
+import javax.ws.rs._
 import me.arcanis.ffxivbis.http.api.v1.json._
 import me.arcanis.ffxivbis.http.{Authorization, UserHelper}
-import me.arcanis.ffxivbis.messages.Message
 import me.arcanis.ffxivbis.models.Permission
 
 import scala.util.{Failure, Success}
 
-@Path("/api/v1")
+@Path("api/v1")
-class UserEndpoint(override val storage: ActorRef[Message])(implicit timeout: Timeout, scheduler: Scheduler)
+class UserEndpoint(override val storage: ActorRef)(implicit timeout: Timeout)
-  extends UserHelper
+  extends UserHelper(storage) with Authorization with JsonSupport {
-  with Authorization
-  with JsonSupport {
 
   def route: Route = createParty ~ createUser ~ deleteUser ~ getUsers
 
   @PUT
   @Path("party")
   @Consumes(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "create new party", description = "Create new party with specified ID",
-    summary = "create new party",
+    requestBody = new RequestBody(description = "party administrator description", required = true,
-    description = "Create new party with specified ID",
+      content = Array(new Content(schema = new Schema(implementation = classOf[UserResponse])))),
-    requestBody = new RequestBody(
-      description = "party administrator description",
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[UserResponse])))
-    ),
     responses = Array(
       new ApiResponse(responseCode = "200", description = "Party has been created"),
-      new ApiResponse(
+      new ApiResponse(responseCode = "400", description = "Invalid parameters were supplied",
-        responseCode = "400",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        description = "Invalid parameters were supplied",
+      new ApiResponse(responseCode = "406", description = "Party with the specified ID already exists",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-      ),
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-      new ApiResponse(
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        responseCode = "406",
-        description = "Party with the specified ID already exists",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     tags = Array("party"),
   )
@@ -88,39 +71,22 @@ class UserEndpoint(override val storage: ActorRef[Message])(implicit timeout: Ti
   @POST
   @Path("party/{partyId}/users")
   @Consumes(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "create new user", description = "Add an user to the specified party",
-    summary = "create new user",
-    description = "Add an user to the specified party",
     parameters = Array(
       new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
     ),
-    requestBody = new RequestBody(
+    requestBody = new RequestBody(description = "user description", required = true,
-      description = "user description",
+      content = Array(new Content(schema = new Schema(implementation = classOf[UserResponse])))),
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[UserResponse])))
-    ),
     responses = Array(
       new ApiResponse(responseCode = "201", description = "User has been created"),
-      new ApiResponse(
+      new ApiResponse(responseCode = "400", description = "Invalid parameters were supplied",
-        responseCode = "400",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        description = "Invalid parameters were supplied",
+      new ApiResponse(responseCode = "401", description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-      ),
+      new ApiResponse(responseCode = "403", description = "Access is forbidden",
-      new ApiResponse(
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        responseCode = "401",
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-        description = "Supplied authorization is invalid",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("admin"))),
     tags = Array("users"),
@@ -144,30 +110,19 @@ class UserEndpoint(override val storage: ActorRef[Message])(implicit timeout: Ti
 
   @DELETE
   @Path("party/{partyId}/users/{username}")
-  @Operation(
+  @Operation(summary = "remove user", description = "Remove an user from the specified party",
-    summary = "remove user",
-    description = "Remove an user from the specified party",
     parameters = Array(
       new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
       new Parameter(name = "username", in = ParameterIn.PATH, description = "username to remove", example = "siuan"),
     ),
     responses = Array(
       new ApiResponse(responseCode = "202", description = "User has been removed"),
-      new ApiResponse(
+      new ApiResponse(responseCode = "401", description = "Supplied authorization is invalid",
-        responseCode = "401",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        description = "Supplied authorization is invalid",
+      new ApiResponse(responseCode = "403", description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-      ),
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-      new ApiResponse(
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("admin"))),
     tags = Array("users"),
@@ -189,37 +144,21 @@ class UserEndpoint(override val storage: ActorRef[Message])(implicit timeout: Ti
   @GET
   @Path("party/{partyId}/users")
   @Produces(value = Array("application/json"))
-  @Operation(
+  @Operation(summary = "get users", description = "Return the list of users belong to party",
-    summary = "get users",
-    description = "Return the list of users belong to party",
     parameters = Array(
       new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
     ),
     responses = Array(
-      new ApiResponse(
+      new ApiResponse(responseCode = "200", description = "Users list",
-        responseCode = "200",
+        content = Array(new Content(
-        description = "Users list",
+          array = new ArraySchema(schema = new Schema(implementation = classOf[UserResponse])),
-        content = Array(
+        ))),
-          new Content(
+      new ApiResponse(responseCode = "401", description = "Supplied authorization is invalid",
-            array = new ArraySchema(schema = new Schema(implementation = classOf[UserResponse])),
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-          )
+      new ApiResponse(responseCode = "403", description = "Access is forbidden",
-        )
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-      ),
+      new ApiResponse(responseCode = "500", description = "Internal server error",
-      new ApiResponse(
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))
-      ),
     ),
     security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("admin"))),
     tags = Array("users"),

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/ErrorResponse.scala

@@ -10,4 +10,5 @@ package me.arcanis.ffxivbis.http.api.v1.json
 
 import io.swagger.v3.oas.annotations.media.Schema
 
-case class ErrorResponse(@Schema(description = "error message", required = true) message: String)
+case class ErrorResponse(
+  @Schema(description = "error message", required = true) message: String)

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/JsonSupport.scala

@@ -8,8 +8,6 @@
  */
 package me.arcanis.ffxivbis.http.api.v1.json
 
-import java.time.Instant
-
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
 import me.arcanis.ffxivbis.models.Permission
 import spray.json._
@@ -26,29 +24,16 @@ trait JsonSupport extends SprayJsonSupport with DefaultJsonProtocol {
       }
     }
 
-  implicit val instantFormat: RootJsonFormat[Instant] = new RootJsonFormat[Instant] {
-    override def write(obj: Instant): JsValue = obj.toString.toJson
-    override def read(json: JsValue): Instant = json match {
-      case JsNumber(value) => Instant.ofEpochMilli(value.toLongExact)
-      case JsString(value) => Instant.parse(value)
-      case other => deserializationError(s"String or number expected, got $other")
-    }
-  }
-
   implicit val actionFormat: RootJsonFormat[ApiAction.Value] = enumFormat(ApiAction)
   implicit val permissionFormat: RootJsonFormat[Permission.Value] = enumFormat(Permission)
 
   implicit val errorFormat: RootJsonFormat[ErrorResponse] = jsonFormat1(ErrorResponse.apply)
   implicit val partyIdFormat: RootJsonFormat[PartyIdResponse] = jsonFormat1(PartyIdResponse.apply)
   implicit val pieceFormat: RootJsonFormat[PieceResponse] = jsonFormat3(PieceResponse.apply)
-  implicit val lootFormat: RootJsonFormat[LootResponse] = jsonFormat3(LootResponse.apply)
-  implicit val partyDescriptionFormat: RootJsonFormat[PartyDescriptionResponse] = jsonFormat2(
-    PartyDescriptionResponse.apply
-  )
   implicit val playerFormat: RootJsonFormat[PlayerResponse] = jsonFormat7(PlayerResponse.apply)
   implicit val playerActionFormat: RootJsonFormat[PlayerActionResponse] = jsonFormat2(PlayerActionResponse.apply)
   implicit val playerIdFormat: RootJsonFormat[PlayerIdResponse] = jsonFormat3(PlayerIdResponse.apply)
-  implicit val pieceActionFormat: RootJsonFormat[PieceActionResponse] = jsonFormat4(PieceActionResponse.apply)
+  implicit val pieceActionFormat: RootJsonFormat[PieceActionResponse] = jsonFormat3(PieceActionResponse.apply)
   implicit val playerBiSLinkFormat: RootJsonFormat[PlayerBiSLinkResponse] = jsonFormat2(PlayerBiSLinkResponse.apply)
   implicit val playerIdWithCountersFormat: RootJsonFormat[PlayerIdWithCountersResponse] =
     jsonFormat9(PlayerIdWithCountersResponse.apply)

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/LootResponse.scala

@@ -1,21 +0,0 @@
-package me.arcanis.ffxivbis.http.api.v1.json
-
-import java.time.Instant
-
-import io.swagger.v3.oas.annotations.media.Schema
-import me.arcanis.ffxivbis.models.Loot
-
-case class LootResponse(
-  @Schema(description = "looted piece", required = true) piece: PieceResponse,
-  @Schema(description = "loot timestamp", required = true) timestamp: Instant,
-  @Schema(description = "is loot free for all", required = true) isFreeLoot: Boolean
-) {
-
-  def toLoot: Loot = Loot(-1, piece.toPiece, timestamp, isFreeLoot)
-}
-
-object LootResponse {
-
-  def fromLoot(loot: Loot): LootResponse =
-    LootResponse(PieceResponse.fromPiece(loot.piece), loot.timestamp, loot.isFreeLoot)
-}

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PartyDescriptionResponse.scala

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2020 Evgeniy Alekseev.
- *
- * This file is part of ffxivbis
- * (see https://github.com/arcan1s/ffxivbis).
- *
- * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
- */
-package me.arcanis.ffxivbis.http.api.v1.json
-
-import io.swagger.v3.oas.annotations.media.Schema
-import me.arcanis.ffxivbis.models.PartyDescription
-
-case class PartyDescriptionResponse(
-  @Schema(description = "party id", required = true) partyId: String,
-  @Schema(description = "party name") partyAlias: Option[String]
-) {
-
-  def toDescription: PartyDescription = PartyDescription(partyId, partyAlias)
-}
-
-object PartyDescriptionResponse {
-
-  def fromDescription(description: PartyDescription): PartyDescriptionResponse =
-    PartyDescriptionResponse(description.partyId, description.partyAlias)
-}

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PartyIdResponse.scala

@@ -10,4 +10,5 @@ package me.arcanis.ffxivbis.http.api.v1.json
 
 import io.swagger.v3.oas.annotations.media.Schema
 
-case class PartyIdResponse(@Schema(description = "party id", required = true) partyId: String)
+case class PartyIdResponse(
+  @Schema(description = "party id", required = true) partyId: String)

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PieceActionResponse.scala

@@ -11,13 +11,6 @@ package me.arcanis.ffxivbis.http.api.v1.json
 import io.swagger.v3.oas.annotations.media.Schema
 
 case class PieceActionResponse(
-  @Schema(
+  @Schema(description = "action to perform", required = true, `type` = "string", allowableValues = Array("add", "remove")) action: ApiAction.Value,
-    description = "action to perform",
-    required = true,
-    `type` = "string",
-    allowableValues = Array("add", "remove")
-  ) action: ApiAction.Value,
   @Schema(description = "piece description", required = true) piece: PieceResponse,
-  @Schema(description = "player description", required = true) playerId: PlayerIdResponse,
+  @Schema(description = "player description", required = true) playerId: PlayerIdResponse)
-  @Schema(description = "is piece free to roll or not") isFreeLoot: Option[Boolean]
-)

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PieceResponse.scala

@@ -9,19 +9,16 @@
 package me.arcanis.ffxivbis.http.api.v1.json
 
 import io.swagger.v3.oas.annotations.media.Schema
-import me.arcanis.ffxivbis.models.{Job, Piece, PieceType}
+import me.arcanis.ffxivbis.models.{Job, Piece}
 
 case class PieceResponse(
-  @Schema(description = "piece type", required = true) pieceType: String,
+  @Schema(description = "is piece tome gear", required = true) isTome: Boolean,
   @Schema(description = "job name to which piece belong or AnyJob", required = true, example = "DNC") job: String,
-  @Schema(description = "piece name", required = true, example = "body") piece: String
+  @Schema(description = "piece name", required = true, example = "body") piece: String) {
-) {
+  def toPiece: Piece = Piece(piece, isTome, Job.withName(job))
-
-  def toPiece: Piece = Piece(piece, PieceType.withName(pieceType), Job.withName(job))
 }
 
 object PieceResponse {
-
   def fromPiece(piece: Piece): PieceResponse =
-    PieceResponse(piece.pieceType.toString, piece.job.toString, piece.piece)
+    PieceResponse(piece.isTome, piece.job.toString, piece.piece)
 }

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PlayerActionResponse.scala

@@ -11,12 +11,5 @@ package me.arcanis.ffxivbis.http.api.v1.json
 import io.swagger.v3.oas.annotations.media.Schema
 
 case class PlayerActionResponse(
-  @Schema(
+  @Schema(description = "action to perform", required = true, `type` = "string", allowableValues = Array("add", "remove"), example = "add") action: ApiAction.Value,
-    description = "action to perform",
+  @Schema(description = "player description", required = true) playerId: PlayerResponse)
-    required = true,
-    `type` = "string",
-    allowableValues = Array("add", "remove"),
-    example = "add"
-  ) action: ApiAction.Value,
-  @Schema(description = "player description", required = true) playerId: PlayerResponse
-)

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PlayerBiSLinkResponse.scala

@@ -11,10 +11,5 @@ package me.arcanis.ffxivbis.http.api.v1.json
 import io.swagger.v3.oas.annotations.media.Schema
 
 case class PlayerBiSLinkResponse(
-  @Schema(
+  @Schema(description = "link to player best in slot", required = true, example = "https://ffxiv.ariyala.com/19V5R") link: String,
-    description = "link to player best in slot",
+  @Schema(description = "player description", required = true) playerId: PlayerIdResponse)
-    required = true,
-    example = "https://ffxiv.ariyala.com/19V5R"
-  ) link: String,
-  @Schema(description = "player description", required = true) playerId: PlayerIdResponse
-)

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PlayerIdResponse.scala

@@ -14,15 +14,12 @@ import me.arcanis.ffxivbis.models.{Job, PlayerId}
 case class PlayerIdResponse(
   @Schema(description = "unique party ID. Required in responses", example = "abcdefgh") partyId: Option[String],
   @Schema(description = "job name", required = true, example = "DNC") job: String,
-  @Schema(description = "player nick name", required = true, example = "Siuan Sanche") nick: String
+  @Schema(description = "player nick name", required = true, example = "Siuan Sanche") nick: String) {
-) {
-
   def withPartyId(partyId: String): PlayerId =
     PlayerId(partyId, Job.withName(job), nick)
 }
 
 object PlayerIdResponse {
-
   def fromPlayerId(playerId: PlayerId): PlayerIdResponse =
     PlayerIdResponse(Some(playerId.partyId), playerId.job.toString, playerId.nick)
 }

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PlayerIdWithCountersResponse.scala

@@ -20,11 +20,9 @@ case class PlayerIdWithCountersResponse(
   @Schema(description = "count of savage pieces in best in slot", required = true) bisCountTotal: Int,
   @Schema(description = "count of looted pieces", required = true) lootCount: Int,
   @Schema(description = "count of looted pieces which are parts of best in slot", required = true) lootCountBiS: Int,
-  @Schema(description = "total count of looted pieces", required = true) lootCountTotal: Int
+  @Schema(description = "total count of looted pieces", required = true) lootCountTotal: Int)
-)
 
 object PlayerIdWithCountersResponse {
-
   def fromPlayerId(playerIdWithCounters: PlayerIdWithCounters): PlayerIdWithCountersResponse =
     PlayerIdWithCountersResponse(
       playerIdWithCounters.partyId,
@@ -35,6 +33,5 @@ object PlayerIdWithCountersResponse {
       playerIdWithCounters.bisCountTotal,
       playerIdWithCounters.lootCount,
       playerIdWithCounters.lootCountBiS,
-      playerIdWithCounters.lootCountTotal
+      playerIdWithCounters.lootCountTotal)
-    )
 }

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PlayerResponse.scala

@@ -16,34 +16,18 @@ case class PlayerResponse(
   @Schema(description = "job name", required = true, example = "DNC") job: String,
   @Schema(description = "player nick name", required = true, example = "Siuan Sanche") nick: String,
   @Schema(description = "pieces in best in slot") bis: Option[Seq[PieceResponse]],
-  @Schema(description = "looted pieces") loot: Option[Seq[LootResponse]],
+  @Schema(description = "looted pieces") loot: Option[Seq[PieceResponse]],
   @Schema(description = "link to best in slot", example = "https://ffxiv.ariyala.com/19V5R") link: Option[String],
-  @Schema(description = "player loot priority", `type` = "number") priority: Option[Int]
+  @Schema(description = "player loot priority", `type` = "number") priority: Option[Int]) {
-) {
-
   def toPlayer: Player =
-    Player(
+    Player(partyId, Job.withName(job), nick,
-      -1,
+      BiS(bis.getOrElse(Seq.empty).map(_.toPiece)), loot.getOrElse(Seq.empty).map(_.toPiece),
-      partyId,
+      link, priority.getOrElse(0))
-      Job.withName(job),
-      nick,
-      BiS(bis.getOrElse(Seq.empty).map(_.toPiece)),
-      loot.getOrElse(Seq.empty).map(_.toLoot),
-      link,
-      priority.getOrElse(0)
-    )
 }
 
 object PlayerResponse {
-
   def fromPlayer(player: Player): PlayerResponse =
-    PlayerResponse(
+    PlayerResponse(player.partyId, player.job.toString, player.nick,
-      player.partyId,
+      Some(player.bis.pieces.map(PieceResponse.fromPiece)), Some(player.loot.map(PieceResponse.fromPiece)),
-      player.job.toString,
+      player.link, Some(player.priority))
-      player.nick,
-      Some(player.bis.pieces.map(PieceResponse.fromPiece)),
-      Some(player.loot.map(LootResponse.fromLoot)),
-      player.link,
-      Some(player.priority)
-    )
 }

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/UserResponse.scala

@@ -15,19 +15,12 @@ case class UserResponse(
   @Schema(description = "unique party ID", required = true, example = "abcdefgh") partyId: String,
   @Schema(description = "username to login to party", required = true, example = "siuan") username: String,
   @Schema(description = "password to login to party", required = true, example = "pa55w0rd") password: String,
-  @Schema(
+  @Schema(description = "user permission", defaultValue = "get", allowableValues = Array("get", "post", "admin")) permission: Option[Permission.Value] = None) {
-    description = "user permission",
-    defaultValue = "get",
-    allowableValues = Array("get", "post", "admin")
-  ) permission: Option[Permission.Value] = None
-) {
-
   def toUser: User =
     User(partyId, username, password, permission.getOrElse(Permission.get))
 }
 
 object UserResponse {
-
   def fromUser(user: User): UserResponse =
     UserResponse(user.partyId, user.username, "", Some(user.permission))
 }

src/main/scala/me/arcanis/ffxivbis/http/view/BasePartyView.scala

@@ -8,22 +8,15 @@
  */
 package me.arcanis.ffxivbis.http.view
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
 import akka.util.Timeout
-import me.arcanis.ffxivbis.http.{Authorization, PlayerHelper}
+import me.arcanis.ffxivbis.http.Authorization
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, Message}
 
-import scala.util.{Failure, Success}
+class BasePartyView(override val storage: ActorRef)(implicit timeout: Timeout)
-
+  extends Authorization {
-class BasePartyView(override val storage: ActorRef[Message], override val provider: ActorRef[BiSProviderMessage])(
-  implicit
-  timeout: Timeout,
-  scheduler: Scheduler
-) extends PlayerHelper
-  with Authorization {
 
   def route: Route = getIndex
 
@@ -32,10 +25,8 @@ class BasePartyView(override val storage: ActorRef[Message], override val provid
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
           get {
-            onComplete(getPartyDescription(partyId)) {
+            complete {
-              case Success(description) =>
+              (StatusCodes.OK, RootView.toHtml(BasePartyView.template(partyId)))
-                complete(StatusCodes.OK, RootView.toHtml(BasePartyView.template(partyId, description.alias)))
-              case Failure(exception) => throw exception
             }
           }
         }
@@ -49,25 +40,25 @@ object BasePartyView {
   import scalatags.Text.tags2.{title => titleTag}
 
   def root(partyId: String): Text.TypedTag[String] =
-    a(href := s"/party/$partyId", title := "root")("root")
+    a(href:=s"/party/$partyId", title:="root")("root")
 
-  def template(partyId: String, alias: String): String =
+  def template(partyId: String): String =
     "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">" +
-      html(
+      html(lang:="en",
-        lang := "en",
         head(
-          titleTag(s"Party $alias"),
+          titleTag(s"Party $partyId"),
-          link(rel := "stylesheet", `type` := "text/css", href := "/static/styles.css")
+          link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css")
         ),
+
         body(
-          h2(s"Party $alias"),
+          h2(s"Party $partyId"),
           br,
-          h2(a(href := s"/party/$partyId/players", title := "party")("party")),
+          h2(a(href:=s"/party/$partyId/players", title:="party")("party")),
-          h2(a(href := s"/party/$partyId/bis", title := "bis management")("best in slot")),
+          h2(a(href:=s"/party/$partyId/bis", title:="bis management")("best in slot")),
-          h2(a(href := s"/party/$partyId/loot", title := "loot management")("loot")),
+          h2(a(href:=s"/party/$partyId/loot", title:="loot management")("loot")),
-          h2(a(href := s"/party/$partyId/suggest", title := "suggest loot")("suggest")),
+          h2(a(href:=s"/party/$partyId/suggest", title:="suggest loot")("suggest")),
           hr,
-          h2(a(href := s"/party/$partyId/users", title := "user management")("users"))
+          h2(a(href:=s"/party/$partyId/users", title:="user management")("users"))
         )
       )
 }

src/main/scala/me/arcanis/ffxivbis/http/view/BiSView.scala

@@ -8,23 +8,19 @@
  */
 package me.arcanis.ffxivbis.http.view
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
 import akka.util.Timeout
 import me.arcanis.ffxivbis.http.{Authorization, BiSHelper}
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, Message}
+import me.arcanis.ffxivbis.models.{Piece, Player, PlayerId}
-import me.arcanis.ffxivbis.models.{Piece, PieceType, Player, PlayerId}
 
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.Try
 
-class BiSView(override val storage: ActorRef[Message], override val provider: ActorRef[BiSProviderMessage])(implicit
+class BiSView(override val storage: ActorRef, ariyala: ActorRef)(implicit timeout: Timeout)
-  timeout: Timeout,
+  extends BiSHelper(storage, ariyala) with Authorization {
-  scheduler: Scheduler
-) extends BiSHelper
-  with Authorization {
 
   def route: Route = getBiS ~ modifyBiS
 
@@ -34,13 +30,11 @@ class BiSView(override val storage: ActorRef[Message], override val provider: Ac
         authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
           get {
             complete {
-              bis(partyId, None)
+              bis(partyId, None).map { players =>
-                .map { players =>
+                BiSView.template(partyId, players, None)
-                  BiSView.template(partyId, players, None)
+              }.map { text =>
-                }
+                (StatusCodes.OK, RootView.toHtml(text))
-                .map { text =>
+              }
-                  (StatusCodes.OK, RootView.toHtml(text))
-                }
             }
           }
         }
@@ -52,49 +46,39 @@ class BiSView(override val storage: ActorRef[Message], override val provider: Ac
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
           post {
-            formFields(
+            formFields("player".as[String], "piece".as[String].?, "is_tome".as[String].?, "link".as[String].?, "action".as[String]) {
-              "player".as[String],
+              (player, maybePiece, maybeIsTome, maybeLink, action) =>
-              "piece".as[String].?,
+                onComplete(modifyBiSCall(partyId, player, maybePiece, maybeIsTome, maybeLink, action)) {
-              "piece_type".as[String].?,
+                  case _ => redirect(s"/party/$partyId/bis", StatusCodes.Found)
-              "link".as[String].?,
+                }
-              "action".as[String]
-            ) { (player, maybePiece, maybePieceType, maybeLink, action) =>
-              onComplete(modifyBiSCall(partyId, player, maybePiece, maybePieceType, maybeLink, action)) { _ =>
-                redirect(s"/party/$partyId/bis", StatusCodes.Found)
-              }
             }
           }
         }
       }
     }
 
-  private def modifyBiSCall(
+  private def modifyBiSCall(partyId: String, player: String,
-    partyId: String,
+                            maybePiece: Option[String], maybeIsTome: Option[String],
-    player: String,
+                            maybeLink: Option[String], action: String)
-    maybePiece: Option[String],
+                           (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Unit] = {
-    maybePieceType: Option[String],
+    import me.arcanis.ffxivbis.utils.Implicits._
-    maybeLink: Option[String],
-    action: String
-  )(implicit executionContext: ExecutionContext, timeout: Timeout): Future[Unit] = {
-    def getPiece(playerId: PlayerId, piece: String, pieceType: String) =
-      Try(Piece(piece, PieceType.withName(pieceType), playerId.job)).toOption
 
-    def bisAction(playerId: PlayerId, piece: String, pieceType: String)(fn: Piece => Future[Unit]) =
+    def getPiece(playerId: PlayerId, piece: String) =
-      getPiece(playerId, piece, pieceType) match {
+      Try(Piece(piece, maybeIsTome, playerId.job)).toOption
-        case Some(item) => fn(item)
-        case _ => Future.failed(new Error(s"Could not construct piece from `$piece ($pieceType)`"))
-      }
 
     PlayerId(partyId, player) match {
-      case Some(playerId) =>
+      case Some(playerId) => (maybePiece, action, maybeLink) match {
-        (maybePiece, maybePieceType, action, maybeLink.map(_.trim).filter(_.nonEmpty)) match {
+        case (Some(piece), "add", _) => getPiece(playerId, piece) match {
-          case (Some(piece), Some(pieceType), "add", _) =>
+          case Some(item) => addPieceBiS(playerId, item).map(_ => ())
-            bisAction(playerId, piece, pieceType)(addPieceBiS(playerId, _))
+          case _ => Future.failed(new Error(s"Could not construct piece from `$piece`"))
-          case (Some(piece), Some(pieceType), "remove", _) =>
-            bisAction(playerId, piece, pieceType)(removePieceBiS(playerId, _))
-          case (_, _, "create", Some(link)) => putBiS(playerId, link)
-          case _ => Future.failed(new Error(s"Could not perform $action"))
         }
+        case (Some(piece), "remove", _) => getPiece(playerId, piece) match {
+          case Some(item) => removePieceBiS(playerId, item).map(_ => ())
+          case _ => Future.failed(new Error(s"Could not construct piece from `$piece`"))
+        }
+        case (_, "create", Some(link)) => putBiS(playerId, link).map(_ => ())
+        case _ => Future.failed(new Error(s"Could not perform $action"))
+      }
       case _ => Future.failed(new Error(s"Could not construct player id from `$player`"))
     }
   }
@@ -106,68 +90,63 @@ object BiSView {
 
   def template(partyId: String, party: Seq[Player], error: Option[String]): String =
     "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">" +
-      html(
+      html(lang:="en",
-        lang := "en",
         head(
           titleTag("Best in slot"),
-          link(rel := "stylesheet", `type` := "text/css", href := "/static/styles.css")
+          link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css")
         ),
+
         body(
           h2("Best in slot"),
+
           ErrorView.template(error),
           SearchLineView.template,
-          form(action := s"/party/$partyId/bis", method := "post")(
+
-            select(name := "player", id := "player", title := "player")(
+          form(action:=s"/party/$partyId/bis", method:="post")(
-              for (player <- party) yield option(player.playerId.toString)
+            select(name:="player", id:="player", title:="player")
-            ),
+                  (for (player <- party) yield option(player.playerId.toString)),
-            select(name := "piece", id := "piece", title := "piece")(
+            select(name:="piece", id:="piece", title:="piece")
-              for (piece <- Piece.available) yield option(piece)
+                  (for (piece <- Piece.available) yield option(piece)),
-            ),
+            input(name:="is_tome", id:="is_tome", title:="is tome", `type`:="checkbox"),
-            select(name := "piece_type", id := "piece_type", title := "piece type")(
+            label(`for`:="is_tome")("is tome gear"),
-              for (pieceType <- PieceType.available) yield option(pieceType.toString)
+            input(name:="action", id:="action", `type`:="hidden", value:="add"),
-            ),
+            input(name:="add", id:="add", `type`:="submit", value:="add")
-            input(name := "action", id := "action", `type` := "hidden", value := "add"),
-            input(name := "add", id := "add", `type` := "submit", value := "add")
           ),
-          form(action := s"/party/$partyId/bis", method := "post")(
+
-            select(name := "player", id := "player", title := "player")(
+          form(action:="/bis", method:="post")(
-              for (player <- party) yield option(player.playerId.toString)
+            select(name:="player", id:="player", title:="player")
-            ),
+                  (for (player <- party) yield option(player.playerId.toString)),
-            input(name := "link", id := "link", placeholder := "player bis link", title := "link", `type` := "text"),
+            input(name:="link", id:="link", placeholder:="player bis link", title:="link", `type`:="text"),
-            input(name := "action", id := "action", `type` := "hidden", value := "create"),
+            input(name:="action", id:="action", `type`:="hidden", value:="create"),
-            input(name := "add", id := "add", `type` := "submit", value := "add")
+            input(name:="add", id:="add", `type`:="submit", value:="add")
           ),
-          table(id := "result")(
+
+          table(id:="result")(
             tr(
               th("player"),
               th("piece"),
-              th("piece type"),
+              th("is tome"),
               th("")
             ),
-            for (player <- party; piece <- player.bis.pieces)
+            for (player <- party; piece <- player.bis.pieces) yield tr(
-              yield tr(
+              td(`class`:="include_search")(player.playerId.toString),
-                td(`class` := "include_search")(player.playerId.toString),
+              td(`class`:="include_search")(piece.piece),
-                td(`class` := "include_search")(piece.piece),
+              td(piece.isTomeToString),
-                td(piece.pieceType.toString),
+              td(
-                td(
+                form(action:=s"/party/$partyId/bis", method:="post")(
-                  form(action := s"/party/$partyId/bis", method := "post")(
+                  input(name:="player", id:="player", `type`:="hidden", value:=player.playerId.toString),
-                    input(name := "player", id := "player", `type` := "hidden", value := player.playerId.toString),
+                  input(name:="piece", id:="piece", `type`:="hidden", value:=piece.piece),
-                    input(name := "piece", id := "piece", `type` := "hidden", value := piece.piece),
+                  input(name:="is_tome", id:="is_tome", `type`:="hidden", value:=piece.isTomeToString),
-                    input(
+                  input(name:="action", id:="action", `type`:="hidden", value:="remove"),
-                      name := "piece_type",
+                  input(name:="remove", id:="remove", `type`:="submit", value:="x")
-                      id := "piece_type",
-                      `type` := "hidden",
-                      value := piece.pieceType.toString
-                    ),
-                    input(name := "action", id := "action", `type` := "hidden", value := "remove"),
-                    input(name := "remove", id := "remove", `type` := "submit", value := "x")
-                  )
                 )
               )
+            )
           ),
+
           ExportToCSVView.template,
           BasePartyView.root(partyId),
-          script(src := "/static/table_search.js", `type` := "text/javascript")
+          script(src:="/static/table_search.js", `type`:="text/javascript")
         )
       )
 }

src/main/scala/me/arcanis/ffxivbis/http/view/ErrorView.scala

@@ -12,9 +12,8 @@ import scalatags.Text
 import scalatags.Text.all._
 
 object ErrorView {
-
   def template(error: Option[String]): Text.TypedTag[String] = error match {
-    case Some(text) => p(id := "error", s"Error occurs: $text")
+    case Some(text) => p(id:="error", s"Error occurs: $text")
     case None => p("")
   }
 }

src/main/scala/me/arcanis/ffxivbis/http/view/ExportToCSVView.scala

@@ -12,10 +12,9 @@ import scalatags.Text
 import scalatags.Text.all._
 
 object ExportToCSVView {
-
   def template: Text.TypedTag[String] =
     div(
-      button(onclick := "exportTableToCsv('result.csv')")("Export to CSV"),
+      button(onclick:="exportTableToCsv('result.csv')")("Export to CSV"),
-      script(src := "/static/table_export.js", `type` := "text/javascript")
+      script(src:="/static/table_export.js", `type`:="text/javascript")
     )
 }

src/main/scala/me/arcanis/ffxivbis/http/view/IndexView.scala

@@ -8,23 +8,18 @@
  */
 package me.arcanis.ffxivbis.http.view
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
 import akka.util.Timeout
-import me.arcanis.ffxivbis.http.{PlayerHelper, UserHelper}
+import me.arcanis.ffxivbis.http.UserHelper
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, Message}
+import me.arcanis.ffxivbis.models.{Permission, User}
-import me.arcanis.ffxivbis.models.{PartyDescription, Permission, User}
 
-import scala.concurrent.Future
 import scala.util.{Failure, Success}
 
-class IndexView(override val storage: ActorRef[Message], override val provider: ActorRef[BiSProviderMessage])(implicit
+class IndexView(storage: ActorRef)(implicit timeout: Timeout)
-  timeout: Timeout,
+  extends UserHelper(storage) {
-  scheduler: Scheduler
-) extends PlayerHelper
-  with UserHelper {
 
   def route: Route = createParty ~ getIndex
 
@@ -32,20 +27,15 @@ class IndexView(override val storage: ActorRef[Message], override val provider:
     path("party") {
       extractExecutionContext { implicit executionContext =>
         post {
-          formFields("username".as[String], "password".as[String], "alias".as[String].?) {
+          formFields("username".as[String], "password".as[String]) { (username, password) =>
-            (username, password, maybeAlias) =>
+            onComplete(newPartyId) {
-              onComplete {
+              case Success(partyId) =>
-                newPartyId.flatMap { partyId =>
+                val user = User(partyId, username, password, Permission.admin)
-                  val user = User(partyId, username, password, Permission.admin)
+                onComplete(addUser(user, isHashedPassword = false)) {
-                  addUser(user, isHashedPassword = false).flatMap { _ =>
+                  case _ => redirect(s"/party/$partyId", StatusCodes.Found)
-                    if (maybeAlias.getOrElse("").isEmpty) Future.successful(partyId)
-                    else updateDescription(PartyDescription(partyId, maybeAlias)).map(_ => partyId)
-                  }
                 }
-              } {
+              case Failure(exception) => throw exception
-                case Success(partyId) => redirect(s"/party/$partyId", StatusCodes.Found)
+            }
-                case Failure(exception) => throw exception
-              }
           }
         }
       }
@@ -71,34 +61,25 @@ object IndexView {
       html(
         head(
           titleTag("FFXIV loot helper"),
-          link(rel := "stylesheet", `type` := "text/css", href := "/static/styles.css")
+          link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css")
         ),
+
         body(
-          form(action := s"party", method := "post")(
+          form(action:=s"party", method:="post")(
             label("create a new party"),
-            input(name := "alias", id := "alias", placeholder := "party alias", title := "alias", `type` := "text"),
+            input(name:="username", id:="username", placeholder:="username", title:="username", `type`:="text"),
-            input(
+            input(name:="password", id:="password", placeholder:="password", title:="password", `type`:="password"),
-              name := "username",
+            input(name:="add", id:="add", `type`:="submit", value:="add")
-              id := "username",
-              placeholder := "username",
-              title := "username",
-              `type` := "text"
-            ),
-            input(
-              name := "password",
-              id := "password",
-              placeholder := "password",
-              title := "password",
-              `type` := "password"
-            ),
-            input(name := "add", id := "add", `type` := "submit", value := "add")
           ),
+
           br,
-          form(action := "/", method := "get")(
+
+          form(action:="/", method:="get")(
             label("already have party?"),
-            input(name := "partyId", id := "partyId", placeholder := "party id", title := "party id", `type` := "text"),
+            input(name:="partyId", id:="partyId", placeholder:="party id", title:="party id", `type`:="text"),
-            input(name := "go", id := "go", `type` := "submit", value := "go")
+            input(name:="go", id:="go", `type`:="submit", value:="go")
           )
         )
       )
 }
+

src/main/scala/me/arcanis/ffxivbis/http/view/LootSuggestView.scala

@@ -8,21 +8,19 @@
  */
 package me.arcanis.ffxivbis.http.view
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.Route
 import akka.util.Timeout
 import me.arcanis.ffxivbis.http.{Authorization, LootHelper}
-import me.arcanis.ffxivbis.messages.Message
+import me.arcanis.ffxivbis.models.{Job, Piece, PlayerIdWithCounters}
-import me.arcanis.ffxivbis.models.{Job, Piece, PieceType, PlayerIdWithCounters}
 
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Success, Try}
 
-class LootSuggestView(override val storage: ActorRef[Message])(implicit timeout: Timeout, scheduler: Scheduler)
+class LootSuggestView(override val storage: ActorRef)(implicit timeout: Timeout)
-  extends LootHelper
+  extends LootHelper(storage) with Authorization {
-  with Authorization {
 
   def route: Route = getIndex ~ suggestLoot
 
@@ -32,7 +30,7 @@ class LootSuggestView(override val storage: ActorRef[Message])(implicit timeout:
         authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
           get {
             complete {
-              val text = LootSuggestView.template(partyId, Seq.empty, None, false, None)
+              val text = LootSuggestView.template(partyId, Seq.empty, None, None)
               (StatusCodes.OK, RootView.toHtml(text))
             }
           }
@@ -45,30 +43,26 @@ class LootSuggestView(override val storage: ActorRef[Message])(implicit timeout:
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
           post {
-            formFields("piece".as[String], "job".as[String], "piece_type".as[String], "free_loot".as[String].?) {
+            formFields("piece".as[String], "job".as[String], "is_tome".as[String].?) { (piece, job, maybeTome) =>
-              (piece, job, pieceType, maybeFreeLoot) =>
+              import me.arcanis.ffxivbis.utils.Implicits._
-                import me.arcanis.ffxivbis.utils.Implicits._
+              val maybePiece = Try(Piece(piece, maybeTome, Job.withName(job))).toOption
 
-                val maybePiece = Try(Piece(piece, PieceType.withName(pieceType), Job.withName(job))).toOption
+              onComplete(suggestLootCall(partyId, maybePiece)) {
-
+                case Success(players) =>
-                onComplete(suggestLootCall(partyId, maybePiece)) {
+                  val text = LootSuggestView.template(partyId, players, maybePiece, None)
-                  case Success(players) =>
+                  complete(StatusCodes.OK, RootView.toHtml(text))
-                    val text = LootSuggestView.template(partyId, players, maybePiece, maybeFreeLoot, None)
+                case Failure(exception) =>
-                    complete(StatusCodes.OK, RootView.toHtml(text))
+                  val text = LootSuggestView.template(partyId, Seq.empty, maybePiece, Some(exception.getMessage))
-                  case Failure(exception) =>
+                  complete(StatusCodes.OK, RootView.toHtml(text))
-                    val text = LootSuggestView.template(partyId, Seq.empty, None, false, Some(exception.getMessage))
+              }
-                    complete(StatusCodes.OK, RootView.toHtml(text))
-                }
             }
           }
         }
       }
     }
 
-  private def suggestLootCall(partyId: String, maybePiece: Option[Piece])(implicit
+  private def suggestLootCall(partyId: String, maybePiece: Option[Piece])
-    executionContext: ExecutionContext,
+                             (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Seq[PlayerIdWithCounters]] =
-    timeout: Timeout
-  ): Future[Seq[PlayerIdWithCounters]] =
     maybePiece match {
       case Some(piece) => suggestPiece(partyId, piece)
       case _ => Future.failed(new Error(s"Could not construct piece from `$maybePiece`"))
@@ -79,40 +73,31 @@ object LootSuggestView {
   import scalatags.Text.all._
   import scalatags.Text.tags2.{title => titleTag}
 
-  def template(
+  def template(partyId: String, party: Seq[PlayerIdWithCounters], piece: Option[Piece], error: Option[String]): String =
-    partyId: String,
-    party: Seq[PlayerIdWithCounters],
-    piece: Option[Piece],
-    isFreeLoot: Boolean,
-    error: Option[String]
-  ): String =
     "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">" +
-      html(
+      html(lang:="en",
-        lang := "en",
         head(
           titleTag("Suggest loot"),
-          link(rel := "stylesheet", `type` := "text/css", href := "/static/styles.css")
+          link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css")
         ),
+
         body(
           h2("Suggest loot"),
-          for (part <- piece) yield p(s"Piece ${part.piece} (${part.pieceType})"),
+
           ErrorView.template(error),
           SearchLineView.template,
-          form(action := s"/party/$partyId/suggest", method := "post")(
+
-            select(name := "piece", id := "piece", title := "piece")(
+          form(action:=s"/party/$partyId/suggest", method:="post")(
-              for (piece <- Piece.available) yield option(piece)
+            select(name:="piece", id:="piece", title:="piece")
-            ),
+                  (for (piece <- Piece.available) yield option(piece)),
-            select(name := "job", id := "job", title := "job")(
+            select(name:="job", id:="job", title:="job")
-              for (job <- Job.availableWithAnyJob) yield option(job.toString)
+                  (for (job <- Job.availableWithAnyJob) yield option(job.toString)),
-            ),
+            input(name:="is_tome", id:="is_tome", title:="is tome", `type`:="checkbox"),
-            select(name := "piece_type", id := "piece_type", title := "piece type")(
+            label(`for`:="is_tome")("is tome gear"),
-              for (pieceType <- PieceType.available) yield option(pieceType.toString)
+            input(name:="suggest", id:="suggest", `type`:="submit", value:="suggest")
-            ),
-            input(name := "free_loot", id := "free_loot", title := "is free loot", `type` := "checkbox"),
-            label(`for` := "free_loot")("is free loot"),
-            input(name := "suggest", id := "suggest", `type` := "submit", value := "suggest")
           ),
-          table(id := "result")(
+
+          table(id:="result")(
             tr(
               th("player"),
               th("is required"),
@@ -121,43 +106,27 @@ object LootSuggestView {
               th("total pieces looted"),
               th("")
             ),
-            for (player <- party)
+            for (player <- party) yield tr(
-              yield tr(
+              td(`class`:="include_search")(player.playerId.toString),
-                td(`class` := "include_search")(player.playerId.toString),
+              td(player.isRequiredToString),
-                td(player.isRequiredToString),
+              td(player.lootCount),
-                td(player.lootCount),
+              td(player.lootCountBiS),
-                td(player.lootCountBiS),
+              td(player.lootCountTotal),
-                td(player.lootCountTotal),
+              td(
-                td(
+                form(action:=s"/party/$partyId/loot", method:="post")(
-                  form(action := s"/party/$partyId/loot", method := "post")(
+                  input(name:="player", id:="player", `type`:="hidden", value:=player.playerId.toString),
-                    input(name := "player", id := "player", `type` := "hidden", value := player.playerId.toString),
+                  input(name:="piece", id:="piece", `type`:="hidden", value:=piece.map(_.piece).getOrElse("")),
-                    input(
+                  input(name:="is_tome", id:="is_tome", `type`:="hidden", value:=piece.map(_.isTomeToString).getOrElse("")),
-                      name := "piece",
+                  input(name:="action", id:="action", `type`:="hidden", value:="add"),
-                      id := "piece",
+                  input(name:="add", id:="add", `type`:="submit", value:="add")
-                      `type` := "hidden",
-                      value := piece.map(_.piece).getOrElse("")
-                    ),
-                    input(
-                      name := "piece_type",
-                      id := "piece_type",
-                      `type` := "hidden",
-                      value := piece.map(_.pieceType.toString).getOrElse("")
-                    ),
-                    input(
-                      name := "free_loot",
-                      id := "free_loot",
-                      `type` := "hidden",
-                      value := (if (isFreeLoot) "yes" else "no")
-                    ),
-                    input(name := "action", id := "action", `type` := "hidden", value := "add"),
-                    input(name := "add", id := "add", `type` := "submit", value := "add")
-                  )
                 )
               )
+            )
           ),
+
           ExportToCSVView.template,
           BasePartyView.root(partyId),
-          script(src := "/static/table_search.js", `type` := "text/javascript")
+          script(src:="/static/table_search.js", `type`:="text/javascript")
         )
       )
 }

src/main/scala/me/arcanis/ffxivbis/http/view/LootView.scala

@@ -8,21 +8,19 @@
  */
 package me.arcanis.ffxivbis.http.view
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.Route
 import akka.util.Timeout
 import me.arcanis.ffxivbis.http.{Authorization, LootHelper}
-import me.arcanis.ffxivbis.messages.Message
+import me.arcanis.ffxivbis.models.{Piece, Player, PlayerId}
-import me.arcanis.ffxivbis.models.{Piece, PieceType, Player, PlayerId}
 
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.Try
 
-class LootView(override val storage: ActorRef[Message])(implicit timeout: Timeout, scheduler: Scheduler)
+class LootView (override val storage: ActorRef)(implicit timeout: Timeout)
-  extends LootHelper
+  extends LootHelper(storage) with Authorization {
-  with Authorization {
 
   def route: Route = getLoot ~ modifyLoot
 
@@ -32,13 +30,11 @@ class LootView(override val storage: ActorRef[Message])(implicit timeout: Timeou
         authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
           get {
             complete {
-              loot(partyId, None)
+              loot(partyId, None).map { players =>
-                .map { players =>
+                LootView.template(partyId, players, None)
-                  LootView.template(partyId, players, None)
+              }.map { text =>
-                }
+                (StatusCodes.OK, RootView.toHtml(text))
-                .map { text =>
+              }
-                  (StatusCodes.OK, RootView.toHtml(text))
-                }
             }
           }
         }
@@ -50,42 +46,32 @@ class LootView(override val storage: ActorRef[Message])(implicit timeout: Timeou
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
           post {
-            formFields(
+            formFields("player".as[String], "piece".as[String], "is_tome".as[String].?, "action".as[String]) {
-              "player".as[String],
+              (player, maybePiece, maybeIsTome, action) =>
-              "piece".as[String],
+                onComplete(modifyLootCall(partyId, player, maybePiece, maybeIsTome, action)) {
-              "piece_type".as[String],
+                  case _ => redirect(s"/party/$partyId/loot", StatusCodes.Found)
-              "action".as[String],
+                }
-              "free_loot".as[String].?
-            ) { (player, piece, pieceType, action, isFreeLoot) =>
-              onComplete(modifyLootCall(partyId, player, piece, pieceType, isFreeLoot, action)) { _ =>
-                redirect(s"/party/$partyId/loot", StatusCodes.Found)
-              }
             }
           }
         }
       }
     }
 
-  private def modifyLootCall(
+  private def modifyLootCall(partyId: String, player: String,
-    partyId: String,
+                             maybePiece: String, maybeIsTome: Option[String],
-    player: String,
+                             action: String)
-    maybePiece: String,
+                            (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Unit] = {
-    maybePieceType: String,
-    maybeFreeLoot: Option[String],
-    action: String
-  )(implicit executionContext: ExecutionContext, timeout: Timeout): Future[Unit] = {
     import me.arcanis.ffxivbis.utils.Implicits._
 
     def getPiece(playerId: PlayerId) =
-      Try(Piece(maybePiece, PieceType.withName(maybePieceType), playerId.job)).toOption
+      Try(Piece(maybePiece, maybeIsTome, playerId.job)).toOption
 
     PlayerId(partyId, player) match {
-      case Some(playerId) =>
+      case Some(playerId) => (getPiece(playerId), action) match {
-        (getPiece(playerId), action) match {
+        case (Some(piece), "add") => addPieceLoot(playerId, piece).map(_ => ())
-          case (Some(piece), "add") => addPieceLoot(playerId, piece, maybeFreeLoot)
+        case (Some(piece), "remove") => removePieceLoot(playerId, piece).map(_ => ())
-          case (Some(piece), "remove") => removePieceLoot(playerId, piece)
+        case _ => Future.failed(new Error(s"Could not construct piece from `$maybePiece`"))
-          case _ => Future.failed(new Error(s"Could not construct piece from `$maybePiece ($maybePieceType)`"))
+      }
-        }
       case _ => Future.failed(new Error(s"Could not construct player id from `$player`"))
     }
   }
@@ -97,67 +83,55 @@ object LootView {
 
   def template(partyId: String, party: Seq[Player], error: Option[String]): String =
     "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">" +
-      html(
+      html(lang:="en",
-        lang := "en",
         head(
           titleTag("Loot"),
-          link(rel := "stylesheet", `type` := "text/css", href := "/static/styles.css")
+          link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css")
         ),
+
         body(
           h2("Loot"),
+
           ErrorView.template(error),
           SearchLineView.template,
-          form(action := s"/party/$partyId/loot", method := "post")(
+
-            select(name := "player", id := "player", title := "player")(
+          form(action:=s"/party/$partyId/loot", method:="post")(
-              for (player <- party) yield option(player.playerId.toString)
+            select(name:="player", id:="player", title:="player")
-            ),
+                  (for (player <- party) yield option(player.playerId.toString)),
-            select(name := "piece", id := "piece", title := "piece")(
+            select(name:="piece", id:="piece", title:="piece")
-              for (piece <- Piece.available) yield option(piece)
+                  (for (piece <- Piece.available) yield option(piece)),
-            ),
+            input(name:="is_tome", id:="is_tome", title:="is tome", `type`:="checkbox"),
-            select(name := "piece_type", id := "piece_type", title := "piece type")(
+            label(`for`:="is_tome")("is tome gear"),
-              for (pieceType <- PieceType.available) yield option(pieceType.toString)
+            input(name:="action", id:="action", `type`:="hidden", value:="add"),
-            ),
+            input(name:="add", id:="add", `type`:="submit", value:="add")
-            input(name := "free_loot", id := "free_loot", title := "is free loot", `type` := "checkbox"),
-            label(`for` := "free_loot")("is free loot"),
-            input(name := "action", id := "action", `type` := "hidden", value := "add"),
-            input(name := "add", id := "add", `type` := "submit", value := "add")
           ),
-          table(id := "result")(
+
+          table(id:="result")(
             tr(
               th("player"),
               th("piece"),
-              th("piece type"),
+              th("is tome"),
-              th("is free loot"),
-              th("timestamp"),
               th("")
             ),
-            for (player <- party; loot <- player.loot)
+            for (player <- party; piece <- player.loot) yield tr(
-              yield tr(
+              td(`class`:="include_search")(player.playerId.toString),
-                td(`class` := "include_search")(player.playerId.toString),
+              td(`class`:="include_search")(piece.piece),
-                td(`class` := "include_search")(loot.piece.piece),
+              td(piece.isTomeToString),
-                td(loot.piece.pieceType.toString),
+              td(
-                td(loot.isFreeLootToString),
+                form(action:=s"/party/$partyId/loot", method:="post")(
-                td(loot.timestamp.toString),
+                  input(name:="player", id:="player", `type`:="hidden", value:=player.playerId.toString),
-                td(
+                  input(name:="piece", id:="piece", `type`:="hidden", value:=piece.piece),
-                  form(action := s"/party/$partyId/loot", method := "post")(
+                  input(name:="is_tome", id:="is_tome", `type`:="hidden", value:=piece.isTomeToString),
-                    input(name := "player", id := "player", `type` := "hidden", value := player.playerId.toString),
+                  input(name:="action", id:="action", `type`:="hidden", value:="remove"),
-                    input(name := "piece", id := "piece", `type` := "hidden", value := loot.piece.piece),
+                  input(name:="remove", id:="remove", `type`:="submit", value:="x")
-                    input(
-                      name := "piece_type",
-                      id := "piece_type",
-                      `type` := "hidden",
-                      value := loot.piece.pieceType.toString
-                    ),
-                    input(name := "free_loot", id := "free_loot", `type` := "hidden", value := loot.isFreeLootToString),
-                    input(name := "action", id := "action", `type` := "hidden", value := "remove"),
-                    input(name := "remove", id := "remove", `type` := "submit", value := "x")
-                  )
                 )
               )
+            )
           ),
+
           ExportToCSVView.template,
           BasePartyView.root(partyId),
-          script(src := "/static/table_search.js", `type` := "text/javascript")
+          script(src:="/static/table_search.js", `type`:="text/javascript")
         )
       )
 

src/main/scala/me/arcanis/ffxivbis/http/view/PlayerView.scala

@@ -8,22 +8,18 @@
  */
 package me.arcanis.ffxivbis.http.view
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.Route
 import akka.util.Timeout
 import me.arcanis.ffxivbis.http.{Authorization, PlayerHelper}
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, Message}
 import me.arcanis.ffxivbis.models._
 
 import scala.concurrent.{ExecutionContext, Future}
 
-class PlayerView(override val storage: ActorRef[Message], override val provider: ActorRef[BiSProviderMessage])(implicit
+class PlayerView(override val storage: ActorRef, ariyala: ActorRef)(implicit timeout: Timeout)
-  timeout: Timeout,
+  extends PlayerHelper(storage, ariyala) with Authorization {
-  scheduler: Scheduler
-) extends PlayerHelper
-  with Authorization {
 
   def route: Route = getParty ~ modifyParty
 
@@ -33,13 +29,11 @@ class PlayerView(override val storage: ActorRef[Message], override val provider:
         authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
           get {
             complete {
-              getPlayers(partyId, None)
+              getPlayers(partyId, None).map { players =>
-                .map { players =>
+                PlayerView.template(partyId, players.map(_.withCounters(None)), None)
-                  PlayerView.template(partyId, players.map(_.withCounters(None)), None)
+              }.map { text =>
-                }
+                (StatusCodes.OK, RootView.toHtml(text))
-                .map { text =>
+              }
-                  (StatusCodes.OK, RootView.toHtml(text))
-                }
             }
           }
         }
@@ -51,37 +45,28 @@ class PlayerView(override val storage: ActorRef[Message], override val provider:
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
           post {
-            formFields(
+            formFields("nick".as[String], "job".as[String], "priority".as[Int].?, "link".as[String].?, "action".as[String]) {
-              "nick".as[String],
+              (nick, job, maybePriority, maybeLink, action) =>
-              "job".as[String],
+                onComplete(modifyPartyCall(partyId, nick, job, maybePriority, maybeLink, action)) {
-              "priority".as[Int].?,
+                  case _ => redirect(s"/party/$partyId/players", StatusCodes.Found)
-              "link".as[String].?,
+                }
-              "action".as[String]
-            ) { (nick, job, maybePriority, maybeLink, action) =>
-              onComplete(modifyPartyCall(partyId, nick, job, maybePriority, maybeLink, action)) { _ =>
-                redirect(s"/party/$partyId/players", StatusCodes.Found)
-              }
             }
           }
         }
       }
     }
 
-  private def modifyPartyCall(
+  private def modifyPartyCall(partyId: String, nick: String, job: String,
-    partyId: String,
+                              maybePriority: Option[Int], maybeLink: Option[String],
-    nick: String,
+                              action: String)
-    job: String,
+                             (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Unit] = {
-    maybePriority: Option[Int],
-    maybeLink: Option[String],
-    action: String
-  )(implicit executionContext: ExecutionContext, timeout: Timeout): Future[Unit] = {
     def maybePlayerId = PlayerId(partyId, Some(nick), Some(job))
     def player(playerId: PlayerId) =
-      Player(-1, partyId, playerId.job, playerId.nick, BiS.empty, Seq.empty, maybeLink, maybePriority.getOrElse(0))
+      Player(partyId, playerId.job, playerId.nick, BiS(), Seq.empty, maybeLink, maybePriority.getOrElse(0))
 
     (action, maybePlayerId) match {
-      case ("add", Some(playerId)) => addPlayer(player(playerId))
+      case ("add", Some(playerId)) => addPlayer(player(playerId)).map(_ => ())
-      case ("remove", Some(playerId)) => removePlayer(playerId)
+      case ("remove", Some(playerId)) => removePlayer(playerId).map(_ => ())
       case _ => Future.failed(new Error(s"Could not perform $action with $nick ($job)"))
     }
   }
@@ -93,32 +78,29 @@ object PlayerView {
 
   def template(partyId: String, party: Seq[PlayerIdWithCounters], error: Option[String]): String =
     "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">" +
-      html(
+      html(lang:="en",
-        lang := "en",
         head(
           titleTag("Party"),
-          link(rel := "stylesheet", `type` := "text/css", href := "/static/styles.css")
+          link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css")
         ),
+
         body(
           h2("Party"),
+
           ErrorView.template(error),
           SearchLineView.template,
-          form(action := s"/party/$partyId/players", method := "post")(
+
-            input(name := "nick", id := "nick", placeholder := "nick", title := "nick", `type` := "nick"),
+          form(action:=s"/party/$partyId/players", method:="post")(
-            select(name := "job", id := "job", title := "job")(for (job <- Job.available) yield option(job.toString)),
+            input(name:="nick", id:="nick", placeholder:="nick", title:="nick", `type`:="nick"),
-            input(name := "link", id := "link", placeholder := "player bis link", title := "link", `type` := "text"),
+            select(name:="job", id:="job", title:="job")
-            input(
+                  (for (job <- Job.available) yield option(job.toString)),
-              name := "prioiry",
+            input(name:="link", id:="link", placeholder:="player bis link", title:="link", `type`:="text"),
-              id := "priority",
+            input(name:="prioiry", id:="priority", placeholder:="priority", title:="priority", `type`:="number", value:="0"),
-              placeholder := "priority",
+            input(name:="action", id:="action", `type`:="hidden", value:="add"),
-              title := "priority",
+            input(name:="add", id:="add", `type`:="submit", value:="add")
-              `type` := "number",
-              value := "0"
-            ),
-            input(name := "action", id := "action", `type` := "hidden", value := "add"),
-            input(name := "add", id := "add", `type` := "submit", value := "add")
           ),
-          table(id := "result")(
+
+          table(id:="result")(
             tr(
               th("nick"),
               th("job"),
@@ -127,26 +109,26 @@ object PlayerView {
               th("priority"),
               th("")
             ),
-            for (player <- party)
+            for (player <- party) yield tr(
-              yield tr(
+              td(`class`:="include_search")(player.nick),
-                td(`class` := "include_search")(player.nick),
+              td(`class`:="include_search")(player.job.toString),
-                td(`class` := "include_search")(player.job.toString),
+              td(player.lootCountBiS),
-                td(player.lootCountBiS),
+              td(player.lootCountTotal),
-                td(player.lootCountTotal),
+              td(player.priority),
-                td(player.priority),
+              td(
-                td(
+                form(action:=s"/party/$partyId/players", method:="post")(
-                  form(action := s"/party/$partyId/players", method := "post")(
+                  input(name:="nick", id:="nick", `type`:="hidden", value:=player.nick),
-                    input(name := "nick", id := "nick", `type` := "hidden", value := player.nick),
+                  input(name:="job", id:="job", `type`:="hidden", value:=player.job.toString),
-                    input(name := "job", id := "job", `type` := "hidden", value := player.job.toString),
+                  input(name:="action", id:="action", `type`:="hidden", value:="remove"),
-                    input(name := "action", id := "action", `type` := "hidden", value := "remove"),
+                  input(name:="remove", id:="remove", `type`:="submit", value:="x")
-                    input(name := "remove", id := "remove", `type` := "submit", value := "x")
-                  )
                 )
               )
+            )
           ),
+
           ExportToCSVView.template,
           BasePartyView.root(partyId),
-          script(src := "/static/table_search.js", `type` := "text/javascript")
+          script(src:="/static/table_search.js", `type`:="text/javascript")
         )
       )
 }

src/main/scala/me/arcanis/ffxivbis/http/view/RootView.scala

@@ -8,34 +8,29 @@
  */
 package me.arcanis.ffxivbis.http.view
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
 import akka.http.scaladsl.model.{ContentTypes, HttpEntity}
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.Route
 import akka.util.Timeout
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, Message}
 
-class RootView(storage: ActorRef[Message], provider: ActorRef[BiSProviderMessage])(implicit
+class RootView(storage: ActorRef, ariyala: ActorRef)(implicit timeout: Timeout) {
-  timeout: Timeout,
-  scheduler: Scheduler
-) {
 
-  private val basePartyView = new BasePartyView(storage, provider)
+  private val basePartyView = new BasePartyView(storage)
-  private val indexView = new IndexView(storage, provider)
+  private val indexView = new IndexView(storage)
 
-  private val biSView = new BiSView(storage, provider)
+  private val biSView = new BiSView(storage, ariyala)
   private val lootView = new LootView(storage)
   private val lootSuggestView = new LootSuggestView(storage)
-  private val playerView = new PlayerView(storage, provider)
+  private val playerView = new PlayerView(storage, ariyala)
   private val userView = new UserView(storage)
 
   def route: Route =
     basePartyView.route ~ indexView.route ~
-      biSView.route ~ lootView.route ~ lootSuggestView.route ~ playerView.route ~ userView.route
+    biSView.route ~ lootView.route ~ lootSuggestView.route ~ playerView.route ~ userView.route
 }
 
 object RootView {
-
   def toHtml(template: String): HttpEntity.Strict =
     HttpEntity(ContentTypes.`text/html(UTF-8)`, template)
 }

src/main/scala/me/arcanis/ffxivbis/http/view/SearchLineView.scala

@@ -12,15 +12,11 @@ import scalatags.Text
 import scalatags.Text.all._
 
 object SearchLineView {
-
   def template: Text.TypedTag[String] =
     div(
       input(
-        `type` := "text",
+        `type`:="text", id:="search", onkeyup:="searchTable()",
-        id := "search",
+        placeholder:="search for data", title:="search"
-        onkeyup := "searchTable()",
-        placeholder := "search for data",
-        title := "search"
       )
     )
 }

src/main/scala/me/arcanis/ffxivbis/http/view/UserView.scala

@@ -8,21 +8,19 @@
  */
 package me.arcanis.ffxivbis.http.view
 
-import akka.actor.typed.{ActorRef, Scheduler}
+import akka.actor.ActorRef
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.Route
 import akka.util.Timeout
 import me.arcanis.ffxivbis.http.{Authorization, UserHelper}
-import me.arcanis.ffxivbis.messages.Message
 import me.arcanis.ffxivbis.models.{Permission, User}
 
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.Try
 
-class UserView(override val storage: ActorRef[Message])(implicit timeout: Timeout, scheduler: Scheduler)
+class UserView(override val storage: ActorRef)(implicit timeout: Timeout)
-  extends UserHelper
+  extends UserHelper(storage) with Authorization {
-  with Authorization {
 
   def route: Route = getUsers ~ modifyUsers
 
@@ -32,13 +30,11 @@ class UserView(override val storage: ActorRef[Message])(implicit timeout: Timeou
         authenticateBasicBCrypt(s"party $partyId", authAdmin(partyId)) { _ =>
           get {
             complete {
-              users(partyId)
+              users(partyId).map { users =>
-                .map { users =>
+                UserView.template(partyId, users, None)
-                  UserView.template(partyId, users, None)
+              }.map { text =>
-                }
+                (StatusCodes.OK, RootView.toHtml(text))
-                .map { text =>
+              }
-                  (StatusCodes.OK, RootView.toHtml(text))
-                }
             }
           }
         }
@@ -52,8 +48,8 @@ class UserView(override val storage: ActorRef[Message])(implicit timeout: Timeou
           post {
             formFields("username".as[String], "password".as[String].?, "permission".as[String].?, "action".as[String]) {
               (username, maybePassword, maybePermission, action) =>
-                onComplete(modifyUsersCall(partyId, username, maybePassword, maybePermission, action)) { case _ =>
+                onComplete(modifyUsersCall(partyId, username, maybePassword, maybePermission, action)) {
-                  redirect(s"/party/$partyId/users", StatusCodes.Found)
+                  case _ => redirect(s"/party/$partyId/users", StatusCodes.Found)
                 }
             }
           }
@@ -61,27 +57,19 @@ class UserView(override val storage: ActorRef[Message])(implicit timeout: Timeou
       }
     }
 
-  private def modifyUsersCall(
+  private def modifyUsersCall(partyId: String, username: String,
-    partyId: String,
+                              maybePassword: Option[String], maybePermission: Option[String],
-    username: String,
+                              action: String)
-    maybePassword: Option[String],
+                             (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Unit] = {
-    maybePermission: Option[String],
-    action: String
-  )(implicit executionContext: ExecutionContext, timeout: Timeout): Future[Unit] = {
     def permission: Option[Permission.Value] =
       maybePermission.flatMap(p => Try(Permission.withName(p)).toOption)
 
     action match {
-      case "add" =>
+      case "add" => (maybePassword, permission) match {
-        (maybePassword, permission) match {
+        case (Some(password), Some(permission)) => addUser(User(partyId, username, password, permission), isHashedPassword = false).map(_ => ())
-          case (Some(password), Some(permission)) =>
+        case _ => Future.failed(new Error(s"Could not construct permission/password from `$maybePermission`/`$maybePassword`"))
-            addUser(User(partyId, username, password, permission), isHashedPassword = false)
+      }
-          case _ =>
+      case "remove" => removeUser(partyId, username).map(_ => ())
-            Future.failed(
-              new Error(s"Could not construct permission/password from `$maybePermission`/`$maybePassword`")
-            )
-        }
-      case "remove" => removeUser(partyId, username)
       case _ => Future.failed(new Error(s"Could not perform $action"))
     }
   }
@@ -93,57 +81,48 @@ object UserView {
 
   def template(partyId: String, users: Seq[User], error: Option[String]) =
     "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">" +
-      html(
+      html(lang:="en",
-        lang := "en",
         head(
           titleTag("Users"),
-          link(rel := "stylesheet", `type` := "text/css", href := "/static/styles.css")
+          link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css")
         ),
+
         body(
           h2("Users"),
+
           ErrorView.template(error),
           SearchLineView.template,
-          form(action := s"/party/$partyId/users", method := "post")(
+
-            input(
+          form(action:=s"/party/$partyId/users", method:="post")(
-              name := "username",
+            input(name:="username", id:="username", placeholder:="username", title:="username", `type`:="text"),
-              id := "username",
+            input(name:="password", id:="password", placeholder:="password", title:="password", `type`:="password"),
-              placeholder := "username",
+            select(name:="permission", id:="permission", title:="permission")(option("get"), option("post")),
-              title := "username",
+            input(name:="action", id:="action", `type`:="hidden", value:="add"),
-              `type` := "text"
+            input(name:="add", id:="add", `type`:="submit", value:="add")
-            ),
-            input(
-              name := "password",
-              id := "password",
-              placeholder := "password",
-              title := "password",
-              `type` := "password"
-            ),
-            select(name := "permission", id := "permission", title := "permission")(option("get"), option("post")),
-            input(name := "action", id := "action", `type` := "hidden", value := "add"),
-            input(name := "add", id := "add", `type` := "submit", value := "add")
           ),
-          table(id := "result")(
+
+          table(id:="result")(
             tr(
               th("username"),
               th("permission"),
               th("")
             ),
-            for (user <- users)
+            for (user <- users) yield tr(
-              yield tr(
+              td(`class`:="include_search")(user.username),
-                td(`class` := "include_search")(user.username),
+              td(user.permission.toString),
-                td(user.permission.toString),
+              td(
-                td(
+                form(action:=s"/party/$partyId/users", method:="post")(
-                  form(action := s"/party/$partyId/users", method := "post")(
+                  input(name:="username", id:="username", `type`:="hidden", value:=user.username.toString),
-                    input(name := "username", id := "username", `type` := "hidden", value := user.username.toString),
+                  input(name:="action", id:="action", `type`:="hidden", value:="remove"),
-                    input(name := "action", id := "action", `type` := "hidden", value := "remove"),
+                  input(name:="remove", id:="remove", `type`:="submit", value:="x")
-                    input(name := "remove", id := "remove", `type` := "submit", value := "x")
-                  )
                 )
               )
+            )
           ),
+
           ExportToCSVView.template,
           BasePartyView.root(partyId),
-          script(src := "/static/table_search.js", `type` := "text/javascript")
+          script(src:="/static/table_search.js", `type`:="text/javascript")
         )
       )
 }

src/main/scala/me/arcanis/ffxivbis/messages/BiSProviderMessage.scala

@@ -1,11 +0,0 @@
-package me.arcanis.ffxivbis.messages
-
-import akka.actor.typed.ActorRef
-import me.arcanis.ffxivbis.models.{BiS, Job}
-
-sealed trait BiSProviderMessage
-
-case class DownloadBiS(link: String, job: Job.Job, replyTo: ActorRef[BiS]) extends BiSProviderMessage {
-
-  require(link.nonEmpty && link.trim == link, "Link must be not empty and contain no spaces")
-}

src/main/scala/me/arcanis/ffxivbis/messages/ContolMessage.scala

@@ -1,10 +0,0 @@
-package me.arcanis.ffxivbis.messages
-
-import akka.actor.typed.ActorRef
-import me.arcanis.ffxivbis.models.Party
-
-case class ForgetParty(partyId: String) extends Message
-
-case class GetNewPartyId(replyTo: ActorRef[String]) extends Message
-
-case class StoreParty(partyId: String, party: Party) extends Message

src/main/scala/me/arcanis/ffxivbis/messages/DatabaseMessage.scala

@@ -1,79 +0,0 @@
-package me.arcanis.ffxivbis.messages
-
-import akka.actor.typed.{ActorRef, Behavior}
-import me.arcanis.ffxivbis.models.{Party, PartyDescription, Piece, Player, PlayerId, User}
-import me.arcanis.ffxivbis.service.LootSelector
-
-sealed trait DatabaseMessage extends Message {
-
-  def partyId: String
-}
-
-object DatabaseMessage {
-
-  type Handler = PartialFunction[DatabaseMessage, Behavior[DatabaseMessage]]
-}
-
-// bis handler
-case class AddPieceToBis(playerId: PlayerId, piece: Piece, replyTo: ActorRef[Unit]) extends DatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-case class GetBiS(partyId: String, playerId: Option[PlayerId], replyTo: ActorRef[Seq[Player]]) extends DatabaseMessage
-
-case class RemovePieceFromBiS(playerId: PlayerId, piece: Piece, replyTo: ActorRef[Unit]) extends DatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-case class RemovePiecesFromBiS(playerId: PlayerId, replyTo: ActorRef[Unit]) extends DatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-// loot handler
-case class AddPieceTo(playerId: PlayerId, piece: Piece, isFreeLoot: Boolean, replyTo: ActorRef[Unit])
-  extends DatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-case class GetLoot(partyId: String, playerId: Option[PlayerId], replyTo: ActorRef[Seq[Player]]) extends DatabaseMessage
-
-case class RemovePieceFrom(playerId: PlayerId, piece: Piece, replyTo: ActorRef[Unit]) extends DatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-case class SuggestLoot(partyId: String, piece: Piece, replyTo: ActorRef[LootSelector.LootSelectorResult])
-  extends DatabaseMessage
-
-// party handler
-case class AddPlayer(player: Player, replyTo: ActorRef[Unit]) extends DatabaseMessage {
-  override def partyId: String = player.partyId
-}
-
-case class GetParty(partyId: String, replyTo: ActorRef[Party]) extends DatabaseMessage
-
-case class GetPartyDescription(partyId: String, replyTo: ActorRef[PartyDescription]) extends DatabaseMessage
-
-case class GetPlayer(playerId: PlayerId, replyTo: ActorRef[Option[Player]]) extends DatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-case class RemovePlayer(playerId: PlayerId, replyTo: ActorRef[Unit]) extends DatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-case class UpdateParty(partyDescription: PartyDescription, replyTo: ActorRef[Unit]) extends DatabaseMessage {
-  override def partyId: String = partyDescription.partyId
-}
-
-// user handler
-case class AddUser(user: User, isHashedPassword: Boolean, replyTo: ActorRef[Unit]) extends DatabaseMessage {
-  override def partyId: String = user.partyId
-}
-
-case class DeleteUser(partyId: String, username: String, replyTo: ActorRef[Unit]) extends DatabaseMessage
-
-case class Exists(partyId: String, replyTo: ActorRef[Boolean]) extends DatabaseMessage
-
-case class GetUser(partyId: String, username: String, replyTo: ActorRef[Option[User]]) extends DatabaseMessage
-
-case class GetUsers(partyId: String, replyTo: ActorRef[Seq[User]]) extends DatabaseMessage

src/main/scala/me/arcanis/ffxivbis/messages/Message.scala

@@ -1,9 +0,0 @@
-package me.arcanis.ffxivbis.messages
-
-import akka.actor.typed.Behavior
-
-trait Message
-
-object Message {
-  type Handler = PartialFunction[Message, Behavior[Message]]
-}

src/main/scala/me/arcanis/ffxivbis/models/BiS.scala

@@ -8,7 +8,21 @@
  */
 package me.arcanis.ffxivbis.models
 
-case class BiS(pieces: Seq[Piece]) {
+case class BiS(weapon: Option[Piece],
+               head: Option[Piece],
+               body: Option[Piece],
+               hands: Option[Piece],
+               waist: Option[Piece],
+               legs: Option[Piece],
+               feet: Option[Piece],
+               ears: Option[Piece],
+               neck: Option[Piece],
+               wrist: Option[Piece],
+               leftRing: Option[Piece],
+               rightRing: Option[Piece]) {
+
+  val pieces: Seq[Piece] =
+    Seq(weapon, head, body, hands, waist, legs, feet, ears, neck, wrist, leftRing, rightRing).flatten
 
   def hasPiece(piece: Piece): Boolean = piece match {
     case upgrade: PieceUpgrade => upgrades.contains(upgrade)
@@ -16,31 +30,51 @@ case class BiS(pieces: Seq[Piece]) {
   }
 
   def upgrades: Map[PieceUpgrade, Int] =
-    pieces
+    pieces.groupBy(_.upgrade).foldLeft(Map.empty[PieceUpgrade, Int]) {
-      .groupBy(_.upgrade)
+      case (acc, (Some(k), v)) => acc + (k -> v.length)
-      .foldLeft(Map.empty[PieceUpgrade, Int]) {
+      case (acc, _) => acc
-        case (acc, (Some(k), v)) => acc + (k -> v.size)
+    } withDefaultValue 0
-        case (acc, _) => acc
-      }
-      .withDefaultValue(0)
 
-  def withPiece(piece: Piece): BiS = copy(pieces :+ piece)
+  def withPiece(piece: Piece): BiS = copyWithPiece(piece.piece, Some(piece))
-  def withoutPiece(piece: Piece): BiS = copy(pieces.filterNot(_.strictEqual(piece)))
+  def withoutPiece(piece: Piece): BiS = copyWithPiece(piece.piece, None)
 
-  override def equals(obj: Any): Boolean = {
+  private def copyWithPiece(name: String, piece: Option[Piece]): BiS = {
-    def comparePieces(left: Seq[Piece], right: Seq[Piece]): Boolean =
+    val params = Map(
-      left.groupBy(identity).view.mapValues(_.size).forall { case (key, count) =>
+      "weapon" -> weapon,
-        right.count(_.strictEqual(key)) == count
+      "head" -> head,
-      }
+      "body" -> body,
-
+      "hands" -> hands,
-    obj match {
+      "waist" -> waist,
-      case left: BiS => comparePieces(left.pieces, pieces)
+      "legs" -> legs,
-      case _ => false
+      "feet" -> feet,
-    }
+      "ears" -> ears,
+      "neck" -> neck,
+      "wrist" -> wrist,
+      "left ring" -> leftRing,
+      "right ring" -> rightRing
+    ) + (name -> piece)
+    BiS(params)
   }
 }
 
 object BiS {
+  def apply(data: Map[String, Option[Piece]]): BiS =
+    BiS(
+      data.get("weapon").flatten,
+      data.get("head").flatten,
+      data.get("body").flatten,
+      data.get("hands").flatten,
+      data.get("waist").flatten,
+      data.get("legs").flatten,
+      data.get("feet").flatten,
+      data.get("ears").flatten,
+      data.get("neck").flatten,
+      data.get("wrist").flatten,
+      data.get("left ring").flatten,
+      data.get("right ring").flatten)
 
-  def empty: BiS = BiS(Seq.empty)
+  def apply(): BiS = BiS(Seq.empty)
+
+  def apply(pieces: Seq[Piece]): BiS =
+    BiS(pieces.map(piece => piece.piece -> Some(piece)).toMap)
 }

src/main/scala/me/arcanis/ffxivbis/models/Job.scala

@@ -9,7 +9,6 @@
 package me.arcanis.ffxivbis.models
 
 object Job {
-
   sealed trait RightSide
   object AccessoriesDex extends RightSide
   object AccessoriesInt extends RightSide
@@ -26,15 +25,13 @@ object Job {
   object BodyTanks extends LeftSide
   object BodyRanges extends LeftSide
 
-  sealed trait Job extends Equals {
+  sealed trait Job {
-
     def leftSide: LeftSide
     def rightSide: RightSide
 
     // conversion to string to avoid recursion
-    override def canEqual(that: Any): Boolean = that.isInstanceOf[Job]
-
     override def equals(obj: Any): Boolean = {
+      def canEqual(obj: Any): Boolean = obj.isInstanceOf[Job]
       def equality(objRepr: String): Boolean = objRepr match {
         case _ if objRepr == AnyJob.toString => true
         case _ if this.toString == AnyJob.toString => true
@@ -62,10 +59,6 @@ object Job {
     val leftSide: LeftSide = BodyMnks
     val rightSide: RightSide = AccessoriesStr
   }
-  trait Drgs extends Job {
-    val leftSide: LeftSide = BodyDrgs
-    val rightSide: RightSide = AccessoriesStr
-  }
   trait Tanks extends Job {
     val leftSide: LeftSide = BodyTanks
     val rightSide: RightSide = AccessoriesVit
@@ -83,11 +76,12 @@ object Job {
   case object WHM extends Healers
   case object SCH extends Healers
   case object AST extends Healers
-  case object SGE extends Healers
 
   case object MNK extends Mnks
-  case object DRG extends Drgs
+  case object DRG extends Job {
-  case object RPR extends Drgs
+    val leftSide: LeftSide = BodyDrgs
+    val rightSide: RightSide = AccessoriesStr
+  }
   case object NIN extends Job {
     val leftSide: LeftSide = BodyNins
     val rightSide: RightSide = AccessoriesDex
@@ -103,13 +97,13 @@ object Job {
   case object RDM extends Casters
 
   lazy val available: Seq[Job] =
-    Seq(PLD, WAR, DRK, GNB, WHM, SCH, AST, SGE, MNK, DRG, RPR, NIN, SAM, BRD, MCH, DNC, BLM, SMN, RDM)
+    Seq(PLD, WAR, DRK, GNB, WHM, SCH, AST, MNK, DRG, NIN, SAM, BRD, MCH, DNC, BLM, SMN, RDM)
   lazy val availableWithAnyJob: Seq[Job] = available.prepended(AnyJob)
 
   def withName(job: String): Job.Job =
-    availableWithAnyJob.find(_.toString.equalsIgnoreCase(job)) match {
+    availableWithAnyJob.find(_.toString.equalsIgnoreCase(job.toUpperCase)) match {
       case Some(value) => value
       case None if job.isEmpty => AnyJob
-      case _ => throw new IllegalArgumentException(s"Invalid or unknown job $job")
+      case _ => throw new IllegalArgumentException("Invalid or unknown job")
     }
 }

src/main/scala/me/arcanis/ffxivbis/models/Loot.scala

@@ -8,9 +8,4 @@
  */
 package me.arcanis.ffxivbis.models
 
-import java.time.Instant
+case class Loot(playerId: Long, piece: Piece)
-
-case class Loot(playerId: Long, piece: Piece, timestamp: Instant, isFreeLoot: Boolean) {
-
-  def isFreeLootToString: String = if (isFreeLoot) "yes" else "no"
-}

src/main/scala/me/arcanis/ffxivbis/models/Party.scala

@@ -15,15 +15,15 @@ import me.arcanis.ffxivbis.service.LootSelector
 import scala.jdk.CollectionConverters._
 import scala.util.Random
 
-case class Party(partyDescription: PartyDescription, rules: Seq[String], players: Map[PlayerId, Player])
+case class Party(partyId: String, rules: Seq[String], players: Map[PlayerId, Player])
   extends StrictLogging {
-  require(players.keys.forall(_.partyId == partyDescription.partyId), "party id must be same")
+  require(players.keys.forall(_.partyId == partyId), "party id must be same")
 
   def getPlayers: Seq[Player] = players.values.toSeq
   def player(playerId: PlayerId): Option[Player] = players.get(playerId)
   def withPlayer(player: Player): Party =
     try {
-      require(player.partyId == partyDescription.partyId, "player must belong to this party")
+      require(player.partyId == partyId, "player must belong to this party")
       copy(players = players + (player.playerId -> player))
     } catch {
       case exception: Exception =>
@@ -36,22 +36,20 @@ case class Party(partyDescription: PartyDescription, rules: Seq[String], players
 }
 
 object Party {
+  def apply(partyId: Option[String], config: Config): Party =
+    new Party(partyId.getOrElse(randomPartyId), getRules(config), Map.empty)
 
-  def apply(
+  def apply(partyId: String, config: Config,
-    party: PartyDescription,
+            players: Map[Long, Player], bis: Seq[Loot], loot: Seq[Loot]): Party = {
-    config: Config,
-    players: Map[Long, Player],
-    bis: Seq[Loot],
-    loot: Seq[Loot]
-  ): Party = {
     val bisByPlayer = bis.groupBy(_.playerId).view.mapValues(piece => BiS(piece.map(_.piece)))
-    val lootByPlayer = loot.groupBy(_.playerId).view
+    val lootByPlayer = loot.groupBy(_.playerId).view.mapValues(_.map(_.piece))
-    val playersWithItems = players.foldLeft(Map.empty[PlayerId, Player]) { case (acc, (playerId, player)) =>
+    val playersWithItems = players.foldLeft(Map.empty[PlayerId, Player]) {
-      acc + (player.playerId -> player
+      case (acc, (playerId, player)) =>
-        .withBiS(bisByPlayer.get(playerId))
+        acc + (player.playerId -> player
-        .withLoot(lootByPlayer.getOrElse(playerId, Seq.empty)))
+          .withBiS(bisByPlayer.get(playerId))
+          .withLoot(lootByPlayer.getOrElse(playerId, Seq.empty)))
     }
-    Party(party, getRules(config), playersWithItems)
+    Party(partyId, getRules(config), playersWithItems)
   }
 
   def getRules(config: Config): Seq[String] =

src/main/scala/me/arcanis/ffxivbis/models/PartyDescription.scala

@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2020 Evgeniy Alekseev.
- *
- * This file is part of ffxivbis
- * (see https://github.com/arcan1s/ffxivbis).
- *
- * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
- */
-package me.arcanis.ffxivbis.models
-
-case class PartyDescription(partyId: String, partyAlias: Option[String]) {
-
-  def alias: String = partyAlias.getOrElse(partyId)
-}
-
-object PartyDescription {
-
-  def empty(partyId: String): PartyDescription = PartyDescription(partyId, None)
-}

src/main/scala/me/arcanis/ffxivbis/models/Piece.scala

@@ -8,88 +8,79 @@
  */
 package me.arcanis.ffxivbis.models
 
-sealed trait Piece extends Equals {
+sealed trait Piece {
-
+  def isTome: Boolean
-  def pieceType: PieceType.PieceType
   def job: Job.Job
   def piece: String
 
   def withJob(other: Job.Job): Piece
 
-  def upgrade: Option[PieceUpgrade] = {
+  def isTomeToString: String = if (isTome) "yes" else "no"
-    val isTome = pieceType == PieceType.Tome
+  def upgrade: Option[PieceUpgrade] = this match {
-    Some(this).collect {
+    case _ if !isTome => None
-      case _: PieceAccessory if isTome => AccessoryUpgrade
+    case _: Waist => Some(AccessoryUpgrade)
-      case _: PieceBody if isTome => BodyUpgrade
+    case _: PieceAccessory => Some(AccessoryUpgrade)
-      case _: PieceWeapon if isTome => WeaponUpgrade
+    case _: PieceBody => Some(BodyUpgrade)
-    }
+    case _: PieceWeapon => Some(WeaponUpgrade)
   }
-
-  // used for ring comparison
-  def strictEqual(obj: Any): Boolean = equals(obj)
 }
 
 trait PieceAccessory extends Piece
 trait PieceBody extends Piece
 trait PieceUpgrade extends Piece {
-  val pieceType: PieceType.PieceType = PieceType.Tome
+  val isTome: Boolean = true
   val job: Job.Job = Job.AnyJob
   def withJob(other: Job.Job): Piece = this
 }
 trait PieceWeapon extends Piece
 
-case class Weapon(override val pieceType: PieceType.PieceType, override val job: Job.Job) extends PieceWeapon {
+case class Weapon(override val isTome: Boolean, override val job: Job.Job) extends PieceWeapon {
   val piece: String = "weapon"
   def withJob(other: Job.Job): Piece = copy(job = other)
 }
 
-case class Head(override val pieceType: PieceType.PieceType, override val job: Job.Job) extends PieceBody {
+case class Head(override val isTome: Boolean, override val job: Job.Job) extends PieceBody {
   val piece: String = "head"
   def withJob(other: Job.Job): Piece = copy(job = other)
 }
-case class Body(override val pieceType: PieceType.PieceType, override val job: Job.Job) extends PieceBody {
+case class Body(override val isTome: Boolean, override val job: Job.Job) extends PieceBody {
   val piece: String = "body"
   def withJob(other: Job.Job): Piece = copy(job = other)
 }
-case class Hands(override val pieceType: PieceType.PieceType, override val job: Job.Job) extends PieceBody {
+case class Hands(override val isTome: Boolean, override val job: Job.Job) extends PieceBody {
   val piece: String = "hands"
   def withJob(other: Job.Job): Piece = copy(job = other)
 }
-case class Legs(override val pieceType: PieceType.PieceType, override val job: Job.Job) extends PieceBody {
+case class Waist(override val isTome: Boolean, override val job: Job.Job) extends PieceBody {
+  val piece: String = "waist"
+  def withJob(other: Job.Job): Piece = copy(job = other)
+}
+case class Legs(override val isTome: Boolean, override val job: Job.Job) extends PieceBody {
   val piece: String = "legs"
   def withJob(other: Job.Job): Piece = copy(job = other)
 }
-case class Feet(override val pieceType: PieceType.PieceType, override val job: Job.Job) extends PieceBody {
+case class Feet(override val isTome: Boolean, override val job: Job.Job) extends PieceBody {
   val piece: String = "feet"
   def withJob(other: Job.Job): Piece = copy(job = other)
 }
 
-case class Ears(override val pieceType: PieceType.PieceType, override val job: Job.Job) extends PieceAccessory {
+case class Ears(override val isTome: Boolean, override val job: Job.Job) extends PieceAccessory {
   val piece: String = "ears"
   def withJob(other: Job.Job): Piece = copy(job = other)
 }
-case class Neck(override val pieceType: PieceType.PieceType, override val job: Job.Job) extends PieceAccessory {
+case class Neck(override val isTome: Boolean, override val job: Job.Job) extends PieceAccessory {
   val piece: String = "neck"
   def withJob(other: Job.Job): Piece = copy(job = other)
 }
-case class Wrist(override val pieceType: PieceType.PieceType, override val job: Job.Job) extends PieceAccessory {
+case class Wrist(override val isTome: Boolean, override val job: Job.Job) extends PieceAccessory {
   val piece: String = "wrist"
   def withJob(other: Job.Job): Piece = copy(job = other)
 }
-case class Ring(
+case class Ring(override val isTome: Boolean, override val job: Job.Job, override val piece: String = "ring")
-  override val pieceType: PieceType.PieceType,
+  extends PieceAccessory {
-  override val job: Job.Job,
-  override val piece: String = "ring"
-) extends PieceAccessory {
   def withJob(other: Job.Job): Piece = copy(job = other)
-
   override def equals(obj: Any): Boolean = obj match {
-    case Ring(thatPieceType, thatJob, _) => (thatPieceType == pieceType) && (thatJob == job)
+    case Ring(thatIsTome, thatJob, _) => (thatIsTome == isTome) && (thatJob == job)
-    case _ => false
-  }
-
-  override def strictEqual(obj: Any): Boolean = obj match {
-    case ring: Ring => equals(obj) && (ring.piece == this.piece)
     case _ => false
   }
 }
@@ -105,38 +96,27 @@ case object WeaponUpgrade extends PieceUpgrade {
 }
 
 object Piece {
-  def apply(piece: String, pieceType: PieceType.PieceType, job: Job.Job = Job.AnyJob): Piece =
+  def apply(piece: String, isTome: Boolean, job: Job.Job = Job.AnyJob): Piece =
     piece.toLowerCase match {
-      case "weapon" => Weapon(pieceType, job)
+      case "weapon" => Weapon(isTome, job)
-      case "head" => Head(pieceType, job)
+      case "head" => Head(isTome, job)
-      case "body" => Body(pieceType, job)
+      case "body" => Body(isTome, job)
-      case "hands" => Hands(pieceType, job)
+      case "hands" => Hands(isTome, job)
-      case "legs" => Legs(pieceType, job)
+      case "waist" => Waist(isTome, job)
-      case "feet" => Feet(pieceType, job)
+      case "legs" => Legs(isTome, job)
-      case "ears" => Ears(pieceType, job)
+      case "feet" => Feet(isTome, job)
-      case "neck" => Neck(pieceType, job)
+      case "ears" => Ears(isTome, job)
-      case "wrist" | "wrists" => Wrist(pieceType, job)
+      case "neck" => Neck(isTome, job)
-      case ring @ ("ring" | "left ring" | "right ring") => Ring(pieceType, job, ring)
+      case "wrist" => Wrist(isTome, job)
+      case ring @ ("ring" | "left ring" | "right ring") => Ring(isTome, job, ring)
       case "accessory upgrade" => AccessoryUpgrade
       case "body upgrade" => BodyUpgrade
       case "weapon upgrade" => WeaponUpgrade
       case other => throw new Error(s"Unknown item type $other")
     }
 
-  lazy val available: Seq[String] = Seq(
+  lazy val available: Seq[String] = Seq("weapon",
-    "weapon",
+    "head", "body", "hands", "waist", "legs", "feet",
-    "head",
+    "ears", "neck", "wrist", "left ring", "right ring",
-    "body",
+    "accessory upgrade", "body upgrade", "weapon upgrade")
-    "hands",
-    "legs",
-    "feet",
-    "ears",
-    "neck",
-    "wrist",
-    "left ring",
-    "right ring",
-    "accessory upgrade",
-    "body upgrade",
-    "weapon upgrade"
-  )
 }

src/main/scala/me/arcanis/ffxivbis/models/PieceType.scala

@@ -1,20 +0,0 @@
-package me.arcanis.ffxivbis.models
-
-object PieceType {
-
-  sealed trait PieceType
-
-  case object Crafted extends PieceType
-  case object Tome extends PieceType
-  case object Savage extends PieceType
-  case object Artifact extends PieceType
-
-  lazy val available: Seq[PieceType] =
-    Seq(Crafted, Tome, Savage, Artifact)
-
-  def withName(pieceType: String): PieceType =
-    available.find(_.toString.equalsIgnoreCase(pieceType)) match {
-      case Some(value) => value
-      case _ => throw new IllegalArgumentException(s"Invalid or unknown piece type $pieceType")
-    }
-}

src/main/scala/me/arcanis/ffxivbis/models/Player.scala

@@ -8,16 +8,13 @@
  */
 package me.arcanis.ffxivbis.models
 
-case class Player(
+case class Player(partyId: String,
-  id: Long,
+                  job: Job.Job,
-  partyId: String,
+                  nick: String,
-  job: Job.Job,
+                  bis: BiS,
-  nick: String,
+                  loot: Seq[Piece],
-  bis: BiS,
+                  link: Option[String] = None,
-  loot: Seq[Loot],
+                  priority: Int = 0) {
-  link: Option[String] = None,
-  priority: Int = 0
-) {
   require(job ne Job.AnyJob, "AnyJob is not allowed")
 
   val playerId: PlayerId = PlayerId(partyId, job, nick)
@@ -27,36 +24,30 @@ case class Player(
   }
   def withCounters(piece: Option[Piece]): PlayerIdWithCounters =
     PlayerIdWithCounters(
-      partyId,
+      partyId, job, nick, isRequired(piece), priority,
-      job,
+      bisCountTotal(piece), lootCount(piece),
-      nick,
+      lootCountBiS(piece), lootCountTotal(piece))
-      isRequired(piece),
+  def withLoot(piece: Piece): Player = withLoot(Seq(piece))
-      priority,
+  def withLoot(list: Seq[Piece]): Player = list match {
-      bisCountTotal(piece),
+    case Nil => this
-      lootCount(piece),
+    case _ => copy(loot = list)
-      lootCountBiS(piece),
-      lootCountTotal(piece)
-    )
-  def withLoot(piece: Loot): Player = withLoot(Seq(piece))
-  def withLoot(list: Seq[Loot]): Player = {
-    require(loot.forall(_.playerId == id), "player id must be same")
-    copy(loot = loot ++ list)
   }
 
-  def isRequired(piece: Option[Piece]): Boolean =
+  def isRequired(piece: Option[Piece]): Boolean = {
     piece match {
       case None => false
       case Some(p) if !bis.hasPiece(p) => false
       case Some(p: PieceUpgrade) => bis.upgrades(p) > lootCount(piece)
       case Some(_) => lootCount(piece) == 0
     }
+  }
 
-  def bisCountTotal(piece: Option[Piece]): Int = bis.pieces.count(_.pieceType == PieceType.Savage)
+  def bisCountTotal(piece: Option[Piece]): Int = bis.pieces.count(!_.isTome)
   def lootCount(piece: Option[Piece]): Int = piece match {
-    case Some(p) => loot.count(item => !item.isFreeLoot && item.piece == p)
+    case Some(p) => loot.count(_ == p)
     case None => lootCountTotal(piece)
   }
-  def lootCountBiS(piece: Option[Piece]): Int = loot.map(_.piece).count(bis.hasPiece)
+  def lootCountBiS(piece: Option[Piece]): Int = loot.count(bis.hasPiece)
-  def lootCountTotal(piece: Option[Piece]): Int = loot.count(!_.isFreeLoot)
+  def lootCountTotal(piece: Option[Piece]): Int = loot.length
   def lootPriority(piece: Piece): Int = priority
 }

src/main/scala/me/arcanis/ffxivbis/models/PlayerId.scala

@@ -12,7 +12,6 @@ import scala.util.Try
 import scala.util.matching.Regex
 
 trait PlayerIdBase {
-
   def job: Job.Job
   def nick: String
 
@@ -22,7 +21,6 @@ trait PlayerIdBase {
 case class PlayerId(partyId: String, job: Job.Job, nick: String) extends PlayerIdBase
 
 object PlayerId {
-
   def apply(partyId: String, maybeNick: Option[String], maybeJob: Option[String]): Option[PlayerId] =
     (maybeNick, maybeJob) match {
       case (Some(nick), Some(job)) => Try(PlayerId(partyId, Job.withName(job), nick)).toOption

src/main/scala/me/arcanis/ffxivbis/models/PlayerIdWithCounters.scala

@@ -8,17 +8,16 @@
  */
 package me.arcanis.ffxivbis.models
 
-case class PlayerIdWithCounters(
+case class PlayerIdWithCounters(partyId: String,
-  partyId: String,
+                                job: Job.Job,
-  job: Job.Job,
+                                nick: String,
-  nick: String,
+                                isRequired: Boolean,
-  isRequired: Boolean,
+                                priority: Int,
-  priority: Int,
+                                bisCountTotal: Int,
-  bisCountTotal: Int,
+                                lootCount: Int,
-  lootCount: Int,
+                                lootCountBiS: Int,
-  lootCountBiS: Int,
+                                lootCountTotal: Int)
-  lootCountTotal: Int
+  extends PlayerIdBase {
-) extends PlayerIdBase {
   import PlayerIdWithCounters._
 
   def gt(that: PlayerIdWithCounters, orderBy: Seq[String]): Boolean =
@@ -32,15 +31,13 @@ case class PlayerIdWithCounters(
     "bisCountTotal" -> bisCountTotal, // the more pieces in bis the more priority
     "lootCount" -> -lootCount, // the less loot got the more priority
     "lootCountBiS" -> -lootCountBiS, // the less bis pieces looted the more priority
-    "lootCountTotal" -> -lootCountTotal
+    "lootCountTotal" -> -lootCountTotal) withDefaultValue 0 // the less pieces looted the more priority
-  ).withDefaultValue(0) // the less pieces looted the more priority
 
   private def withCounters(orderBy: Seq[String]): PlayerCountersComparator =
     PlayerCountersComparator(orderBy.map(counters): _*)
 }
 
 object PlayerIdWithCounters {
-
   private case class PlayerCountersComparator(values: Int*) {
     def >(that: PlayerCountersComparator): Boolean = {
       @scala.annotation.tailrec

src/main/scala/me/arcanis/ffxivbis/models/User.scala

@@ -14,7 +14,10 @@ object Permission extends Enumeration {
   val get, post, admin = Value
 }
 
-case class User(partyId: String, username: String, password: String, permission: Permission.Value) {
+case class User(partyId: String,
+                username: String,
+                password: String,
+                permission: Permission.Value) {
 
   def hash: String = BCrypt.hashpw(password, BCrypt.gensalt)
   def verify(plain: String): Boolean = BCrypt.checkpw(plain, password)

src/main/scala/me/arcanis/ffxivbis/service/Ariyala.scala

@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2019 Evgeniy Alekseev.
+ *
+ * This file is part of ffxivbis
+ * (see https://github.com/arcan1s/ffxivbis).
+ *
+ * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
+ */
+package me.arcanis.ffxivbis.service
+
+import java.nio.file.Paths
+
+import akka.actor.{Actor, Props}
+import akka.http.scaladsl.Http
+import akka.http.scaladsl.model._
+import akka.pattern.pipe
+import akka.stream.ActorMaterializer
+import akka.stream.scaladsl.{Keep, Sink}
+import akka.util.ByteString
+import com.typesafe.scalalogging.StrictLogging
+import me.arcanis.ffxivbis.models.{BiS, Job, Piece}
+import spray.json._
+
+import scala.concurrent.{ExecutionContext, Future}
+import scala.util.Try
+
+class Ariyala extends Actor with StrictLogging {
+  import Ariyala._
+
+  private val settings = context.system.settings.config
+  private val ariyalaUrl = settings.getString("me.arcanis.ffxivbis.ariyala.ariyala-url")
+  private val xivapiUrl = settings.getString("me.arcanis.ffxivbis.ariyala.xivapi-url")
+  private val xivapiKey = Try(settings.getString("me.arcanis.ffxivbis.ariyala.xivapi-key")).toOption
+
+  private val http = Http()(context.system)
+  implicit private val materializer: ActorMaterializer = ActorMaterializer()
+  implicit private val executionContext: ExecutionContext =
+    context.system.dispatchers.lookup("me.arcanis.ffxivbis.default-dispatcher")
+
+  override def receive: Receive = {
+    case GetBiS(link, job) =>
+      val client = sender()
+      get(link, job).map(BiS(_)).pipeTo(client)
+  }
+
+  override def postStop(): Unit = {
+    http.shutdownAllConnectionPools()
+    super.postStop()
+  }
+
+  private def get(link: String, job: Job.Job): Future[Seq[Piece]] = {
+    val id = Paths.get(link).normalize.getFileName.toString
+    val uri = Uri(ariyalaUrl)
+      .withPath(Uri.Path / "store.app")
+      .withQuery(Uri.Query(Map("identifier" -> id)))
+
+    sendRequest(uri, Ariyala.parseAriyalaJsonToPieces(job, getIsTome))
+  }
+
+  private def getIsTome(itemIds: Seq[Long]): Future[Map[Long, Boolean]] = {
+    val uri = Uri(xivapiUrl)
+      .withPath(Uri.Path / "item")
+      .withQuery(Uri.Query(Map(
+        "columns" -> Seq("ID", "IsEquippable").mkString(","),
+        "ids" -> itemIds.mkString(","),
+        "private_key" -> xivapiKey.getOrElse("")
+      )))
+
+    sendRequest(uri, Ariyala.parseXivapiJson)
+  }
+
+  private def sendRequest[T](uri: Uri, parser: JsObject => Future[T]): Future[T] =
+    http.singleRequest(HttpRequest(uri = uri)).map {
+      case HttpResponse(status, _, entity, _) if status.isSuccess() =>
+        entity.dataBytes
+          .fold(ByteString.empty)(_ ++ _)
+          .map(_.utf8String)
+          .map(result => parser(result.parseJson.asJsObject))
+          .toMat(Sink.head)(Keep.right)
+          .run().flatten
+      case other => Future.failed(new Error(s"Invalid response from server $other"))
+    }.flatten
+}
+
+object Ariyala {
+  def props: Props = Props(new Ariyala)
+
+  case class GetBiS(link: String, job: Job.Job)
+
+  private def parseAriyalaJson(job: Job.Job)(js: JsObject)
+                              (implicit executionContext: ExecutionContext): Future[Map[String, Long]] =
+    Future {
+      val apiJob = js.fields.get("content") match {
+        case Some(JsString(value)) => value
+        case other => throw deserializationError(s"Invalid job name $other")
+      }
+      js.fields.get("datasets") match {
+        case Some(datasets: JsObject) =>
+          val fields = datasets.fields
+          fields.getOrElse(apiJob, fields(job.toString)).asJsObject
+            .fields("normal").asJsObject
+            .fields("items").asJsObject
+            .fields.foldLeft(Map.empty[String, Long]) {
+            case (acc, (key, JsNumber(id))) => remapKey(key).map(k => acc + (k -> id.toLong)).getOrElse(acc)
+            case (acc, _) => acc
+          }
+        case other => throw deserializationError(s"Invalid json $other")
+      }
+    }
+
+  private def parseAriyalaJsonToPieces(job: Job.Job, isTome: Seq[Long] => Future[Map[Long, Boolean]])(js: JsObject)
+                                      (implicit executionContext: ExecutionContext): Future[Seq[Piece]] =
+    parseAriyalaJson(job)(js).flatMap { pieces =>
+      isTome(pieces.values.toSeq).map { tomePieces =>
+        pieces.view.mapValues(tomePieces).map {
+          case (piece, isTomePiece) => Piece(piece, isTomePiece, job)
+        }.toSeq
+      }
+    }
+
+  private def parseXivapiJson(js: JsObject)
+                             (implicit executionContext: ExecutionContext): Future[Map[Long, Boolean]] =
+    Future {
+      js.fields("Results") match {
+        case array: JsArray =>
+          array.elements.map(_.asJsObject.getFields("ID", "IsEquippable") match {
+            case Seq(JsNumber(id), JsNumber(isTome)) => id.toLong -> (isTome == 0)
+            case other => throw deserializationError(s"Could not parse $other")
+          }).toMap
+        case other => throw deserializationError(s"Could not parse $other")
+      }
+    }
+
+  private def remapKey(key: String): Option[String] = key match {
+    case "mainhand" => Some("weapon")
+    case "chest" => Some("body")
+    case "ringLeft" => Some("left ring")
+    case "ringRight" => Some("right ring")
+    case "head" | "hands" | "waist" | "legs" | "feet" | "ears" | "neck" | "wrist" => Some(key)
+    case _ => None
+  }
+}

src/main/scala/me/arcanis/ffxivbis/service/Database.scala

@@ -6,42 +6,40 @@
  *
  * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
  */
-package me.arcanis.ffxivbis.service.database
+package me.arcanis.ffxivbis.service
 
-import akka.actor.typed.Behavior
+import akka.actor.Actor
-import akka.actor.typed.scaladsl.Behaviors
-import com.typesafe.config.Config
 import com.typesafe.scalalogging.StrictLogging
-import me.arcanis.ffxivbis.messages.DatabaseMessage
 import me.arcanis.ffxivbis.models.{Party, Player, PlayerId}
-import me.arcanis.ffxivbis.service.database.impl.DatabaseImpl
 import me.arcanis.ffxivbis.storage.DatabaseProfile
 
 import scala.concurrent.{ExecutionContext, Future}
 
-trait Database extends StrictLogging {
+trait Database extends Actor with StrictLogging {
-
   implicit def executionContext: ExecutionContext
-  def config: Config
   def profile: DatabaseProfile
 
+  override def postStop(): Unit = {
+    profile.db.close()
+    super.postStop()
+  }
+
   def filterParty(party: Party, maybePlayerId: Option[PlayerId]): Seq[Player] =
-    maybePlayerId match {
+    (party, maybePlayerId) match {
-      case Some(playerId) => party.player(playerId).map(Seq(_)).getOrElse(Seq.empty)
+      case (_, Some(playerId)) => party.player(playerId).map(Seq(_)).getOrElse(Seq.empty)
-      case _ => party.getPlayers
+      case (_, _) => party.getPlayers
     }
 
   def getParty(partyId: String, withBiS: Boolean, withLoot: Boolean): Future[Party] =
     for {
-      partyDescription <- profile.getPartyDescription(partyId)
       players <- profile.getParty(partyId)
       bis <- if (withBiS) profile.getPiecesBiS(partyId) else Future(Seq.empty)
       loot <- if (withLoot) profile.getPieces(partyId) else Future(Seq.empty)
-    } yield Party(partyDescription, config, players, bis, loot)
+    } yield Party(partyId, context.system.settings.config, players, bis, loot)
 }
 
 object Database {
-
+  trait DatabaseRequest {
-  def apply(): Behavior[DatabaseMessage] =
+    def partyId: String
-    Behaviors.setup[DatabaseMessage](context => new DatabaseImpl(context))
+  }
 }

src/main/scala/me/arcanis/ffxivbis/service/LootSelector.scala

@@ -21,7 +21,6 @@ class LootSelector(players: Seq[Player], piece: Piece, orderBy: Seq[String]) {
 }
 
 object LootSelector {
-
   def apply(players: Seq[Player], piece: Piece, orderBy: Seq[String]): LootSelectorResult =
     new LootSelector(players, piece, orderBy).suggest
 

src/main/scala/me/arcanis/ffxivbis/service/PartyService.scala

@@ -8,66 +8,57 @@
  */
 package me.arcanis.ffxivbis.service
 
-import akka.actor.typed.scaladsl.AskPattern.Askable
+import akka.actor.{Actor, ActorRef, Props}
-import akka.actor.typed.{ActorRef, Behavior, DispatcherSelector, Scheduler}
+import akka.pattern.{ask, pipe}
-import akka.actor.typed.scaladsl.{AbstractBehavior, ActorContext, Behaviors}
 import akka.util.Timeout
 import com.typesafe.scalalogging.StrictLogging
-import me.arcanis.ffxivbis.messages.{DatabaseMessage, Exists, ForgetParty, GetNewPartyId, GetParty, Message, StoreParty}
 import me.arcanis.ffxivbis.models.Party
 
 import scala.concurrent.duration.FiniteDuration
 import scala.concurrent.{ExecutionContext, Future}
 
-class PartyService(context: ActorContext[Message], storage: ActorRef[DatabaseMessage])
+class PartyService(storage: ActorRef) extends Actor with StrictLogging {
-  extends AbstractBehavior[Message](context)
+  import PartyService._
-  with StrictLogging {
   import me.arcanis.ffxivbis.utils.Implicits._
 
   private val cacheTimeout: FiniteDuration =
     context.system.settings.config.getDuration("me.arcanis.ffxivbis.settings.cache-timeout")
-  implicit private val executionContext: ExecutionContext = {
+  implicit private val executionContext: ExecutionContext =
-    val selector = DispatcherSelector.fromConfig("me.arcanis.ffxivbis.default-dispatcher")
+    context.system.dispatchers.lookup("me.arcanis.ffxivbis.default-dispatcher")
-    context.system.dispatchers.lookup(selector)
-  }
   implicit private val timeout: Timeout =
     context.system.settings.config.getDuration("me.arcanis.ffxivbis.settings.request-timeout")
-  implicit private val scheduler: Scheduler = context.system.scheduler
 
-  override def onMessage(msg: Message): Behavior[Message] = handle(Map.empty)(msg)
+  override def receive: Receive = handle(Map.empty)
 
-  private def handle(cache: Map[String, Party]): Message.Handler = {
+  private def handle(cache: Map[String, Party]): Receive = {
     case ForgetParty(partyId) =>
-      Behaviors.receiveMessage(handle(cache - partyId))
+      context become handle(cache - partyId)
 
-    case GetNewPartyId(client) =>
+    case GetNewPartyId =>
-      getPartyId.foreach(client ! _)
+      val client = sender()
-      Behaviors.same
+      getPartyId.pipeTo(client)
 
-    case StoreParty(partyId, party) =>
+    case req @ impl.DatabasePartyHandler.GetParty(partyId) =>
-      Behaviors.receiveMessage(handle(cache.updated(partyId, party)))
+      val client = sender()
-
-    case GetParty(partyId, client) =>
       val party = cache.get(partyId) match {
         case Some(party) => Future.successful(party)
         case None =>
-          storage.ask(ref => GetParty(partyId, ref)).map { party =>
+          (storage ? req).mapTo[Party].map { party =>
-            context.self ! StoreParty(partyId, party)
+            context become handle(cache + (partyId -> party))
-            context.system.scheduler.scheduleOnce(cacheTimeout, () => context.self ! ForgetParty(partyId))
+            context.system.scheduler.scheduleOnce(cacheTimeout, self, ForgetParty(partyId))
             party
           }
       }
-      party.foreach(client ! _)
+      party.pipeTo(client)
-      Behaviors.same
 
-    case req: DatabaseMessage =>
+    case req: Database.DatabaseRequest =>
-      storage ! req
+      self ! ForgetParty(req.partyId)
-      Behaviors.receiveMessage(handle(cache - req.partyId))
+      storage.forward(req)
   }
 
   private def getPartyId: Future[String] = {
     val partyId = Party.randomPartyId
-    storage.ask(ref => Exists(partyId, ref)).flatMap {
+    (storage ? impl.DatabaseUserHandler.Exists(partyId)).mapTo[Boolean].flatMap {
       case true => getPartyId
       case false => Future.successful(partyId)
     }
@@ -75,7 +66,8 @@ class PartyService(context: ActorContext[Message], storage: ActorRef[DatabaseMes
 }
 
 object PartyService {
+  def props(storage: ActorRef): Props = Props(new PartyService(storage))
 
-  def apply(storage: ActorRef[DatabaseMessage]): Behavior[Message] =
+  case class ForgetParty(partyId: String)
-    Behaviors.setup[Message](context => new PartyService(context, storage))
+  case object GetNewPartyId
 }

src/main/scala/me/arcanis/ffxivbis/service/RateLimiter.scala

@@ -0,0 +1,47 @@
+package me.arcanis.ffxivbis.service
+
+import java.time.Instant
+
+import akka.actor.Actor
+
+import scala.concurrent.ExecutionContext
+import scala.concurrent.duration.FiniteDuration
+
+class RateLimiter extends Actor {
+  import RateLimiter._
+  import me.arcanis.ffxivbis.utils.Implicits._
+
+  implicit private val executionContext: ExecutionContext = context.system.dispatcher
+
+  private val maxRequestCount: Int = context.system.settings.config.getInt("me.arcanis.ffxivbis.web.limits.max-count")
+  private val requestInterval: FiniteDuration = context.system.settings.config.getDuration("me.arcanis.ffxivbis.web.limits.interval")
+
+  override def receive: Receive = handle(Map.empty)
+
+  private def handle(cache: Map[String, Usage]): Receive = {
+    case username: String =>
+      val client = sender()
+      val usage = if (cache.contains(username)) {
+        cache(username)
+      } else {
+        context.system.scheduler.scheduleOnce(requestInterval, self, Reset(username))
+        Usage()
+      }
+      context become handle(cache + (username -> usage.increment))
+
+      val response = if (usage.count > maxRequestCount) Some(usage.left) else None
+      client ! response
+
+    case Reset(username) =>
+      context become handle(cache - username)
+  }
+}
+
+object RateLimiter {
+  private case class Usage(count: Int = 0, since: Instant = Instant.now) {
+    def increment: Usage = copy(count = count + 1)
+    def left: Long = (Instant.now.toEpochMilli - since.toEpochMilli) / 1000
+  }
+
+  case class Reset(username: String)
+}

src/main/scala/me/arcanis/ffxivbis/service/bis/BisProvider.scala

@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2019 Evgeniy Alekseev.
- *
- * This file is part of ffxivbis
- * (see https://github.com/arcan1s/ffxivbis).
- *
- * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
- */
-package me.arcanis.ffxivbis.service.bis
-
-import java.nio.file.Paths
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.typed.{Behavior, PostStop, Signal}
-import akka.actor.typed.scaladsl.{AbstractBehavior, ActorContext, Behaviors}
-import akka.http.scaladsl.model._
-import com.typesafe.scalalogging.StrictLogging
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, DownloadBiS}
-import me.arcanis.ffxivbis.models.{BiS, Job, Piece, PieceType}
-import me.arcanis.ffxivbis.service.bis.parser.Parser
-import me.arcanis.ffxivbis.service.bis.parser.impl.{Ariyala, Etro}
-import spray.json._
-
-import scala.concurrent.{ExecutionContext, Future}
-import scala.util.{Failure, Success}
-
-class BisProvider(context: ActorContext[BiSProviderMessage])
-  extends AbstractBehavior[BiSProviderMessage](context)
-  with XivApi
-  with StrictLogging {
-
-  override def system: ClassicActorSystemProvider = context.system
-
-  override def onMessage(msg: BiSProviderMessage): Behavior[BiSProviderMessage] =
-    msg match {
-      case DownloadBiS(link, job, client) =>
-        get(link, job).onComplete {
-          case Success(items) => client ! BiS(items)
-          case Failure(exception) =>
-            logger.error("received exception while getting items", exception)
-        }
-        Behaviors.same
-    }
-
-  override def onSignal: PartialFunction[Signal, Behavior[BiSProviderMessage]] = { case PostStop =>
-    shutdown()
-    Behaviors.same
-  }
-
-  private def get(link: String, job: Job.Job): Future[Seq[Piece]] =
-    try {
-      val url = Uri(link)
-      val id = Paths.get(link).normalize.getFileName.toString
-
-      val parser = if (url.authority.host.address().contains("etro")) Etro else Ariyala
-      val uri = parser.uri(url, id)
-      sendRequest(uri, BisProvider.parseBisJsonToPieces(job, parser, getPieceType))
-    } catch {
-      case exception: Exception => Future.failed(exception)
-    }
-}
-
-object BisProvider {
-
-  def apply(): Behavior[BiSProviderMessage] =
-    Behaviors.setup[BiSProviderMessage](context => new BisProvider(context))
-
-  private def parseBisJsonToPieces(
-    job: Job.Job,
-    idParser: Parser,
-    pieceTypes: Seq[Long] => Future[Map[Long, PieceType.PieceType]]
-  )(js: JsObject)(implicit executionContext: ExecutionContext): Future[Seq[Piece]] =
-    idParser.parse(job, js).flatMap { pieces =>
-      pieceTypes(pieces.values.toSeq).map { types =>
-        pieces.view
-          .mapValues(types)
-          .map { case (piece, pieceType) =>
-            Piece(piece, pieceType, job)
-          }
-          .toSeq
-      }
-    }
-
-  def remapKey(key: String): Option[String] = key match {
-    case "mainhand" => Some("weapon")
-    case "chest" => Some("body")
-    case "ringLeft" | "fingerL" => Some("left ring")
-    case "ringRight" | "fingerR" => Some("right ring")
-    case "weapon" | "head" | "body" | "hands" | "legs" | "feet" | "ears" | "neck" | "wrist" | "wrists" => Some(key)
-    case _ => None
-  }
-}

src/main/scala/me/arcanis/ffxivbis/service/bis/RequestExecutor.scala

@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2019 Evgeniy Alekseev.
- *
- * This file is part of ffxivbis
- * (see https://github.com/arcan1s/ffxivbis).
- *
- * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
- */
-package me.arcanis.ffxivbis.service.bis
-
-import akka.actor.ClassicActorSystemProvider
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.headers.Location
-import akka.http.scaladsl.model.{HttpRequest, HttpResponse, Uri}
-import akka.stream.Materializer
-import akka.stream.scaladsl.{Keep, Sink}
-import akka.util.ByteString
-import spray.json._
-
-import scala.concurrent.{ExecutionContext, Future}
-
-trait RequestExecutor {
-
-  def system: ClassicActorSystemProvider
-
-  private val http = Http()(system)
-  implicit val materializer: Materializer = Materializer.createMaterializer(system)
-  implicit val executionContext: ExecutionContext =
-    system.classicSystem.dispatchers.lookup("me.arcanis.ffxivbis.default-dispatcher")
-
-  def sendRequest[T](uri: Uri, parser: JsObject => Future[T]): Future[T] =
-    http
-      .singleRequest(HttpRequest(uri = uri))
-      .map {
-        case r: HttpResponse if r.status.isRedirection() =>
-          val location = r.header[Location].get.uri
-          sendRequest(uri.withPath(location.path), parser)
-        case HttpResponse(status, _, entity, _) if status.isSuccess() =>
-          entity.dataBytes
-            .fold(ByteString.empty)(_ ++ _)
-            .map(_.utf8String)
-            .map(result => parser(result.parseJson.asJsObject))
-            .toMat(Sink.head)(Keep.right)
-            .run()
-            .flatten
-        case other => Future.failed(new Error(s"Invalid response from server $other"))
-      }
-      .flatten
-
-  def shutdown(): Unit = http.shutdownAllConnectionPools()
-}

src/main/scala/me/arcanis/ffxivbis/service/bis/XivApi.scala

@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2019 Evgeniy Alekseev.
- *
- * This file is part of ffxivbis
- * (see https://github.com/arcan1s/ffxivbis).
- *
- * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
- */
-package me.arcanis.ffxivbis.service.bis
-
-import akka.http.scaladsl.model.Uri
-import me.arcanis.ffxivbis.models.PieceType
-import spray.json._
-
-import scala.concurrent.{ExecutionContext, Future}
-import scala.jdk.CollectionConverters._
-import scala.util.Try
-
-trait XivApi extends RequestExecutor {
-
-  private val config = system.classicSystem.settings.config
-  private val xivapiUrl = config.getString("me.arcanis.ffxivbis.bis-provider.xivapi-url")
-  private val xivapiKey = Try(config.getString("me.arcanis.ffxivbis.bis-provider.xivapi-key")).toOption
-
-  private val preloadedItems: Map[Long, PieceType.PieceType] =
-    config
-      .getConfigList("me.arcanis.ffxivbis.bis-provider.cached-items")
-      .asScala
-      .map { item =>
-        item.getLong("id") -> PieceType.withName(item.getString("source"))
-      }
-      .toMap
-
-  def getPieceType(itemIds: Seq[Long]): Future[Map[Long, PieceType.PieceType]] = {
-    val (local, remote) = itemIds.foldLeft((Map.empty[Long, PieceType.PieceType], Seq.empty[Long])) {
-      case ((l, r), id) =>
-        if (preloadedItems.contains(id)) (l.updated(id, preloadedItems(id)), r)
-        else (l, r :+ id)
-    }
-    if (remote.isEmpty) Future.successful(local)
-    else remotePieceType(remote).map(_ ++ local)
-  }
-
-  private def remotePieceType(itemIds: Seq[Long]): Future[Map[Long, PieceType.PieceType]] = {
-    val uriForItems = Uri(xivapiUrl)
-      .withPath(Uri.Path / "item")
-      .withQuery(
-        Uri.Query(
-          Map(
-            "columns" -> Seq("ID", "GameContentLinks").mkString(","),
-            "ids" -> itemIds.mkString(","),
-            "private_key" -> xivapiKey.getOrElse("")
-          )
-        )
-      )
-
-    sendRequest(uriForItems, XivApi.parseXivapiJsonToShop).flatMap { shops =>
-      val shopIds = shops.values.map(_._2).toSet
-      val columns = shops.values.map(pair => s"ItemCost${pair._1}").toSet
-      val uriForShops = Uri(xivapiUrl)
-        .withPath(Uri.Path / "specialshop")
-        .withQuery(
-          Uri.Query(
-            Map(
-              "columns" -> (columns + "ID").mkString(","),
-              "ids" -> shopIds.mkString(","),
-              "private_key" -> xivapiKey.getOrElse("")
-            )
-          )
-        )
-
-      sendRequest(uriForShops, XivApi.parseXivapiJsonToType(shops))
-    }
-  }
-}
-
-object XivApi {
-
-  private def parseXivapiJsonToShop(
-    js: JsObject
-  )(implicit executionContext: ExecutionContext): Future[Map[Long, (String, Long)]] = {
-    def extractTraderId(js: JsObject) =
-      js.fields
-        .get("Recipe")
-        .map(_ => "crafted" -> -1L) // you can craft this item
-        .orElse { // lets try shop items
-          js.fields("SpecialShop").asJsObject.fields.collectFirst {
-            case (shopName, JsArray(array)) if shopName.startsWith("ItemReceive") =>
-              val shopId = array.head match {
-                case JsNumber(id) => id.toLong
-                case other => throw deserializationError(s"Could not parse $other")
-              }
-              shopName.replace("ItemReceive", "") -> shopId
-          }
-        }
-        .getOrElse(throw deserializationError(s"Could not parse $js"))
-
-    Future {
-      js.fields("Results") match {
-        case array: JsArray =>
-          array.elements
-            .map(_.asJsObject.getFields("ID", "GameContentLinks") match {
-              case Seq(JsNumber(id), shop: JsObject) => id.toLong -> extractTraderId(shop.asJsObject)
-              case other => throw deserializationError(s"Could not parse $other")
-            })
-            .toMap
-        case other => throw deserializationError(s"Could not parse $other")
-      }
-    }
-  }
-
-  private def parseXivapiJsonToType(
-    shops: Map[Long, (String, Long)]
-  )(js: JsObject)(implicit executionContext: ExecutionContext): Future[Map[Long, PieceType.PieceType]] =
-    Future {
-      val shopMap = js.fields("Results") match {
-        case array: JsArray =>
-          array.elements.collect { case shop: JsObject =>
-            shop.fields("ID") match {
-              case JsNumber(id) => id.toLong -> shop
-              case other => throw deserializationError(s"Could not parse $other")
-            }
-          }.toMap
-        case other => throw deserializationError(s"Could not parse $other")
-      }
-
-      shops.map { case (itemId, (index, shopId)) =>
-        val pieceType =
-          if (index == "crafted" && shopId == -1L) PieceType.Crafted
-          else
-            Try(shopMap(shopId).fields(s"ItemCost$index").asJsObject)
-              .getOrElse(throw new Exception(s"${shopMap(shopId).fields(s"ItemCost$index")}, $index"))
-              .getFields("IsUnique", "StackSize") match {
-              case Seq(JsNumber(isUnique), JsNumber(stackSize)) =>
-                if (isUnique == 1 || stackSize.toLong != 999) PieceType.Tome // either upgraded gear or tomes found
-                else PieceType.Savage
-              case other => throw deserializationError(s"Could not parse $other")
-            }
-        itemId -> pieceType
-      }
-    }
-}

src/main/scala/me/arcanis/ffxivbis/service/bis/parser/Parser.scala

@@ -1,15 +0,0 @@
-package me.arcanis.ffxivbis.service.bis.parser
-
-import akka.http.scaladsl.model.Uri
-import com.typesafe.scalalogging.StrictLogging
-import me.arcanis.ffxivbis.models.Job
-import spray.json.JsObject
-
-import scala.concurrent.{ExecutionContext, Future}
-
-trait Parser extends StrictLogging {
-
-  def parse(job: Job.Job, js: JsObject)(implicit executionContext: ExecutionContext): Future[Map[String, Long]]
-
-  def uri(root: Uri, id: String): Uri
-}

src/main/scala/me/arcanis/ffxivbis/service/bis/parser/impl/Ariyala.scala

@@ -1,45 +0,0 @@
-package me.arcanis.ffxivbis.service.bis.parser.impl
-
-import akka.http.scaladsl.model.Uri
-import me.arcanis.ffxivbis.models.Job
-import me.arcanis.ffxivbis.service.bis.BisProvider
-import me.arcanis.ffxivbis.service.bis.parser.Parser
-import spray.json.{deserializationError, JsNumber, JsObject, JsString}
-
-import scala.concurrent.{ExecutionContext, Future}
-
-object Ariyala extends Parser {
-
-  override def parse(job: Job.Job, js: JsObject)(implicit
-    executionContext: ExecutionContext
-  ): Future[Map[String, Long]] =
-    Future {
-      val apiJob = js.fields.get("content") match {
-        case Some(JsString(value)) => value
-        case other => throw deserializationError(s"Invalid job name $other")
-      }
-      js.fields.get("datasets") match {
-        case Some(datasets: JsObject) =>
-          val fields = datasets.fields
-          fields
-            .getOrElse(apiJob, fields(job.toString))
-            .asJsObject
-            .fields("normal")
-            .asJsObject
-            .fields("items")
-            .asJsObject
-            .fields
-            .foldLeft(Map.empty[String, Long]) {
-              case (acc, (key, JsNumber(id))) =>
-                BisProvider.remapKey(key).map(k => acc + (k -> id.toLong)).getOrElse(acc)
-              case (acc, _) => acc
-            }
-        case other => throw deserializationError(s"Invalid json $other")
-      }
-    }
-
-  override def uri(root: Uri, id: String): Uri =
-    root
-      .withPath(Uri.Path / "store.app")
-      .withQuery(Uri.Query(Map("identifier" -> id)))
-}

src/main/scala/me/arcanis/ffxivbis/service/bis/parser/impl/Etro.scala

@@ -1,25 +0,0 @@
-package me.arcanis.ffxivbis.service.bis.parser.impl
-
-import akka.http.scaladsl.model.Uri
-import me.arcanis.ffxivbis.models.Job
-import me.arcanis.ffxivbis.service.bis.BisProvider
-import me.arcanis.ffxivbis.service.bis.parser.Parser
-import spray.json.{JsNumber, JsObject}
-
-import scala.concurrent.{ExecutionContext, Future}
-
-object Etro extends Parser {
-
-  override def parse(job: Job.Job, js: JsObject)(implicit
-    executionContext: ExecutionContext
-  ): Future[Map[String, Long]] =
-    Future {
-      js.fields.foldLeft(Map.empty[String, Long]) {
-        case (acc, (key, JsNumber(id))) => BisProvider.remapKey(key).map(k => acc + (k -> id.toLong)).getOrElse(acc)
-        case (acc, _) => acc
-      }
-    }
-
-  override def uri(root: Uri, id: String): Uri =
-    root.withPath(Uri.Path / "api" / "gearsets" / id)
-}

src/main/scala/me/arcanis/ffxivbis/service/database/impl/DatabaseBiSHandler.scala

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2019 Evgeniy Alekseev.
- *
- * This file is part of ffxivbis
- * (see https://github.com/arcan1s/ffxivbis).
- *
- * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
- */
-package me.arcanis.ffxivbis.service.database.impl
-
-import akka.actor.typed.scaladsl.Behaviors
-import me.arcanis.ffxivbis.messages.{AddPieceToBis, DatabaseMessage, GetBiS, RemovePieceFromBiS, RemovePiecesFromBiS}
-import me.arcanis.ffxivbis.service.database.Database
-
-trait DatabaseBiSHandler { this: Database =>
-
-  def bisHandler: DatabaseMessage.Handler = {
-    case AddPieceToBis(playerId, piece, client) =>
-      profile.insertPieceBiS(playerId, piece).foreach(_ => client ! ())
-      Behaviors.same
-
-    case GetBiS(partyId, maybePlayerId, client) =>
-      getParty(partyId, withBiS = true, withLoot = false)
-        .map(filterParty(_, maybePlayerId))
-        .foreach(client ! _)
-      Behaviors.same
-
-    case RemovePieceFromBiS(playerId, piece, client) =>
-      profile.deletePieceBiS(playerId, piece).foreach(_ => client ! ())
-      Behaviors.same
-
-    case RemovePiecesFromBiS(playerId, client) =>
-      profile.deletePiecesBiS(playerId).foreach(_ => client ! ())
-      Behaviors.same
-  }
-}

src/main/scala/me/arcanis/ffxivbis/service/database/impl/DatabaseImpl.scala

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2019 Evgeniy Alekseev.
- *
- * This file is part of ffxivbis
- * (see https://github.com/arcan1s/ffxivbis).
- *
- * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
- */
-package me.arcanis.ffxivbis.service.database.impl
-
-import akka.actor.typed.{Behavior, DispatcherSelector}
-import akka.actor.typed.scaladsl.{AbstractBehavior, ActorContext}
-import com.typesafe.config.Config
-import me.arcanis.ffxivbis.messages.DatabaseMessage
-import me.arcanis.ffxivbis.service.database.Database
-import me.arcanis.ffxivbis.storage.DatabaseProfile
-
-import scala.concurrent.ExecutionContext
-
-class DatabaseImpl(context: ActorContext[DatabaseMessage])
-  extends AbstractBehavior[DatabaseMessage](context)
-  with Database
-  with DatabaseBiSHandler
-  with DatabaseLootHandler
-  with DatabasePartyHandler
-  with DatabaseUserHandler {
-
-  implicit override val executionContext: ExecutionContext = {
-    val selector = DispatcherSelector.fromConfig("me.arcanis.ffxivbis.default-dispatcher")
-    context.system.dispatchers.lookup(selector)
-  }
-  override val config: Config = context.system.settings.config
-  override val profile: DatabaseProfile = new DatabaseProfile(executionContext, config)
-
-  override def onMessage(msg: DatabaseMessage): Behavior[DatabaseMessage] = handle(msg)
-
-  private def handle: DatabaseMessage.Handler =
-    bisHandler.orElse(lootHandler).orElse(partyHandler).orElse(userHandler)
-}

src/main/scala/me/arcanis/ffxivbis/service/database/impl/DatabaseLootHandler.scala

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2019 Evgeniy Alekseev.
- *
- * This file is part of ffxivbis
- * (see https://github.com/arcan1s/ffxivbis).
- *
- * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
- */
-package me.arcanis.ffxivbis.service.database.impl
-
-import java.time.Instant
-import akka.actor.typed.scaladsl.Behaviors
-import me.arcanis.ffxivbis.messages.{AddPieceTo, DatabaseMessage, GetLoot, RemovePieceFrom, SuggestLoot}
-import me.arcanis.ffxivbis.models.Loot
-import me.arcanis.ffxivbis.service.database.Database
-
-trait DatabaseLootHandler { this: Database =>
-
-  def lootHandler: DatabaseMessage.Handler = {
-    case AddPieceTo(playerId, piece, isFreeLoot, client) =>
-      val loot = Loot(-1, piece, Instant.now, isFreeLoot)
-      profile.insertPiece(playerId, loot).foreach(_ => client ! ())
-      Behaviors.same
-
-    case GetLoot(partyId, maybePlayerId, client) =>
-      getParty(partyId, withBiS = false, withLoot = true)
-        .map(filterParty(_, maybePlayerId))
-        .foreach(client ! _)
-      Behaviors.same
-
-    case RemovePieceFrom(playerId, piece, client) =>
-      profile.deletePiece(playerId, piece).foreach(_ => client ! ())
-      Behaviors.same
-
-    case SuggestLoot(partyId, piece, client) =>
-      getParty(partyId, withBiS = true, withLoot = true)
-        .map(_.suggestLoot(piece))
-        .foreach(client ! _)
-      Behaviors.same
-  }
-}

src/main/scala/me/arcanis/ffxivbis/service/database/impl/DatabasePartyHandler.scala

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2019 Evgeniy Alekseev.
- *
- * This file is part of ffxivbis
- * (see https://github.com/arcan1s/ffxivbis).
- *
- * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
- */
-package me.arcanis.ffxivbis.service.database.impl
-
-import akka.actor.typed.scaladsl.Behaviors
-import me.arcanis.ffxivbis.messages.{AddPlayer, DatabaseMessage, GetParty, GetPartyDescription, GetPlayer, RemovePlayer, UpdateParty}
-import me.arcanis.ffxivbis.models.{BiS, Player}
-import me.arcanis.ffxivbis.service.database.Database
-
-import scala.concurrent.Future
-
-trait DatabasePartyHandler { this: Database =>
-
-  def partyHandler: DatabaseMessage.Handler = {
-    case AddPlayer(player, client) =>
-      profile.insertPlayer(player).foreach(_ => client ! ())
-      Behaviors.same
-
-    case GetParty(partyId, client) =>
-      getParty(partyId, withBiS = true, withLoot = true).foreach(client ! _)
-      Behaviors.same
-
-    case GetPartyDescription(partyId, client) =>
-      profile.getPartyDescription(partyId).foreach(client ! _)
-      Behaviors.same
-
-    case GetPlayer(playerId, client) =>
-      val player = profile
-        .getPlayerFull(playerId)
-        .flatMap { maybePlayerData =>
-          Future.traverse(maybePlayerData.toSeq) { playerData =>
-            for {
-              bis <- profile.getPiecesBiS(playerId)
-              loot <- profile.getPieces(playerId)
-            } yield Player(
-              playerData.id,
-              playerId.partyId,
-              playerId.job,
-              playerId.nick,
-              BiS(bis.map(_.piece)),
-              loot,
-              playerData.link,
-              playerData.priority
-            )
-          }
-        }
-        .map(_.headOption)
-      player.foreach(client ! _)
-      Behaviors.same
-
-    case RemovePlayer(playerId, client) =>
-      profile.deletePlayer(playerId).foreach(_ => client ! ())
-      Behaviors.same
-
-    case UpdateParty(description, client) =>
-      profile.insertPartyDescription(description).foreach(_ => client ! ())
-      Behaviors.same
-  }
-}

src/main/scala/me/arcanis/ffxivbis/service/database/impl/DatabaseUserHandler.scala

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2019 Evgeniy Alekseev.
- *
- * This file is part of ffxivbis
- * (see https://github.com/arcan1s/ffxivbis).
- *
- * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
- */
-package me.arcanis.ffxivbis.service.database.impl
-
-import akka.actor.typed.scaladsl.Behaviors
-import me.arcanis.ffxivbis.messages.{AddUser, DatabaseMessage, DeleteUser, Exists, GetUser, GetUsers}
-import me.arcanis.ffxivbis.service.database.Database
-
-trait DatabaseUserHandler { this: Database =>
-
-  def userHandler: DatabaseMessage.Handler = {
-    case AddUser(user, isHashedPassword, client) =>
-      val toInsert = if (isHashedPassword) user else user.withHashedPassword
-      profile.insertUser(toInsert).foreach(_ => client ! ())
-      Behaviors.same
-
-    case DeleteUser(partyId, username, client) =>
-      profile.deleteUser(partyId, username).foreach(_ => client ! ())
-      Behaviors.same
-
-    case Exists(partyId, client) =>
-      profile.exists(partyId).foreach(client ! _)
-      Behaviors.same
-
-    case GetUser(partyId, username, client) =>
-      profile.getUser(partyId, username).foreach(client ! _)
-      Behaviors.same
-
-    case GetUsers(partyId, client) =>
-      profile.getUsers(partyId).foreach(client ! _)
-      Behaviors.same
-  }
-}

src/main/scala/me/arcanis/ffxivbis/service/impl/DatabaseBiSHandler.scala

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2019 Evgeniy Alekseev.
+ *
+ * This file is part of ffxivbis
+ * (see https://github.com/arcan1s/ffxivbis).
+ *
+ * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
+ */
+package me.arcanis.ffxivbis.service.impl
+
+import akka.pattern.pipe
+import me.arcanis.ffxivbis.models.{Piece, PlayerId}
+import me.arcanis.ffxivbis.service.Database
+
+trait DatabaseBiSHandler { this: Database  =>
+  import DatabaseBiSHandler._
+
+  def bisHandler: Receive = {
+    case AddPieceToBis(playerId, piece) =>
+      val client = sender()
+      profile.insertPieceBiS(playerId, piece).pipeTo(client)
+
+    case GetBiS(partyId, maybePlayerId) =>
+      val client = sender()
+      getParty(partyId, withBiS = true, withLoot = false)
+        .map(filterParty(_, maybePlayerId))
+        .pipeTo(client)
+
+    case RemovePieceFromBiS(playerId, piece) =>
+      val client = sender()
+      profile.deletePieceBiS(playerId, piece).pipeTo(client)
+  }
+}
+
+object DatabaseBiSHandler {
+  case class AddPieceToBis(playerId: PlayerId, piece: Piece) extends Database.DatabaseRequest {
+    override def partyId: String = playerId.partyId
+  }
+  case class GetBiS(partyId: String, playerId: Option[PlayerId]) extends Database.DatabaseRequest
+  case class RemovePieceFromBiS(playerId: PlayerId, piece: Piece) extends Database.DatabaseRequest {
+    override def partyId: String = playerId.partyId
+  }
+}

src/main/scala/me/arcanis/ffxivbis/service/impl/DatabaseImpl.scala

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2019 Evgeniy Alekseev.
+ *
+ * This file is part of ffxivbis
+ * (see https://github.com/arcan1s/ffxivbis).
+ *
+ * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
+ */
+package me.arcanis.ffxivbis.service.impl
+
+import akka.actor.Props
+import me.arcanis.ffxivbis.service.Database
+import me.arcanis.ffxivbis.storage.DatabaseProfile
+
+import scala.concurrent.ExecutionContext
+
+class DatabaseImpl extends Database
+  with DatabaseBiSHandler with DatabaseLootHandler
+  with DatabasePartyHandler with DatabaseUserHandler {
+
+  implicit val executionContext: ExecutionContext =
+    context.system.dispatchers.lookup("me.arcanis.ffxivbis.default-dispatcher")
+  val profile = new DatabaseProfile(executionContext, context.system.settings.config)
+
+  override def receive: Receive =
+    bisHandler orElse lootHandler orElse partyHandler orElse userHandler
+}
+
+object DatabaseImpl {
+  def props: Props = Props(new DatabaseImpl)
+}

src/main/scala/me/arcanis/ffxivbis/service/impl/DatabaseLootHandler.scala

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2019 Evgeniy Alekseev.
+ *
+ * This file is part of ffxivbis
+ * (see https://github.com/arcan1s/ffxivbis).
+ *
+ * License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
+ */
+package me.arcanis.ffxivbis.service.impl
+
+import akka.pattern.pipe
+import me.arcanis.ffxivbis.models.{Piece, PlayerId}
+import me.arcanis.ffxivbis.service.Database
+
+trait DatabaseLootHandler { this: Database =>
+  import DatabaseLootHandler._
+
+  def lootHandler: Receive = {
+    case AddPieceTo(playerId, piece) =>
+      val client = sender()
+      profile.insertPiece(playerId, piece).pipeTo(client)
+
+    case GetLoot(partyId, maybePlayerId) =>
+      val client = sender()
+      getParty(partyId, withBiS = false, withLoot = true)
+        .map(filterParty(_, maybePlayerId))
+        .pipeTo(client)
+
+    case RemovePieceFrom(playerId, piece) =>
+      val client = sender()
+      profile.deletePiece(playerId, piece).pipeTo(client)
+
+    case SuggestLoot(partyId, piece) =>
+      val client = sender()
+      getParty(partyId, withBiS = true, withLoot = true).map(_.suggestLoot(piece)).pipeTo(client)
+  }
+}
+
+object DatabaseLootHandler {
+  case class AddPieceTo(playerId: PlayerId, piece: Piece) extends Database.DatabaseRequest {
+    override def partyId: String = playerId.partyId
+  }
+  case class GetLoot(partyId: String, playerId: Option[PlayerId]) extends Database.DatabaseRequest
+  case class RemovePieceFrom(playerId: PlayerId, piece: Piece) extends Database.DatabaseRequest {
+    override def partyId: String = playerId.partyId
+  }
+  case class SuggestLoot(partyId: String, piece: Piece) extends Database.DatabaseRequest
+}