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: 17
-      - name: create dist
-        run: make 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: 17
-      - name: run tests
-        run: make tests

.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

Makefile

@@ -1,35 +0,0 @@
-.PHONY: check clean compile dist push tests version
-.DEFAULT_GOAL := compile
-
-PROJECT := ffxivbis
-
-check:
-	sbt scalafmtCheck
-
-clean:
-	sbt clean
-
-compile: clean
-	sbt compile
-
-format:
-	sbt scalafmt
-
-dist: tests version
-	sbt dist
-
-push: dist
-	git add version.sbt
-	git commit -m "Release $(VERSION)"
-	git tag "$(VERSION)"
-	git push
-	git push --tags
-
-tests: compile check
-	sbt test
-
-version:
-ifndef VERSION
-	$(error VERSION is required, but not set)
-endif
-	sed -i '/version := "[0-9.]*/s/[^"][^)]*/version := "$(VERSION)"/' version.sbt

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,34 +1,19 @@
-val AkkaVersion = "2.6.17"
-val AkkaHttpVersion = "10.2.7"
-val ScalaTestVersion = "3.2.10"
-val SlickVersion = "3.3.3"
+libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3"
+libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2"
 
-libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.9"
-libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.4"
+libraryDependencies += "com.typesafe.akka" %% "akka-http"   % "10.1.10"
+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 += "com.typesafe.akka" %% "akka-http-spray-json" % AkkaHttpVersion
-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.5"
+libraryDependencies += "com.lihaoyi" %% "scalatags" % "0.7.0"
 
-libraryDependencies += "io.spray" %%  "spray-json" % "1.3.6"
+libraryDependencies += "com.typesafe.slick" %% "slick" % "3.3.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 += "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"
-libraryDependencies += "com.google.guava" % "guava" % "31.0.1-jre"
-
-
-// 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"
+libraryDependencies += "org.mindrot" % "jbcrypt" % "0.3m"

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/html/bis.html

@@ -1,349 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Best in slot</title>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <link href="/static/favicon.ico" rel="shortcut icon">
-
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous" type="text/css">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css" rel="stylesheet" type="text/css">
-
-    <link href="https://unpkg.com/bootstrap-table@1.19.1/dist/bootstrap-table.min.css" rel="stylesheet" type="text/css">
-
-
-    <link href="https://unpkg.com/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.css" rel="stylesheet" type="text/css">
-
-    <link href="/static/styles.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-    <div class="container">
-        <nav class="navbar navbar-expand-lg justify-content-between align-items-center border-bottom">
-            <a class="navbar-brand" id="navbar-title">Party</a>
-            <ul class="navbar-nav">
-                <a class="nav-item nav-link" id="navbar-bis">best in slot</a>
-                <a class="nav-item nav-link" id="navbar-loot">looted items</a>
-            </ul>
-            <ul class="navbar-nav">
-                <a class="nav-item nav-link" id="navbar-users">users</a>
-            </ul>
-        </nav>
-    </div>
-
-    <div id="alert-placeholder" class="container"></div>
-
-    <div class="container">
-        <h2>Best in slot</h2>
-    </div>
-
-    <div class="container">
-        <div id="toolbar">
-            <button id="update-btn" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#update-bis-dialog" hidden>
-                <i class="bi bi-plus"></i> update
-            </button>
-            <button class="btn btn-secondary" onclick="reload()">
-                <i class="bi bi-arrow-clockwise"></i> reload
-            </button>
-            <button id="remove-btn" class="btn btn-danger" onclick="removePiece()" disabled hidden>
-                <i class="bi bi-trash"></i> remove
-            </button>
-        </div>
-
-        <table id="bis" class="table table-striped table-hover"
-               data-click-to-select="true"
-               data-export-options='{"fileName": "bis"}'
-               data-page-list="[25, 50, 100, all]"
-               data-page-size="25"
-               data-pagination="true"
-               data-resizable="true"
-               data-search="true"
-               data-show-columns="true"
-               data-show-columns-search="true"
-               data-show-columns-toggle-all="true"
-               data-show-export="true"
-               data-show-fullscreen="true"
-               data-show-search-clear-button="true"
-               data-single-select="true"
-               data-sortable="true"
-               data-sort-reset="true"
-               data-toolbar="#toolbar">
-            <thead class="table-primary">
-            <tr>
-                <th data-checkbox="true"></th>
-                <th data-sortable="true" data-switchable="false" data-field="nick">nick</th>
-                <th data-sortable="true" data-switchable="false" data-field="job">job</th>
-                <th data-sortable="true" data-field="piece">piece</th>
-                <th data-sortable="true" data-field="pieceType">piece type</th>
-            </tr>
-            </thead>
-        </table>
-    </div>
-
-    <div id="update-bis-dialog" tabindex="-1" role="dialog" class="modal fade">
-        <div class="modal-dialog" role="document">
-            <form class="modal-content">
-                <div class="modal-header">
-                    <div class="btn-group" role="group" aria-label="Update bis">
-                        <input id="add-piece-btn" name="update-bis" type="radio" class="btn-check" autocomplete="off" checked>
-                        <label class="btn btn-outline-primary" for="add-piece-btn">add piece</label>
-
-                        <input id="update-bis-btn" name="update-bis" type="radio" class="btn-check" autocomplete="off">
-                        <label class="btn btn-outline-primary" for="update-bis-btn">update bis</label>
-                    </div>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
-                </div>
-
-                <div class="modal-body">
-                    <div class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="player">player</label>
-                        <div class="col-sm-8">
-                            <select id="player" name="player" class="form-control" title="player"></select>
-                        </div>
-                    </div>
-                    <div id="piece-row" class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="piece">piece</label>
-                        <div class="col-sm-8">
-                            <select id="piece" name="piece" class="form-control" title="piece"></select>
-                        </div>
-                    </div>
-                    <div id="piece-type-row" class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="piece-type">piece type</label>
-                        <div class="col-sm-8">
-                            <select id="piece-type" name="pieceType" class="form-control" title="piece-type"></select>
-                        </div>
-                    </div>
-                    <div id="bis-link-row" class="form-group row" style="display: none">
-                        <label class="col-sm-4 col-form-label" for="bis-link">link</label>
-                        <div class="col-sm-8">
-                            <input id="bis-link" name="link" class="form-control" placeholder="link to bis" onkeyup="disableSubmitBisButton()">
-                        </div>
-                    </div>
-
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-danger" data-bs-dismiss="modal">close</button>
-                        <button id="submit-add-bis-btn" type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="addPiece()" disabled>add</button>
-                        <button id="submit-update-bis-btn" type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="setBis()" style="display: none" disabled>set</button>
-                    </div>
-                </div>
-            </form>
-        </div>
-    </div>
-
-    <div class="container">
-        <footer class="d-flex flex-wrap justify-content-between align-items-center border-top">
-            <ul class="nav">
-                <li><a class="nav-link" href="/" title="home">home</a></li>
-            </ul>
-
-            <ul class="nav">
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis" title="sources">ffxivbis</a></li>
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis/releases" title="releases list">releases</a></li>
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis/issues" title="issues tracker">report a bug</a></li>
-            </ul>
-        </footer>
-    </div>
-
-    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
-
-    <script src="https://unpkg.com/tableexport.jquery.plugin/tableExport.min.js"></script>
-
-    <script src="https://unpkg.com/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.min.js"></script>
-
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
-    <script src="https://unpkg.com/bootstrap-table@1.19.1/dist/bootstrap-table.min.js"></script>
-
-    <script src="https://unpkg.com/bootstrap-table@1.19.1/dist/extensions/export/bootstrap-table-export.min.js"></script>
-
-    <script src="https://unpkg.com/bootstrap-table@1.19.1/dist/extensions/resizable/bootstrap-table-resizable.js"></script>
-
-    <script src="/static/utils.js"></script>
-    <script src="/static/load.js"></script>
-
-    <script>
-        const [partyId, isReadOnly] = getPartyId();
-        const table = $("#bis");
-        const removeButton = $("#remove-btn");
-        const updateButton = $("#update-btn");
-
-        const submitAddBisButton = $("#submit-add-bis-btn");
-        const submitUpdateBisButton = $("#submit-update-bis-btn");
-        const updateBisDialog = $("#update-bis-dialog");
-
-        const addPieceButton = $("#add-piece-btn");
-        const updateBisButton = $("#update-bis-btn");
-
-        const bisLinkRow = $("#bis-link-row");
-        const pieceRow = $("#piece-row");
-        const pieceTypeRow = $("#piece-type-row");
-
-        const linkInput = $("#bis-link");
-        const pieceInput = $("#piece");
-        const pieceTypeInput = $("#piece-type");
-        const playerInput = $("#player");
-
-        function addPiece() {
-            const player = getCurrentOption(playerInput);
-            $.ajax({
-                url: `/api/v1/party/${partyId}/bis`,
-                data: JSON.stringify({
-                    action: "add",
-                    piece: {
-                        pieceType: pieceTypeInput.val(),
-                        job: player.dataset.job,
-                        piece: pieceInput.val(),
-                    },
-                    playerId: {
-                        partyId: partyId,
-                        nick: player.dataset.nick,
-                        job: player.dataset.job,
-                    },
-                }),
-                type: "POST",
-                contentType: "application/json",
-                success: function (_) { reload(); },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-            });
-        }
-
-        function disableSubmitBisButton() {
-            const nonEmpty = (playerInput.val() !== null);  // well lol
-            submitUpdateBisButton.attr("disabled", !(nonEmpty && linkInput.val()));
-            submitAddBisButton.attr("disabled", !(nonEmpty));
-        }
-
-        function hideControls() {
-            removeButton.attr("hidden", isReadOnly);
-            updateButton.attr("hidden", isReadOnly);
-        }
-
-        function hideLinkPart() {
-            disableSubmitBisButton();
-            bisLinkRow.hide();
-            submitUpdateBisButton.hide();
-            pieceRow.show();
-            pieceTypeRow.show();
-            submitAddBisButton.show();
-        }
-
-        function hidePiecePart() {
-            disableSubmitBisButton();
-            bisLinkRow.show();
-            submitUpdateBisButton.show();
-            pieceRow.hide();
-            pieceTypeRow.hide();
-            submitAddBisButton.hide();
-        }
-
-        function reload() {
-            table.bootstrapTable("showLoading");
-            $.ajax({
-                url: `/api/v1/party/${partyId}`,
-                type: "GET",
-                dataType: "json",
-                success: function (data) {
-                    const items = data.map(function (player) {
-                        return player.bis.map(function (loot) {
-                            return {
-                                nick: player.nick,
-                                job: player.job,
-                                piece: loot.piece,
-                                pieceType: loot.pieceType,
-                            };
-                        });
-                    });
-                    const payload = items.reduce(function (left, right) { return left.concat(right); }, []);
-                    table.bootstrapTable("load", payload);
-                    table.bootstrapTable("uncheckAll");
-                    table.bootstrapTable("hideLoading");
-
-                    const options = data.map(function (player) {
-                        const option = document.createElement("option");
-                        option.innerText = formatPlayerId(player);
-                        option.dataset.nick = player.nick;
-                        option.dataset.job = player.job;
-                        return option;
-                    });
-                    playerInput.empty().append(options);
-                    disableSubmitBisButton();
-                },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-            });
-        }
-
-        function removePiece() {
-            const pieces = table.bootstrapTable("getSelections");
-            pieces.map(function (loot) {
-                $.ajax({
-                    url: `/api/v1/party/${partyId}/bis`,
-                    data: JSON.stringify({
-                        action: "remove",
-                        piece: {
-                            pieceType: loot.pieceType,
-                            job: loot.job,
-                            piece: loot.piece,
-                        },
-                        playerId: {
-                            partyId: partyId,
-                            job: loot.job,
-                            nick: loot.nick,
-                        },
-                    }),
-                    type: "POST",
-                    contentType: "application/json",
-                    success: function (_) { reload(); },
-                    error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-                });
-            });
-        }
-
-        function reset() {
-            if (updateBisButton.is(":checked")) {
-                hidePiecePart();
-            }
-            if (addPieceButton.is(":checked")) {
-                hideLinkPart();
-            }
-        }
-
-        function setBis() {
-            const player = getCurrentOption(playerInput);
-            $.ajax({
-                url: `/api/v1/party/${partyId}/bis`,
-                data: JSON.stringify({
-                    link: linkInput.val(),
-                    playerId: {
-                        partyId: partyId,
-                        nick: player.dataset.nick,
-                        job: player.dataset.job,
-                    },
-                }),
-                type: "PUT",
-                contentType: "application/json",
-                success: function (_) { reload(); },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-            });
-        }
-
-        $(function () {
-            setupFormClear(updateBisDialog, reset);
-            setupRemoveButton(table, removeButton);
-
-            loadHeader(partyId);
-            loadTypes("/api/v1/types/pieces", pieceInput);
-            loadTypes("/api/v1/types/pieces/types", pieceTypeInput);
-
-            hideControls();
-
-            updateBisButton.click(function () { reset(); });
-            addPieceButton.click(function () { reset(); });
-
-            table.bootstrapTable({});
-            reload();
-        });
-    </script>
-
-</body>
-</html>

src/main/resources/html/index.html

@@ -1,183 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>FFXIV loot helper</title>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <link href="/static/favicon.ico" rel="shortcut icon">
-
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous" type="text/css">
-
-    <link href="/static/styles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-
-    <div id="alert-placeholder" class="container"></div>
-
-    <div class="container mb-5">
-        <div class="form-group row">
-            <div class="btn-group" role="group" aria-label="Sign in">
-                <input id="signin-btn" name="signin" type="radio" class="btn-check" autocomplete="off" checked>
-                <label class="btn btn-outline-primary" for="signin-btn">login to existing party</label>
-
-                <input id="signup-btn" name="signin" type="radio" class="btn-check" autocomplete="off">
-                <label class="btn btn-outline-primary" for="signup-btn">create a new party</label>
-            </div>
-        </div>
-    </div>
-
-    <form id="signup-form" class="container mb-5" style="display: none">
-        <div class="form-group row">
-            <label class="col-sm-2 col-form-label" for="alias">party alias</label>
-            <div class="col-sm-10">
-                <input id="alias" name="alias" class="form-control" placeholder="alias">
-            </div>
-        </div>
-        <div class="form-group row">
-            <label class="col-sm-2 col-form-label" for="username">username</label>
-            <div class="col-sm-10">
-                <input id="username" name="username" class="form-control" placeholder="admin user name" onkeyup="disableAddButton()">
-            </div>
-        </div>
-        <div class="form-group row">
-            <label for="password" class="col-sm-2 col-form-label">password</label>
-            <div class="col-sm-10">
-                <input id="password" name="password" type="password" class="form-control" placeholder="admin password" onkeyup="disableAddButton()">
-            </div>
-        </div>
-        <div class="form-group row">
-            <div class="col-sm-10">
-                <button id="add-btn" type="button" class="btn btn-primary" onclick="createParty()" disabled>add</button>
-            </div>
-        </div>
-    </form>
-
-    <form id="signin-form" class="container mb-5">
-        <div class="form-group row">
-            <label class="col-sm-2 col-form-label" for="party-id">party id</label>
-            <div class="col-sm-10">
-                <input id="party-id" name="partyId" class="form-control" placeholder="id" onkeyup="disableRedirectButton()">
-            </div>
-        </div>
-        <div class="form-group row">
-            <div class="col-sm-10">
-                <button id="redirect-btn" type="button" class="btn btn-primary" onclick="redirectToParty()" disabled>go</button>
-            </div>
-        </div>
-    </form>
-
-    <div class="container">
-        <footer class="d-flex flex-wrap justify-content-between align-items-center border-top">
-            <ul class="nav"></ul>
-
-            <ul class="nav">
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis" title="sources">ffxivbis</a></li>
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis/releases" title="releases list">releases</a></li>
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis/issues" title="issues tracker">report a bug</a></li>
-            </ul>
-        </footer>
-    </div>
-
-    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
-
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
-
-    <script>
-        const signinButton = $("#signin-btn");
-        const signupButton = $("#signup-btn");
-
-        const addButton = $("#add-btn");
-        const redirectButton = $("#redirect-btn");
-        const signinForm = $("#signin-form");
-        const signupForm = $("#signup-form");
-
-        const aliasInput = $("#alias");
-        const partyIdInput = $("#party-id");
-        const passwordInput = $("#password");
-        const usernameInput = $("#username");
-
-        function createDescription(partyId) {
-            $.ajax({
-                url: `/api/v1/party/${partyId}/description`,
-                data: JSON.stringify({
-                    partyId: partyId,
-                    partyAlias: aliasInput.val(),
-                }),
-                type: "POST",
-                contentType: "application/json",
-                success: function (_) { doRedirect(partyId); },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-            });
-        }
-
-        function createParty() {
-            $.ajax({
-                url: `/api/v1/party`,
-                data: JSON.stringify({
-                    partyId: "",
-                    username: usernameInput.val(),
-                    password: passwordInput.val(),
-                    permission: "admin",
-                }),
-                type: "PUT",
-                contentType: "application/json",
-                dataType: "json",
-                success: function (data) {
-                    if (aliasInput.val()) {
-                        createDescription(data.partyId);
-                    } else {
-                        doRedirect(data.partyId);
-                    }
-                },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-            });
-        }
-
-        function disableAddButton() {
-            addButton.attr("disabled", !(passwordInput.val() && usernameInput.val()));
-        }
-
-        function disableRedirectButton() {
-            redirectButton.attr("disabled", !partyIdInput.val());
-        }
-
-        function doRedirect(partyId) {
-            location.href = `/party/${partyId}`;
-        }
-
-        function hideSigninPart() {
-            signinForm.hide();
-            signupForm.show();
-        }
-
-        function hideSignupPart() {
-            signinForm.show();
-            signupForm.hide();
-        }
-
-        function redirectToParty() {
-            return doRedirect(partyIdInput.val());
-        }
-
-        function reset() {
-            signinForm.trigger("reset");
-            signupForm.trigger("reset");
-            if (signinButton.is(":checked")) {
-                hideSignupPart();
-            }
-            if (signupButton.is(":checked")) {
-                hideSigninPart();
-            }
-        }
-
-        $(function () {
-            signinButton.click(function () { reset(); });
-            signupButton.click(function () { reset(); });
-        });
-    </script>
-
-</body>
-</html>

src/main/resources/html/loot.html

@@ -1,338 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Loot table</title>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <link href="/static/favicon.ico" rel="shortcut icon">
-
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous" type="text/css">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css" rel="stylesheet" type="text/css">
-
-    <link href="https://unpkg.com/bootstrap-table@1.19.1/dist/bootstrap-table.min.css" rel="stylesheet" type="text/css">
-
-
-    <link href="https://unpkg.com/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.css" rel="stylesheet" type="text/css">
-
-    <link href="/static/styles.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-    <div class="container">
-        <nav class="navbar navbar-expand-lg justify-content-between align-items-center border-bottom">
-            <a class="navbar-brand" id="navbar-title">Party</a>
-            <ul class="navbar-nav">
-                <a class="nav-item nav-link" id="navbar-bis">best in slot</a>
-                <a class="nav-item nav-link" id="navbar-loot">looted items</a>
-            </ul>
-            <ul class="navbar-nav">
-                <a class="nav-item nav-link" id="navbar-users">users</a>
-            </ul>
-        </nav>
-    </div>
-
-    <div id="alert-placeholder" class="container"></div>
-
-    <div class="container">
-        <h2>Looted items</h2>
-    </div>
-
-    <div class="container">
-        <div id="toolbar">
-            <button id="add-btn" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#add-loot-dialog" hidden>
-                <i class="bi bi-plus"></i> add
-            </button>
-            <button class="btn btn-secondary" onclick="reload()">
-                <i class="bi bi-arrow-clockwise"></i> reload
-            </button>
-            <button id="remove-btn" class="btn btn-danger" onclick="removeLoot()" disabled hidden>
-                <i class="bi bi-trash"></i> remove
-            </button>
-        </div>
-
-        <table id="loot" class="table table-striped table-hover"
-               data-click-to-select="true"
-               data-export-options='{"fileName": "loot"}'
-               data-page-list="[25, 50, 100, all]"
-               data-page-size="25"
-               data-pagination="true"
-               data-resizable="true"
-               data-search="true"
-               data-show-columns="true"
-               data-show-columns-search="true"
-               data-show-columns-toggle-all="true"
-               data-show-export="true"
-               data-show-fullscreen="true"
-               data-show-search-clear-button="true"
-               data-single-select="true"
-               data-sortable="true"
-               data-sort-reset="true"
-               data-toolbar="#toolbar">
-            <thead class="table-primary">
-            <tr>
-                <th data-checkbox="true"></th>
-                <th data-sortable="true" data-switchable="false" data-field="nick">nick</th>
-                <th data-sortable="true" data-switchable="false" data-field="job">job</th>
-                <th data-sortable="true" data-field="piece">piece</th>
-                <th data-sortable="true" data-field="pieceType">piece type</th>
-                <th data-sortable="true" data-field="isFreeLoot">is free loot</th>
-                <th data-sortable="true" data-field="timestamp">date</th>
-            </tr>
-            </thead>
-        </table>
-    </div>
-
-    <div id="add-loot-dialog" tabindex="-1" role="dialog" class="modal fade">
-        <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h4 class="modal-title">add looted piece</h4>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
-                </div>
-
-                <form class="modal-body">
-                    <div class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="player">player</label>
-                        <div class="col-sm-8">
-                            <select id="player" name="player" class="form-control" title="player"></select>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="piece">piece</label>
-                        <div class="col-sm-8">
-                            <select id="piece" name="piece" class="form-control" title="piece"></select>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="piece-type">piece type</label>
-                        <div class="col-sm-8">
-                            <select id="piece-type" name="pieceType" class="form-control" title="pieceType"></select>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="job">job</label>
-                        <div class="col-sm-8">
-                            <select id="job" name="job" class="form-control" title="job"></select>
-                        </div>
-                    </div>
-
-                    <table id="stats" class="table table-striped table-hover">
-                        <thead class="table-primary">
-                        <tr>
-                            <th data-field="nick">nick</th>
-                            <th data-field="job">job</th>
-                            <th data-field="isRequired">required</th>
-                            <th data-field="lootCount">these pieces looted</th>
-                            <th data-field="lootCountBiS">total bis pieces looted</th>
-                            <th data-field="lootCountTotal">total pieces looted</th>
-                        </tr>
-                        </thead>
-                    </table>
-                </form>
-
-                <div class="modal-footer">
-                    <div class="form-check form-switch">
-                        <input id="free-loot" name="freeLoot" type="checkbox" class="form-check-input">
-                        <label class="form-check-label" for="free-loot">as free loot</label>
-                    </div>
-                    <button type="button" class="btn btn-danger" data-bs-dismiss="modal">close</button>
-                    <button type="button" class="btn btn-secondary" onclick="suggestLoot()">suggest</button>
-                    <button id="submit-btn" type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="addLoot()" disabled>add</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="container">
-        <footer class="d-flex flex-wrap justify-content-between align-items-center border-top">
-            <ul class="nav">
-                <li><a class="nav-link" href="/" title="home">home</a></li>
-            </ul>
-
-            <ul class="nav">
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis" title="sources">ffxivbis</a></li>
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis/releases" title="releases list">releases</a></li>
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis/issues" title="issues tracker">report a bug</a></li>
-            </ul>
-        </footer>
-    </div>
-
-    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
-
-    <script src="https://unpkg.com/tableexport.jquery.plugin/tableExport.min.js"></script>
-
-    <script src="https://unpkg.com/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.min.js"></script>
-
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
-    <script src="https://unpkg.com/bootstrap-table@1.19.1/dist/bootstrap-table.min.js"></script>
-
-    <script src="https://unpkg.com/bootstrap-table@1.19.1/dist/extensions/export/bootstrap-table-export.min.js"></script>
-
-    <script src="https://unpkg.com/bootstrap-table@1.19.1/dist/extensions/resizable/bootstrap-table-resizable.js"></script>
-
-    <script src="/static/utils.js"></script>
-    <script src="/static/load.js"></script>
-
-    <script>
-        const [partyId, isReadOnly] = getPartyId();
-        const table = $("#loot");
-        const stats = $("#stats");
-        const addButton = $("#add-btn");
-        const removeButton = $("#remove-btn");
-
-        const submitLootButton = $("#submit-btn");
-        const addLootDialog = $("#add-loot-dialog");
-
-        const freeLootInput = $("#free-loot");
-        const jobInput = $("#job");
-        const pieceInput = $("#piece");
-        const pieceTypeInput = $("#piece-type");
-        const playerInput = $("#player");
-
-        function addLoot() {
-            const player = getCurrentOption(playerInput);
-            $.ajax({
-                url: `/api/v1/party/${partyId}/loot`,
-                data: JSON.stringify({
-                    action: "add",
-                    piece: {
-                        pieceType: pieceTypeInput.val(),
-                        job: player.dataset.job,
-                        piece: pieceInput.val(),
-                    },
-                    playerId: {
-                        partyId: partyId,
-                        nick: player.dataset.nick,
-                        job: player.dataset.job,
-                    },
-                    isFreeLoot: freeLootInput.is(":checked"),
-                }),
-                type: "POST",
-                contentType: "application/json",
-                success: function (_) { reload(); },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-            });
-        }
-
-        function hideControls() {
-            addButton.attr("hidden", isReadOnly);
-            removeButton.attr("hidden", isReadOnly);
-        }
-
-        function reload() {
-            table.bootstrapTable("showLoading");
-            $.ajax({
-                url: `/api/v1/party/${partyId}`,
-                type: "GET",
-                dataType: "json",
-                success: function (data) {
-                    const items = data.map(function (player) {
-                        return player.loot.map(function (loot) {
-                            return {
-                                nick: player.nick,
-                                job: player.job,
-                                piece: loot.piece.piece,
-                                pieceType: loot.piece.pieceType,
-                                isFreeLoot: loot.isFreeLoot ? "yes" : "no",
-                                timestamp: loot.timestamp,
-                            };
-                        });
-                    });
-                    const payload = items.reduce(function (left, right) { return left.concat(right); }, []);
-                    table.bootstrapTable("load", payload);
-                    table.bootstrapTable("uncheckAll");
-                    table.bootstrapTable("hideLoading");
-
-                    const options = data.map(function (player) {
-                        const option = document.createElement("option");
-                        option.innerText = formatPlayerId(player);
-                        option.dataset.nick = player.nick;
-                        option.dataset.job = player.job;
-                        return option;
-                    });
-                    playerInput.empty().append(options);
-                    submitLootButton.attr("disabled", options.length === 0);
-                },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-            });
-        }
-
-        function removeLoot() {
-            const pieces = table.bootstrapTable("getSelections");
-            pieces.map(function (loot) {
-                $.ajax({
-                    url: `/api/v1/party/${partyId}/loot`,
-                    data: JSON.stringify({
-                        action: "remove",
-                        piece: {
-                            pieceType: loot.pieceType,
-                            job: loot.job,
-                            piece: loot.piece,
-                        },
-                        playerId: {
-                            partyId: partyId,
-                            nick: loot.nick,
-                            job: loot.job,
-                        },
-                        isFreeLoot: loot.isFreeLoot === "yes",
-                    }),
-                    type: "POST",
-                    contentType: "application/json",
-                    success: function (_) { reload(); },
-                    error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-                });
-            });
-        }
-
-        function suggestLoot() {
-            stats.bootstrapTable("showLoading");
-            $.ajax({
-                url: `/api/v1/party/${partyId}/loot`,
-                data: JSON.stringify({
-                    pieceType: pieceTypeInput.val(),
-                    job: jobInput.val(),
-                    piece: pieceInput.val(),
-                }),
-                type: "PUT",
-                contentType: "application/json",
-                dataType: "json",
-                success: function (data) {
-                    const payload = data.map(function (stat) {
-                        return {
-                            nick: stat.nick,
-                            job: stat.job,
-                            isRequired: stat.isRequired,
-                            lootCount: stat.lootCount,
-                            lootCountBiS: stat.lootCountBiS,
-                            lootCountTotal: stat.lootCountTotal,
-                        };
-                    });
-                    stats.bootstrapTable("load", payload);
-                    stats.bootstrapTable("uncheckAll");
-                    stats.bootstrapTable("hideLoading");
-                },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-            });
-        }
-
-        $(function () {
-            setupFormClear(addLootDialog);
-            setupRemoveButton(table, removeButton);
-
-            loadHeader(partyId);
-            loadTypes("/api/v1/types/jobs/all", jobInput);
-            loadTypes("/api/v1/types/pieces", pieceInput);
-            loadTypes("/api/v1/types/pieces/types", pieceTypeInput);
-
-            hideControls();
-
-            table.bootstrapTable({});
-            stats.bootstrapTable({});
-            reload();
-        });
-    </script>
-
-</body>
-</html>

src/main/resources/html/party.html

@@ -1,258 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>FFXIV loot helper</title>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <link href="/static/favicon.ico" rel="shortcut icon">
-
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous" type="text/css">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css" rel="stylesheet" type="text/css">
-
-    <link href="https://unpkg.com/bootstrap-table@1.19.1/dist/bootstrap-table.min.css" rel="stylesheet" type="text/css">
-
-
-    <link href="https://unpkg.com/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.css" rel="stylesheet" type="text/css">
-
-    <link href="/static/styles.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-    <div class="container">
-        <nav class="navbar navbar-expand-lg justify-content-between align-items-center border-bottom">
-            <a class="navbar-brand" id="navbar-title">Party</a>
-            <ul class="navbar-nav">
-                <a class="nav-item nav-link" id="navbar-bis">best in slot</a>
-                <a class="nav-item nav-link" id="navbar-loot">looted items</a>
-            </ul>
-            <ul class="navbar-nav">
-                <a class="nav-item nav-link" id="navbar-users">users</a>
-            </ul>
-        </nav>
-    </div>
-
-    <div id="alert-placeholder" class="container"></div>
-
-    <div class="container">
-        <div id="toolbar">
-            <button id="add-btn" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#add-player-dialog" hidden>
-                <i class="bi bi-plus"></i> add
-            </button>
-            <button class="btn btn-secondary" onclick="reload()">
-                <i class="bi bi-arrow-clockwise"></i> reload
-            </button>
-            <button id="remove-btn" class="btn btn-danger" onclick="removePlayers()" disabled hidden>
-                <i class="bi bi-trash"></i> remove
-            </button>
-        </div>
-
-        <table id="players" class="table table-striped table-hover"
-               data-click-to-select="true"
-               data-export-options='{"fileName": "players"}'
-               data-page-list="[25, 50, 100, all]"
-               data-page-size="25"
-               data-pagination="true"
-               data-resizable="true"
-               data-search="true"
-               data-show-columns="true"
-               data-show-columns-search="true"
-               data-show-columns-toggle-all="true"
-               data-show-export="true"
-               data-show-fullscreen="true"
-               data-show-search-clear-button="true"
-               data-single-select="true"
-               data-sortable="true"
-               data-sort-reset="true"
-               data-toolbar="#toolbar">
-            <thead class="table-primary">
-                <tr>
-                    <th data-checkbox="true"></th>
-                    <th data-sortable="true" data-switchable="false" data-field="nick">nick</th>
-                    <th data-sortable="true" data-field="job">job</th>
-                    <th data-sortable="true" data-field="link" data-formatter="bisLinkFormatter">best in slot link</th>
-                    <th data-sortable="true" data-field="lootCountBiS">total bis pieces looted</th>
-                    <th data-sortable="true" data-field="lootCountTotal">total pieces looted</th>
-                    <th data-sortable="true" data-field="priority">priority</th>
-                </tr>
-            </thead>
-        </table>
-    </div>
-
-    <div id="add-player-dialog" tabindex="-1" role="dialog" class="modal fade">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h4 class="modal-title">add new player</h4>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
-                </div>
-
-                <form class="modal-body">
-                    <div class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="nick">player name</label>
-                        <div class="col-sm-8">
-                            <input id="nick" name="nick" class="form-control" placeholder="nick" onkeyup="disableAddPlayerForm()">
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="job">player job</label>
-                        <div class="col-sm-8">
-                            <select id="job" name="job" class="form-control" title="job"></select>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="link">link to best in slot</label>
-                        <div class="col-sm-8">
-                            <input id="link" name="link" class="form-control" placeholder="link to bis">
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="priority">priority</label>
-                        <div class="col-sm-8">
-                            <input id="priority" name="priority" type="number" class="form-control" value="0">
-                        </div>
-                    </div>
-                </form>
-
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-danger" data-bs-dismiss="modal">close</button>
-                    <button id="submit-player-btn" type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="addPlayer()" disabled>add</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="container">
-        <footer class="d-flex flex-wrap justify-content-between align-items-center border-top">
-            <ul class="nav">
-                <li><a class="nav-link" href="/" title="home">home</a></li>
-            </ul>
-
-            <ul class="nav">
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis" title="sources">ffxivbis</a></li>
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis/releases" title="releases list">releases</a></li>
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis/issues" title="issues tracker">report a bug</a></li>
-            </ul>
-        </footer>
-    </div>
-
-    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
-
-    <script src="https://unpkg.com/tableexport.jquery.plugin/tableExport.min.js"></script>
-
-    <script src="https://unpkg.com/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.min.js"></script>
-
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
-    <script src="https://unpkg.com/bootstrap-table@1.19.1/dist/bootstrap-table.min.js"></script>
-
-    <script src="https://unpkg.com/bootstrap-table@1.19.1/dist/extensions/export/bootstrap-table-export.min.js"></script>
-
-    <script src="https://unpkg.com/bootstrap-table@1.19.1/dist/extensions/resizable/bootstrap-table-resizable.js"></script>
-
-    <script src="/static/utils.js"></script>
-    <script src="/static/load.js"></script>
-
-    <script>
-        const [partyId, isReadOnly] = getPartyId();
-        const table = $("#players");
-        const addButton = $("#add-btn");
-        const removeButton = $("#remove-btn");
-
-        const addPlayerDialog = $("#add-player-dialog");
-        const submitPlayerButton = $("#submit-player-btn");
-
-        const jobInput = $("#job");
-        const linkInput = $("#link");
-        const nickInput = $("#nick");
-        const priorityInput = $("#priority");
-
-        function addPlayer() {
-            $.ajax({
-                url: `/api/v1/party/${partyId}`,
-                data: JSON.stringify({
-                    action: "add",
-                    playerId: {
-                        partyId: partyId,
-                        job: jobInput.val(),
-                        nick: nickInput.val(),
-                        link: linkInput.val() || null,
-                        priority: parseInt(priorityInput.val(), 10),
-                    },
-                }),
-                type: "POST",
-                contentType: "application/json",
-                success: function (_) { reload(); },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-            });
-        }
-
-        function bisLinkFormatter(link, row) {
-            if (link) {
-                return `<a href="${safe(link)}" title="${safe(row.nick)} best in slot for ${safe(row.job)}">${safe(link)}</a>`;
-            } else {
-                return "-";
-            }
-        }
-
-        function disableAddPlayerForm() {
-            submitPlayerButton.attr("disabled", !nickInput.val());
-        }
-
-        function hideControls() {
-            addButton.attr("hidden", isReadOnly);
-            removeButton.attr("hidden", isReadOnly);
-        }
-
-        function reload() {
-            table.bootstrapTable("showLoading");
-            $.ajax({
-                url: `/api/v1/party/${partyId}`,
-                type: "GET",
-                dataType: "json",
-                success: function (data) {
-                    table.bootstrapTable("load", data);
-                    table.bootstrapTable("uncheckAll");
-                    table.bootstrapTable("hideLoading");
-                },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-            });
-        }
-
-        function removePlayers() {
-            const players = table.bootstrapTable("getSelections");
-            players.map(function (player) {
-                $.ajax({
-                    url: `/api/v1/party/${partyId}`,
-                    data: JSON.stringify({
-                        action: "remove",
-                        playerId: {
-                            partyId: partyId,
-                            job: player.job,
-                            nick: player.nick,
-                        },
-                    }),
-                    type: "POST",
-                    contentType: "application/json",
-                    success: function (_) { reload(); },
-                    error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-                });
-            });
-        }
-
-        $(function () {
-            setupFormClear(addPlayerDialog);
-            setupRemoveButton(table, removeButton);
-
-            loadHeader(partyId);
-            loadTypes("/api/v1/types/jobs", jobInput);
-
-            hideControls();
-
-            table.bootstrapTable({});
-            reload();
-        });
-    </script>
-
-</body>
-</html>

src/main/resources/html/redoc.html

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>FFXIV loot helper API</title>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,700|Roboto:300,400,700" rel="stylesheet" type="text/css">
-
-    <link href="/static/favicon.ico" rel="shortcut icon">
-</head>
-<body>
-
-    <redoc spec-url="/api-docs/swagger.json"></redoc>
-    <script src="https://cdn.jsdelivr.net/npm/redoc@next/bundles/redoc.standalone.js"> </script>
-
-</body>
-</html>

src/main/resources/html/users.html

@@ -1,230 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>User management</title>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <link href="/static/favicon.ico" rel="shortcut icon">
-
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous" type="text/css">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css" rel="stylesheet" type="text/css">
-
-    <link href="https://unpkg.com/bootstrap-table@1.19.1/dist/bootstrap-table.min.css" rel="stylesheet" type="text/css">
-
-
-    <link href="https://unpkg.com/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.css" rel="stylesheet" type="text/css">
-
-    <link href="/static/styles.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-    <div class="container">
-        <nav class="navbar navbar-expand-lg justify-content-between align-items-center border-bottom">
-            <a class="navbar-brand" id="navbar-title">Party</a>
-            <ul class="navbar-nav">
-                <a class="nav-item nav-link" id="navbar-bis">best in slot</a>
-                <a class="nav-item nav-link" id="navbar-loot">looted items</a>
-            </ul>
-            <ul class="navbar-nav">
-                <a class="nav-item nav-link" id="navbar-users">users</a>
-            </ul>
-        </nav>
-    </div>
-
-    <div id="alert-placeholder" class="container"></div>
-
-    <div class="container">
-        <h2>Users</h2>
-    </div>
-
-    <div class="container">
-        <div id="toolbar">
-            <button id="add-btn" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#add-user-dialog" hidden>
-                <i class="bi bi-plus"></i> add
-            </button>
-            <button class="btn btn-secondary" onclick="reload()">
-                <i class="bi bi-arrow-clockwise"></i> reload
-            </button>
-            <button id="remove-btn" class="btn btn-danger" onclick="removeUsers()" disabled hidden>
-                <i class="bi bi-trash"></i> remove
-            </button>
-        </div>
-
-        <table id="users" class="table table-striped table-hover"
-               data-click-to-select="true"
-               data-export-options='{"fileName": "users"}'
-               data-page-list="[25, 50, 100, all]"
-               data-page-size="25"
-               data-pagination="true"
-               data-resizable="true"
-               data-search="true"
-               data-show-columns="true"
-               data-show-columns-search="true"
-               data-show-columns-toggle-all="true"
-               data-show-export="true"
-               data-show-fullscreen="true"
-               data-show-search-clear-button="true"
-               data-single-select="true"
-               data-sortable="true"
-               data-sort-reset="true"
-               data-toolbar="#toolbar">
-            <thead class="table-primary">
-            <tr>
-                <th data-checkbox="true"></th>
-                <th data-sortable="true" data-switchable="false" data-field="username">username</th>
-                <th data-sortable="true" data-field="permission">permission</th>
-            </tr>
-            </thead>
-        </table>
-    </div>
-
-    <div id="add-user-dialog" tabindex="-1" role="dialog" class="modal fade">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h4 class="modal-title">add new user</h4>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
-                </div>
-
-                <form class="modal-body">
-                    <div class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="username">login</label>
-                        <div class="col-sm-8">
-                            <input id="username" name="username" class="form-control" placeholder="username" onkeyup="disableAddUserForm()">
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="password">password</label>
-                        <div class="col-sm-8">
-                            <input id="password" name="password" type="password" class="form-control" placeholder="password" onkeyup="disableAddUserForm()">
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label class="col-sm-4 col-form-label" for="permission">permission</label>
-                        <div class="col-sm-8">
-                            <select id="permission" name="permission" class="form-control" title="permission"></select>
-                        </div>
-                    </div>
-                </form>
-
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-danger" data-bs-dismiss="modal">close</button>
-                    <button id="submit-btn" type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="addUser()" disabled>add</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="container">
-        <footer class="d-flex flex-wrap justify-content-between align-items-center border-top">
-            <ul class="nav">
-                <li><a class="nav-link" href="/" title="home">home</a></li>
-            </ul>
-
-            <ul class="nav">
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis" title="sources">ffxivbis</a></li>
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis/releases" title="releases list">releases</a></li>
-                <li><a class="nav-link" href="https://github.com/arcan1s/ffxivbis/issues" title="issues tracker">report a bug</a></li>
-            </ul>
-        </footer>
-    </div>
-
-    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
-
-    <script src="https://unpkg.com/tableexport.jquery.plugin/tableExport.min.js"></script>
-
-    <script src="https://unpkg.com/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.min.js"></script>
-
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
-    <script src="https://unpkg.com/bootstrap-table@1.19.1/dist/bootstrap-table.min.js"></script>
-
-    <script src="https://unpkg.com/bootstrap-table@1.19.1/dist/extensions/export/bootstrap-table-export.min.js"></script>
-
-    <script src="https://unpkg.com/bootstrap-table@1.19.1/dist/extensions/resizable/bootstrap-table-resizable.js"></script>
-
-    <script src="/static/utils.js"></script>
-    <script src="/static/load.js"></script>
-
-    <script>
-        const [partyId, isReadOnly] = getPartyId();
-        const table = $("#users");
-        const addButton = $("#add-btn");
-        const removeButton = $("#remove-btn");
-
-        const addUserDialog = $("#add-user-dialog");
-        const submitUserButton = $("#submit-btn");
-
-        const usernameInput = $("#username");
-        const passwordInput = $("#password");
-        const permissionInput = $("#permission");
-
-        function addUser() {
-            $.ajax({
-                url: `/api/v1/party/${partyId}/users`,
-                data: JSON.stringify({
-                    partyId: partyId,
-                    username: usernameInput.val(),
-                    password: passwordInput.val(),
-                    permission: permissionInput.val(),
-                }),
-                type: "POST",
-                contentType: "application/json",
-                success: function (_) { reload(); },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-            });
-        }
-
-        function disableAddUserForm() {
-            submitUserButton.attr("disabled", !(usernameInput.val() && passwordInput.val()));
-        }
-
-        function hideControls() {
-            addButton.attr("hidden", isReadOnly);
-            removeButton.attr("hidden", isReadOnly);
-        }
-
-        function reload() {
-            table.bootstrapTable("showLoading");
-            $.ajax({
-                url: `/api/v1/party/${partyId}/users`,
-                type: "GET",
-                dataType: "json",
-                success: function (data) {
-                    table.bootstrapTable("load", data);
-                    table.bootstrapTable("uncheckAll");
-                    table.bootstrapTable("hideLoading");
-                },
-                error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-            });
-        }
-
-        function removeUsers() {
-            const users = table.bootstrapTable("getSelections");
-            users.map(function (user) {
-                $.ajax({
-                    url: `/api/v1/party/${partyId}/users/${user.username}`,
-                    type: "DELETE",
-                    success: function (_) { reload(); },
-                    error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-                });
-            });
-        }
-
-        $(function () {
-            setupFormClear(addUserDialog);
-            setupRemoveButton(table, removeButton);
-
-            loadHeader(partyId);
-            loadTypes("/api/v1/types/permissions", permissionInput);
-
-            hideControls();
-
-            table.bootstrapTable({});
-            reload();
-        });
-    </script>
-
-</body>
-</html>

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,71 +1,67 @@
 me.arcanis.ffxivbis {
+  ariyala {
+    # ariyala base url, string, required
+    ariyala-url = "https://ffxiv.ariyala.com"
+    # xivapi base url, string, required
+    xivapi-url = "https://xivapi.com"
+    # xivapi developer key, string, optional
+    #xivapi-key = "abcdef"
+  }
 
-    bis-provider {
-        include "item_data.json"
+  database {
+    # database section. Section must be declared inside
+    # for more detailed section descriptions refer to slick documentation
+    mode = "sqlite"
 
-        # xivapi base url, string, required
-        xivapi-url = "https://xivapi.com"
-        # xivapi developer key, string, optional
-        #xivapi-key = "abcdef"
+    sqlite {
+      profile = "slick.jdbc.SQLiteProfile$"
+      db {
+        url = "jdbc:sqlite:ffxivbis.db"
+        user = "user"
+        password = "password"
+      }
+      numThreads = 10
     }
 
-    database {
-        # database section. Section must be declared inside
-        # for more detailed section descriptions refer to slick documentation
-        mode = "sqlite"
+    postgresql {
+      profile = "slick.jdbc.PostgresProfile$"
+      db {
+        url = "jdbc:postgresql://localhost/ffxivbis"
+        user = "ffxivbis"
+        password = "ffxivbis"
 
-        sqlite {
-            profile = "slick.jdbc.SQLiteProfile$"
-            db {
-                url = "jdbc:sqlite:ffxivbis.db"
-                #user = "user"
-                #password = "password"
-            }
-            numThreads = 10
-        }
-
-        postgresql {
-            profile = "slick.jdbc.PostgresProfile$"
-            db {
-                url = "jdbc:postgresql://localhost/ffxivbis"
-                #user = "ffxivbis"
-                #password = "ffxivbis"
-
-                connectionPool = disabled
-                keepAliveConnection = yes
-            }
-            numThreads = 10
-        }
+        connectionPool = disabled
+        keepAliveConnection = yes
+      }
+      numThreads = 10
     }
+  }
 
-    settings {
-        # counters of Player class which will be called to sort players for loot priority
-        # list of strings, required
-        priority = [
-            "isRequired", "lootCountBiS", "priority", "lootCount", "lootCountTotal"
-        ]
-        # general request timeout, duratin, required
-        request-timeout = 10s
-        # party in-memory storage lifetime
-        cache-timeout = 1m
+  settings {
+    # counters of Player class which will be called to sort players for loot priority
+    # list of strings, required
+    priority = [
+      "isRequired", "lootCountBiS", "priority", "lootCount", "lootCountTotal"
+    ]
+    # general request timeout, duratin, required
+    request-timeout = 10s
+    # party in-memory storage lifetime
+    cache-timeout = 1m
+  }
+
+  web {
+    # address to bind, string, required
+    host = "127.0.0.1"
+    # port to bind, int, required
+    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
     }
-
-    web {
-        # address to bind, string, required
-        host = "127.0.0.1"
-        # port to bind, int, required
-        port = 8000
-        # hostname to use in docs, if not set host:port will be used
-        #hostname = "127.0.0.1:8000"
-        # enable head requests for GET requests
-        enable-head-requests = yes
-
-        authorization-cache {
-            # maximum amount of cached logins
-            cache-size = 1024
-            # ttl of cached logins
-            cache-timeout = 1m
-        }
   }
 
   default-dispatcher {

src/main/resources/static/load.js

@@ -1,54 +0,0 @@
-function loadHeader(partyId) {
-    const title = $("#navbar-title");
-
-    // because I don't know how to handle relative url if current does not end with slash
-    title.attr("href", `/party/${partyId}`);
-    $("#navbar-bis").attr("href", `/party/${partyId}/bis`);
-    $("#navbar-loot").attr("href", `/party/${partyId}/loot`);
-    $("#navbar-users").attr("href", `/party/${partyId}/users`);
-
-    $.ajax({
-        url: `/api/v1/party/${partyId}/description`,
-        type: "GET",
-        dataType: "json",
-        success: function (resp) {
-            title.text(safe(resp.partyAlias || partyId));
-        },
-        error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-    });
-}
-
-function loadTypes(url, selector) {
-    $.ajax({
-        url: url,
-        type: "GET",
-        dataType: "json",
-        success: function (data) {
-            const options = data.map(function (name) {
-                const option = document.createElement("option");
-                option.value = name;
-                option.innerText = name;
-                return option;
-            });
-            selector.empty().append(options);
-        },
-        error: function (jqXHR, _, errorThrown) { requestAlert(jqXHR, errorThrown); },
-    });
-}
-
-function setupFormClear(dialog, reset) {
-    dialog.on("shown.bs.modal", function () {
-        $(this).find("form").trigger("reset");
-        $(this).find("table").bootstrapTable("removeAll");
-        if (reset) {
-            reset();
-        }
-    });
-}
-
-function setupRemoveButton(table, removeButton) {
-    table.on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table",
-        function () {
-            removeButton.prop("disabled", !table.bootstrapTable("getSelections").length);
-        });
-}

src/main/resources/static/styles.css

@@ -0,0 +1,277 @@
+/* in-text images */
+figure.img {
+    float: right;
+    border: 0px solid #333;
+    padding: 0px;
+    margin: 5px 0px 5px 10px;
+}
+figure.img img {
+    max-width: 100%;
+    height: auto;
+}
+figure.img figcaption {
+    margin: 0px;
+    font-size: 90%;
+    font-style: italic;
+    text-align: center;
+}
+
+h1 .octicon-link, h2 .octicon-link, h3 .octicon-link, h4 .octicon-link, h5 .octicon-link, h6 .octicon-link {
+    display: none;
+    color: #222222;
+    vertical-align: middle;
+}
+
+h1:hover .anchor, h2:hover .anchor, h3:hover .anchor, h4:hover .anchor, h5:hover .anchor, h6:hover .anchor{
+    padding-left: 8px;
+    margin-left: -24px;
+    text-decoration: none;
+}
+
+h1:hover .anchor .octicon-link, h2:hover .anchor .octicon-link, h3:hover .anchor .octicon-link, h4:hover .anchor .octicon-link, h5:hover .anchor .octicon-link, h6:hover .anchor .octicon-link {
+    display: inline-block;
+}
+
+body {
+    padding: 50px;
+    font: 14px/1.5 "Liberation Sans", Helvetica, Arial, sans-serif;
+    color: #555555;
+    background: #eaeaea
+}
+
+h1, h2, h3, h4, h5, h6 {
+    color: #222222;
+    margin: 0 0 20px;
+}
+
+p, ul, ol, table, pre, dl {
+    margin: 0 0 20px;
+    text-align: justify;
+}
+
+h1, h2, h3 {
+    line-height: 1.1;
+}
+
+h1 {
+    font-size: 28px;
+}
+
+h2 {
+    color: #393939;
+}
+
+h3, h4, h5, h6 {
+    color: #494949;
+}
+
+a {
+    color: #3399cc;
+    font-weight: 350;
+    text-decoration: none;
+}
+
+a small {
+    font-size: 11px;
+    color: #777777;
+    margin-top: -0.6em;
+    display: block;
+}
+
+.wrapper {
+    width: 80%;
+    margin: 0 auto;
+}
+
+blockquote {
+    border-left: 1px solid #ffffff;
+    margin: 0;
+    padding: 0 0 0 20px;
+    font-style: italic;
+}
+
+code, pre {
+    font-family: "Liberation Mono", Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal;
+    color: #222222;
+    font-size: 12px;
+}
+
+pre {
+    padding: 8px 15px;
+    border-radius: 5px;
+    border: 1px solid #e5e5e5;
+    overflow-x: auto;
+    overflow-y: auto;
+}
+
+input, select{
+    box-sizing: border-box;
+}
+
+table {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+th, td {
+    padding: 5px 10px;
+    border-bottom: 1px solid #ffffff;
+}
+
+td {
+    text-align: justify;
+}
+
+dt {
+    color: #444444;
+    font-weight: 700;
+}
+
+th {
+    text-align: left;
+    color: #444444;
+}
+
+img {
+    max-width: 100%;
+}
+
+header {
+    width: 20%;
+    float: left;
+    position: fixed;
+}
+
+header ul {
+    list-style: none;
+    height: 40px;
+    padding: 0;
+    background: #eeeeee;
+    border-radius: 5px;
+    border: 1px solid #d2d2d2;
+    box-shadow: inset #fff 0 1px 0, inset rgba(0,0,0,0.03) 0 -1px 0;
+    width: 15%;
+}
+
+header li {
+    width: 8%;
+    float: left;
+    border-right: 1px solid #d2d2d2;
+    height: 40px;
+}
+
+header ul a {
+    line-height: 1;
+    font-size: 11px;
+    color: #999999;
+    display: block;
+    text-align: center;
+    padding-top: 6px;
+    height: 40px;
+}
+
+strong {
+    color: #222222;
+    font-weight: 700;
+}
+
+header ul li + li {
+    width: 8%;
+    border-left: 1px solid #ffffff;
+}
+
+header ul li + li + li {
+    width: 8%;
+    border-right: none;
+}
+
+header ul a strong {
+    font-size: 14px;
+    display: block;
+    color: #222222;
+}
+
+section {
+    width: 70%;
+    float: right;
+    padding-bottom: 50px;
+}
+
+small {
+    font-size: 11px;
+}
+
+hr {
+    border: 0;
+    background: #ffffff;
+    height: 1px;
+    margin: 0 0 20px;
+}
+
+footer {
+    width: 20%;
+    float: left;
+    position: fixed;
+    bottom: 50px;
+}
+
+@media print, screen and (max-width: 960px) {
+    div.wrapper {
+        width: auto;
+        margin: 0;
+    }
+    header, section, footer {
+        float: none;
+        position: static;
+        width: auto;
+    }
+    header {
+        padding-right: 320px;
+    }
+    section {
+        border: 1px solid #e5e5e5;
+        border-width: 1px 0;
+        padding: 20px 0;
+        margin: 0 0 20px;
+    }
+    header a small {
+        display: inline;
+    }
+    header ul {
+        position: absolute;
+        right: 50px;
+        top: 52px;
+    }
+}
+
+@media print, screen and (max-width: 720px) {
+    body {
+        word-wrap: break-word;
+    }
+    header {
+        padding: 0;
+    }
+    header ul, header p.view {
+        position: static;
+    }
+    pre, code {
+        word-wrap: normal;
+    }
+}
+
+@media print, screen and (max-width: 480px) {
+    body {
+        padding: 15px;
+    }
+    header ul {
+        display: none;
+    }
+}
+
+@media print {
+    body {
+        padding: 0.4in;
+        font-size: 12pt;
+        color: #444444;
+    }
+}

src/main/resources/static/table_export.js

@@ -0,0 +1,31 @@
+function downloadCsv(csv, filename) {
+    var csvFile = new Blob([csv], {"type": "text/csv"});
+
+    var downloadLink = document.createElement("a");
+    downloadLink.download = filename;
+    downloadLink.href = window.URL.createObjectURL(csvFile);
+    downloadLink.style.display = "none";
+
+    document.body.appendChild(downloadLink);
+    downloadLink.click();
+}
+
+function exportTableToCsv(filename) {
+    var table = document.getElementById("result");
+    var rows = table.getElementsByTagName("tr");
+
+    var csv = [];
+    for (var i = 0; i < rows.length; i++) {
+        if (rows[i].style.display === "none")
+            continue;
+        var cols = rows[i].querySelectorAll("td, th");
+
+        var row = [];
+        for (var j = 0; j < cols.length; j++)
+            row.push(cols[j].innerText);
+
+        csv.push(row.join(","));
+    }
+
+    downloadCsv(csv.join("\n"), filename);
+}

src/main/resources/static/table_search.js

@@ -0,0 +1,21 @@
+function searchTable() {
+    var input = document.getElementById("search");
+    var filter = input.value.toLowerCase();
+    var table = document.getElementById("result");
+    var tr = table.getElementsByTagName("tr");
+
+    // from 1 coz of header
+    for (var i = 1; i < tr.length; i++) {
+        var td = tr[i].getElementsByClassName("include_search");
+        var display = "none";
+        for (var j = 0; j < td.length; j++) {
+            if (td[j].tagName.toLowerCase() === "td") {
+                if (td[j].innerHTML.toLowerCase().indexOf(filter) > -1) {
+                    display = "";
+                    break;
+                }
+            }
+        }
+        tr[i].style.display = display;
+    }
+}

src/main/resources/static/utils.js

@@ -1,44 +0,0 @@
-function createAlert(message, placeholder) {
-    const wrapper = document.createElement('div');
-    wrapper.innerHTML = `<div class="alert alert-danger alert-dismissible" role="alert">${safe(message)}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>`;
-    placeholder.append(wrapper);
-}
-
-function formatPlayerId(obj) {
-    return `${obj.nick} (${obj.job})`;
-}
-
-function getCurrentOption(select) {
-    return select.find(":selected")[0];
-}
-
-function getPartyId() {
-    const request = new XMLHttpRequest();
-    request.open("HEAD", document.location, false);
-    request.send(null);
-
-    // tuple lol
-    return [
-        request.getResponseHeader("X-Party-Id"),
-        request.getResponseHeader("X-User-Permission") === "get",
-    ]
-}
-
-function requestAlert(jqXHR, errorThrown) {
-    let message;
-    try {
-        message = $.parseJSON(jqXHR.responseText).message;
-    } catch (_) {
-        message = errorThrown;
-    }
-    const alert = $("#alert-placeholder");
-    createAlert(`Error during request: ${message}`, alert);
-}
-
-function safe(string) {
-    return String(string)
-        .replace(/&/g, "&amp;")
-        .replace(/</g, "&lt;")
-        .replace(/>/g, "&gt;")
-        .replace(/"/g, "&quot;");
-}

src/main/resources/swagger-info/description.md

@@ -11,8 +11,6 @@ REST json API description to interact with FFXIVBiS service.
 
 # Limitations
 
-No limitations for the API so far.
-
 # Authentication
 
 For the most party utils service requires user to be authenticated. User permission can be one of `get`, `post` or `admin`.

src/main/resources/swagger/index.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>ReDoc</title>
+    <!-- needed for adaptive design -->
+    <meta charset="utf-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,700|Roboto:300,400,700" rel="stylesheet">
+
+    <!--
+    ReDoc doesn't change outer page styles
+    -->
+    <style>
+        body {
+            margin: 0;
+            padding: 0;
+        }
+    </style>
+</head>
+<body>
+<redoc spec-url='/api-docs/swagger.json'></redoc>
+<script src="https://cdn.jsdelivr.net/npm/redoc@next/bundles/redoc.standalone.js"> </script>
+</body>
+</html>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -8,66 +8,45 @@
  */
 package me.arcanis.ffxivbis
 
-import akka.actor.typed.scaladsl.{AbstractBehavior, ActorContext, Behaviors}
-import akka.actor.typed.{Behavior, PostStop, Signal}
+import akka.actor.{Actor, Props}
 import akka.http.scaladsl.Http
-import akka.http.scaladsl.server.Route
-import akka.stream.Materializer
+import akka.stream.ActorMaterializer
 import com.typesafe.scalalogging.StrictLogging
 import me.arcanis.ffxivbis.http.RootEndpoint
-import me.arcanis.ffxivbis.service.PartyService
-import me.arcanis.ffxivbis.service.bis.BisProvider
-import me.arcanis.ffxivbis.service.database.Database
+import me.arcanis.ffxivbis.service.impl.DatabaseImpl
+import me.arcanis.ffxivbis.service.{Ariyala, PartyService}
 import me.arcanis.ffxivbis.storage.Migration
 
-import scala.concurrent.ExecutionContext
-import scala.jdk.CollectionConverters._
+import scala.concurrent.duration.Duration
+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")
-  startApplication()
+  private val config = context.system.settings.config
+  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 =>
-    logger.info("root supervisor stopped")
-    Behaviors.same
-  }
+  Migration(config).onComplete {
+    case Success(_) =>
+      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 = {
-    val config = context.system.settings.config
-    val host = config.getString("me.arcanis.ffxivbis.web.host")
-    val port = config.getInt("me.arcanis.ffxivbis.web.port")
+      logger.info(s"start server at $host:$port")
+      val bind = Http()(context.system).bindAndHandle(http.route, host, port)
+      Await.result(context.system.whenTerminated, Duration.Inf)
+      bind.foreach(_.unbind())
 
-    implicit val executionContext: ExecutionContext = context.system.executionContext
-    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()
-    }
+    case Failure(exception) => throw exception
   }
 }
 
 object Application {
-
-  def apply(): Behavior[Nothing] =
-    Behaviors.setup[Nothing](context => new Application(context))
+  def props: Props = Props(new Application)
 }

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

@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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
-
-import com.typesafe.config.{Config, ConfigFactory, ConfigValueFactory}
-
-object Configuration {
-
-  def load(): Config = {
-    val root = ConfigFactory.load()
-    root
-      .withValue(
-        "akka.http.server.transparent-head-requests",
-        ConfigValueFactory.fromAnyRef(root.getBoolean("me.arcanis.ffxivbis.web.enable-head-requests"))
-      )
-  }
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -8,10 +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 =
-    ActorSystem[Nothing](Application(), "ffxivbis", Configuration.load())
+  def main(args: Array[String]): Unit = {
+    val config = ConfigFactory.load()
+    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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -8,20 +8,25 @@
  */
 package me.arcanis.ffxivbis.http
 
+import akka.actor.ActorRef
 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.models.{Permission, User}
+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 auth: AuthorizationProvider
+  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 {
@@ -34,26 +39,23 @@ trait Authorization {
     }
   }
 
-  def authAdmin(partyId: String)(username: String, password: String)(implicit
-    executionContext: ExecutionContext
-  ): Future[Option[User]] =
-    authenticator(Permission.admin, partyId)(username, password)
-
-  def authGet(partyId: String)(username: String, password: String)(implicit
-    executionContext: ExecutionContext
-  ): Future[Option[User]] =
-    authenticator(Permission.get, partyId)(username, password)
-
-  def authPost(partyId: String)(username: String, password: String)(implicit
-    executionContext: ExecutionContext
-  ): Future[Option[User]] =
-    authenticator(Permission.post, partyId)(username, password)
-
-  private def authenticator(scope: Permission.Value, partyId: String)(username: String, password: String)(implicit
-    executionContext: ExecutionContext
-  ): Future[Option[User]] =
-    auth.get(partyId, username).map {
-      case Some(user) if user.verify(password) && user.verityScope(scope) => Some(user)
+  def authenticator(scope: Permission.Value)(partyId: String)
+                   (username: String, password: String)
+                   (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Option[String]] =
+    (storage ? DatabaseUserHandler.GetUser(partyId, username)).mapTo[Option[User]].map {
+      case Some(user) if user.verify(password) && user.verityScope(scope) => Some(username)
       case _ => None
     }
+
+  def authAdmin(partyId: String)(username: String, password: String)
+               (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Option[String]] =
+    authenticator(Permission.admin)(partyId)(username, password)
+
+  def authGet(partyId: String)(username: String, password: String)
+             (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Option[String]] =
+    authenticator(Permission.get)(partyId)(username, password)
+
+  def authPost(partyId: String)(username: String, password: String)
+              (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Option[String]] =
+    authenticator(Permission.post)(partyId)(username, password)
 }

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

@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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.scaladsl.AskPattern.Askable
-import akka.actor.typed.{ActorRef, Scheduler}
-import akka.util.Timeout
-import com.google.common.cache.{CacheBuilder, CacheLoader, LoadingCache}
-import com.typesafe.config.Config
-import me.arcanis.ffxivbis.messages.{GetUser, Message}
-import me.arcanis.ffxivbis.models.User
-
-import java.util.concurrent.TimeUnit
-import scala.concurrent.Future
-
-trait AuthorizationProvider {
-
-  def get(partyId: String, username: String): Future[Option[User]]
-}
-
-object AuthorizationProvider {
-
-  def apply(config: Config, storage: ActorRef[Message], timeout: Timeout, scheduler: Scheduler): AuthorizationProvider =
-    new AuthorizationProvider {
-      private val cacheSize = config.getInt("me.arcanis.ffxivbis.web.authorization-cache.cache-size")
-      private val cacheTimeout =
-        config.getDuration("me.arcanis.ffxivbis.web.authorization-cache.cache-timeout", TimeUnit.MILLISECONDS)
-
-      private val cache: LoadingCache[(String, String), Future[Option[User]]] = CacheBuilder
-        .newBuilder()
-        .expireAfterWrite(cacheTimeout, TimeUnit.MILLISECONDS)
-        .maximumSize(cacheSize)
-        .build(
-          new CacheLoader[(String, String), Future[Option[User]]] {
-            override def load(key: (String, String)): Future[Option[User]] = {
-              val (partyId, username) = key
-              storage.ask(GetUser(partyId, username, _))(timeout, scheduler)
-            }
-          }
-        )
-
-      override def get(partyId: String, username: String): Future[Option[User]] =
-        cache.get((partyId, username))
-    }
-}

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

@@ -0,0 +1,47 @@
+/*
+ * 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.http.api.v1.json.ApiAction
+import me.arcanis.ffxivbis.models.{Piece, Player, PlayerId}
+import me.arcanis.ffxivbis.service.impl.DatabaseBiSHandler
+
+import scala.concurrent.{ExecutionContext, Future}
+
+class BiSHelper(storage: ActorRef, ariyala: ActorRef) extends AriyalaHelper(ariyala) {
+
+  def addPieceBiS(playerId: PlayerId, piece: Piece)
+                 (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    (storage ? DatabaseBiSHandler.AddPieceToBis(playerId, piece.withJob(playerId.job))).mapTo[Int]
+
+  def bis(partyId: String, playerId: Option[PlayerId])
+         (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Seq[Player]] =
+    (storage ? DatabaseBiSHandler.GetBiS(partyId, playerId)).mapTo[Seq[Player]]
+
+  def doModifyBiS(action: ApiAction.Value, playerId: PlayerId, piece: Piece)
+                 (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    action match {
+      case ApiAction.add => addPieceBiS(playerId, piece)
+      case ApiAction.remove => removePieceBiS(playerId, piece)
+    }
+
+  def putBiS(playerId: PlayerId, link: String)
+            (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Unit] =
+    downloadBiS(link, playerId.job).flatMap { bis =>
+      Future.traverse(bis.pieces)(addPieceBiS(playerId, _))
+    }.map(_ => ())
+
+  def removePieceBiS(playerId: PlayerId, piece: Piece)
+                    (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    (storage ? DatabaseBiSHandler.RemovePieceFromBiS(playerId, piece)).mapTo[Int]
+
+}

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

@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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.http.scaladsl.model.headers.{`User-Agent`, Authorization, BasicHttpCredentials, Referer}
-import akka.http.scaladsl.server.Directive0
-import akka.http.scaladsl.server.Directives.{extractClientIP, extractRequestContext, mapResponse, optionalHeaderValueByType}
-import com.typesafe.scalalogging.Logger
-
-import java.time.{Instant, ZoneId}
-import java.time.format.DateTimeFormatter
-import java.util.Locale
-
-trait HttpLog {
-
-  private val httpLogger = Logger("http")
-
-  def withHttpLog: Directive0 =
-    extractRequestContext.flatMap { context =>
-      val request = s"${context.request.method.name()} ${context.request.uri.path}"
-
-      extractClientIP.flatMap { maybeRemoteAddr =>
-        val remoteAddr = maybeRemoteAddr.toIP.getOrElse("-")
-
-        optionalHeaderValueByType(Referer).flatMap { maybeReferer =>
-          val referer = maybeReferer.map(_.uri).getOrElse("-")
-
-          optionalHeaderValueByType(`User-Agent`).flatMap { maybeUserAgent =>
-            val userAgent = maybeUserAgent.map(_.products.map(_.toString()).mkString(" ")).getOrElse("-")
-
-            optionalHeaderValueByType(Authorization).flatMap { maybeAuth =>
-              val remoteUser = maybeAuth
-                .map(_.credentials)
-                .collect { case BasicHttpCredentials(username, _) =>
-                  username
-                }
-                .getOrElse("-")
-
-              val start = Instant.now.toEpochMilli
-              val timeLocal = HttpLog.httpLogDatetimeFormatter.format(Instant.now)
-
-              mapResponse { response =>
-                val time = (Instant.now.toEpochMilli - start) / 1000.0
-
-                val status = response.status.intValue()
-                val bytesSent = response.entity.getContentLengthOption.getAsLong
-
-                httpLogger.debug(
-                  s"""$remoteAddr - $remoteUser [$timeLocal] "$request" $status $bytesSent "$referer" "$userAgent" $time"""
-                )
-                response
-              }
-            }
-          }
-        }
-      }
-    }
-
-}
-
-object HttpLog {
-
-  val httpLogDatetimeFormatter: DateTimeFormatter =
-    DateTimeFormatter
-      .ofPattern("dd/MMM/uuuu:HH:mm:ss xx  ")
-      .withLocale(Locale.UK)
-      .withZone(ZoneId.systemDefault())
-}

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

@@ -0,0 +1,45 @@
+/*
+ * 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.http.api.v1.json.ApiAction
+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}
+
+class LootHelper(storage: ActorRef) {
+
+  def addPieceLoot(playerId: PlayerId, piece: Piece)
+                  (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    (storage ? DatabaseLootHandler.AddPieceTo(playerId, piece)).mapTo[Int]
+
+  def doModifyLoot(action: ApiAction.Value, playerId: PlayerId, piece: Piece)
+                  (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    action match {
+      case ApiAction.add => addPieceLoot(playerId, piece)
+      case ApiAction.remove => removePieceLoot(playerId, piece)
+    }
+
+  def loot(partyId: String, playerId: Option[PlayerId])
+          (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Seq[Player]] =
+    (storage ? DatabaseLootHandler.GetLoot(partyId, playerId)).mapTo[Seq[Player]]
+
+  def removePieceLoot(playerId: PlayerId, piece: Piece)
+                     (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    (storage ? DatabaseLootHandler.RemovePieceFrom(playerId, piece)).mapTo[Int]
+
+  def suggestPiece(partyId: String, piece: Piece)
+                  (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Seq[PlayerIdWithCounters]] =
+    (storage ? DatabaseLootHandler.SuggestLoot(partyId, piece)).mapTo[LootSelectorResult].map(_.result)
+}

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

@@ -0,0 +1,53 @@
+/*
+ * 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.http.api.v1.json.ApiAction
+import me.arcanis.ffxivbis.models.{Party, Player, PlayerId}
+import me.arcanis.ffxivbis.service.impl.{DatabaseBiSHandler, DatabasePartyHandler}
+
+import scala.concurrent.{ExecutionContext, Future}
+
+class PlayerHelper(storage: ActorRef, ariyala: ActorRef) extends AriyalaHelper(ariyala) {
+
+  def addPlayer(player: Player)
+               (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    (storage ? DatabasePartyHandler.AddPlayer(player)).mapTo[Int].map { res =>
+      player.link match {
+        case Some(link) =>
+          downloadBiS(link, player.job).map { bis =>
+            bis.pieces.map(storage ? DatabaseBiSHandler.AddPieceToBis(player.playerId, _))
+          }.map(_ => res)
+        case None => Future.successful(res)
+      }
+    }.flatten
+
+  def doModifyPlayer(action: ApiAction.Value, player: Player)
+                    (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    action match {
+      case ApiAction.add => addPlayer(player)
+      case ApiAction.remove => removePlayer(player.playerId)
+    }
+
+  def getPlayers(partyId: String, maybePlayerId: Option[PlayerId])
+                (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Seq[Player]] =
+    maybePlayerId match {
+      case Some(playerId) =>
+        (storage ? DatabasePartyHandler.GetPlayer(playerId)).mapTo[Option[Player]].map(_.toSeq)
+      case None =>
+        (storage ? DatabasePartyHandler.GetParty(partyId)).mapTo[Party].map(_.players.values.toSeq)
+    }
+
+  def removePlayer(playerId: PlayerId)
+                  (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    (storage ? DatabasePartyHandler.RemovePlayer(playerId)).mapTo[Int]
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -8,53 +8,64 @@
  */
 package me.arcanis.ffxivbis.http
 
-import akka.actor.typed.{ActorRef, ActorSystem, Scheduler}
+import java.time.Instant
+
+import akka.actor.{ActorRef, ActorSystem}
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
 import akka.util.Timeout
-import com.typesafe.scalalogging.StrictLogging
+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])
-  extends StrictLogging
-  with HttpLog {
+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")
+  implicit val timeout: Timeout =
+    config.getDuration("me.arcanis.ffxivbis.settings.request-timeout")
 
-  private val auth = AuthorizationProvider(config, storage, timeout, scheduler)
+  private val rootApiV1Endpoint: RootApiV1Endpoint = new RootApiV1Endpoint(storage, ariyala, config)
+  private val rootView: RootView = new RootView(storage, ariyala)
+  private val swagger: Swagger = new Swagger(config)
+  private val httpLogger = Logger("http")
 
-  private val rootApiV1Endpoint = new RootApiV1Endpoint(storage, auth, provider, config)
-  private val rootView = new RootView(auth)
-  private val swagger = new Swagger(config)
-
-  def route: Route =
-    withHttpLog {
-      ignoreTrailingSlash {
-        apiRoute ~ htmlRoute ~ swagger.routes ~ swaggerUIRoute
+  private val withHttpLog: Directive0 =
+    extractRequestContext.flatMap { context =>
+      val start = Instant.now.toEpochMilli
+      mapResponse { response =>
+        val time = (Instant.now.toEpochMilli - start) / 1000.0
+        httpLogger.debug(s"""- - [${Instant.now}] "${context.request.method.name()} ${context.request.uri.path}" ${response.status.intValue()} ${response.entity.getContentLengthOption.getAsLong} $time""")
+        response
       }
     }
 
+  def route: Route =
+    withHttpLog {
+      apiRoute ~ htmlRoute ~ swagger.routes ~ swaggerUIRoute
+    }
+
   private def apiRoute: Route =
-    pathPrefix("api") {
-      pathPrefix(Segment) {
-        case "v1" => rootApiV1Endpoint.route
-        case _ => reject
+    ignoreTrailingSlash {
+      pathPrefix("api") {
+        pathPrefix(Segment) {
+          case "v1" => rootApiV1Endpoint.route
+          case _ => reject
+        }
       }
     }
 
   private def htmlRoute: Route =
-    pathPrefix("static") {
-      getFromResourceDirectory("static")
-    } ~ rootView.route
+    ignoreTrailingSlash {
+      pathPrefix("static") {
+        getFromResourceDirectory("static")
+      } ~ rootView.route
+    }
 
   private def swaggerUIRoute: Route =
-    path("api-docs") {
-      getFromResource("html/redoc.html")
-    }
+    path("swagger") {
+      getFromResource("swagger/index.html")
+    } ~ getFromResourceDirectory("swagger")
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -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.LootEndpoint],
-    classOf[api.v1.PartyEndpoint],
-    classOf[api.v1.PlayerEndpoint],
-    classOf[api.v1.TypesEndpoint],
+    classOf[api.v1.BiSEndpoint], classOf[api.v1.LootEndpoint],
+    classOf[api.v1.PlayerEndpoint], classOf[api.v1.TypesEndpoint],
     classOf[api.v1.UserEndpoint]
   )
 

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

@@ -0,0 +1,40 @@
+/*
+ * 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.User
+import me.arcanis.ffxivbis.service.PartyService
+import me.arcanis.ffxivbis.service.impl.DatabaseUserHandler
+
+import scala.concurrent.{ExecutionContext, Future}
+
+class UserHelper(storage: ActorRef) {
+
+  def addUser(user: User, isHashedPassword: Boolean)
+             (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    (storage ? DatabaseUserHandler.AddUser(user, isHashedPassword)).mapTo[Int]
+
+  def newPartyId(implicit executionContext: ExecutionContext, timeout: Timeout): Future[String] =
+    (storage ? PartyService.GetNewPartyId).mapTo[String]
+
+  def user(partyId: String, username: String)
+          (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Option[User]] =
+    (storage ? DatabaseUserHandler.GetUser(partyId, username)).mapTo[Option[User]]
+
+  def users(partyId: String)
+           (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Seq[User]] =
+    (storage ? DatabaseUserHandler.GetUsers(partyId)).mapTo[Seq[User]]
+
+  def removeUser(partyId: String, username: String)
+                (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Int] =
+    (storage ? DatabaseUserHandler.DeleteUser(partyId, username)).mapTo[Int]
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -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,65 +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.helpers.BiSHelper
-import me.arcanis.ffxivbis.http.{Authorization, AuthorizationProvider}
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, Message}
+import me.arcanis.ffxivbis.http.{Authorization, BiSHelper}
 import me.arcanis.ffxivbis.models.PlayerId
 
 import scala.util.{Failure, Success}
 
-@Path("/api/v1")
-class BiSEndpoint(
-  override val storage: ActorRef[Message],
-  override val provider: ActorRef[BiSProviderMessage],
-  override val auth: AuthorizationProvider
-)(implicit
-  timeout: Timeout,
-  scheduler: Scheduler
-) extends BiSHelper
-  with Authorization
-  with JsonSupport {
+@Path("api/v1")
+class BiSEndpoint(override val storage: ActorRef, ariyala: ActorRef)(implicit timeout: Timeout)
+  extends BiSHelper(storage, ariyala) with Authorization with JsonSupport {
 
   def route: Route = createBiS ~ getBiS ~ modifyBiS
 
   @PUT
   @Path("party/{partyId}/bis")
   @Consumes(value = Array("application/json"))
-  @Operation(
-    summary = "create best in slot",
-    description = "Create the best in slot set",
+  @Operation(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(
-      description = "player best in slot description",
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[PlayerBiSLinkModel])))
-    ),
+    requestBody = new RequestBody(description = "player best in slot description", 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(
-        responseCode = "400",
-        description = "Invalid parameters were supplied",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
+      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("best in slot"),
@@ -87,10 +60,11 @@ class BiSEndpoint(
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
           put {
-            entity(as[PlayerBiSLinkModel]) { bisLink =>
+            entity(as[PlayerBiSLinkResponse]) { bisLink =>
               val playerId = bisLink.playerId.withPartyId(partyId)
-              onSuccess(putBiS(playerId, bisLink.link)) {
-                complete(StatusCodes.Created, HttpEntity.Empty)
+              onComplete(putBiS(playerId, bisLink.link)) {
+                case Success(_) => complete(StatusCodes.Created, HttpEntity.Empty)
+                case Failure(exception) => throw exception
               }
             }
           }
@@ -101,44 +75,23 @@ class BiSEndpoint(
   @GET
   @Path("party/{partyId}/bis")
   @Produces(value = Array("application/json"))
-  @Operation(
-    summary = "get best in slot",
-    description = "Return the best in slot items",
+  @Operation(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(
-        name = "nick",
-        in = ParameterIn.QUERY,
-        description = "player nick name to filter",
-        example = "Siuan Sanche"
-      ),
+      new Parameter(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(
-        responseCode = "200",
-        description = "Best in slot",
-        content = Array(
-          new Content(
-            array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerModel]))
-          )
-        )
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
+      new ApiResponse(responseCode = "200", description = "Best in slot",
+        content = Array(new Content(
+          array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerResponse]))
+        ))),
+      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("best in slot"),
@@ -150,8 +103,9 @@ class BiSEndpoint(
           get {
             parameters("nick".as[String].?, "job".as[String].?) { (maybeNick, maybeJob) =>
               val playerId = PlayerId(partyId, maybeNick, maybeJob)
-              onSuccess(bis(partyId, playerId)) { response =>
-                complete(response.map(PlayerModel.fromPlayer))
+              onComplete(bis(partyId, playerId)) {
+                case Success(response) => complete(response.map(PlayerResponse.fromPlayer))
+                case Failure(exception) => throw exception
               }
             }
           }
@@ -163,39 +117,22 @@ class BiSEndpoint(
   @POST
   @Path("party/{partyId}/bis")
   @Consumes(value = Array("application/json"))
-  @Operation(
-    summary = "modify best in slot",
-    description = "Add or remove an item from the best in slot",
+  @Operation(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(
-      description = "action and piece description",
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[PieceActionModel])))
-    ),
+    requestBody = new RequestBody(description = "action and piece description", 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(
-        responseCode = "400",
-        description = "Invalid parameters were supplied",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
+      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("best in slot"),
@@ -205,10 +142,11 @@ class BiSEndpoint(
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
           post {
-            entity(as[PieceActionModel]) { action =>
+            entity(as[PieceActionResponse]) { action =>
               val playerId = action.playerId.withPartyId(partyId)
-              onSuccess(doModifyBiS(action.action, playerId, action.piece.toPiece)) {
-                complete(StatusCodes.Accepted, HttpEntity.Empty)
+              onComplete(doModifyBiS(action.action, playerId, action.piece.toPiece)) {
+                case Success(_) => complete(StatusCodes.Accepted, HttpEntity.Empty)
+                case Failure(exception) => throw exception
               }
             }
           }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -17,21 +17,21 @@ import spray.json._
 
 trait HttpHandler extends StrictLogging { this: JsonSupport =>
 
-  def exceptionHandler: ExceptionHandler = ExceptionHandler {
+  implicit def exceptionHandler: ExceptionHandler = ExceptionHandler {
     case ex: IllegalArgumentException =>
-      complete(StatusCodes.BadRequest, ErrorModel(ex.getMessage))
+      complete(StatusCodes.BadRequest, ErrorResponse(ex.getMessage))
 
     case other: Exception =>
       logger.error("exception during request completion", other)
-      complete(StatusCodes.InternalServerError, ErrorModel("unknown server error"))
+      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 = ErrorModel(entity.data.utf8String).toJson
-          response.withEntity(HttpEntity(ContentTypes.`application/json`, message.compactPrint))
+          val message = ErrorResponse(entity.data.utf8String).toJson
+          response.copy(entity = HttpEntity(ContentTypes.`application/json`, message.compactPrint))
         case other => other
       }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -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.helpers.LootHelper
-import me.arcanis.ffxivbis.http.{Authorization, AuthorizationProvider}
-import me.arcanis.ffxivbis.messages.Message
+import me.arcanis.ffxivbis.http.{Authorization, LootHelper}
 import me.arcanis.ffxivbis.models.PlayerId
 
 import scala.util.{Failure, Success}
 
-@Path("/api/v1")
-class LootEndpoint(override val storage: ActorRef[Message], override val auth: AuthorizationProvider)(implicit
-  timeout: Timeout,
-  scheduler: Scheduler
-) extends LootHelper
-  with Authorization
-  with JsonSupport
-  with HttpHandler {
+@Path("api/v1")
+class LootEndpoint(override val storage: ActorRef)(implicit timeout: Timeout)
+  extends LootHelper(storage) with Authorization with JsonSupport with HttpHandler {
 
-  def route: Route = getLoot ~ modifyLoot ~ suggestLoot
+  def route: Route = getLoot ~ modifyLoot
 
   @GET
   @Path("party/{partyId}/loot")
   @Produces(value = Array("application/json"))
-  @Operation(
-    summary = "get loot list",
-    description = "Return the looted items",
+  @Operation(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(
-        name = "nick",
-        in = ParameterIn.QUERY,
-        description = "player nick name to filter",
-        example = "Siuan Sanche"
-      ),
+      new Parameter(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(
-        responseCode = "200",
-        description = "Loot list",
-        content = Array(
-          new Content(
-            array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerModel]))
-          )
-        )
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
+      new ApiResponse(responseCode = "200", description = "Loot list",
+        content = Array(new Content(
+          array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerResponse]))
+        ))),
+      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"),
@@ -91,8 +63,9 @@ class LootEndpoint(override val storage: ActorRef[Message], override val auth: A
           get {
             parameters("nick".as[String].?, "job".as[String].?) { (maybeNick, maybeJob) =>
               val playerId = PlayerId(partyId, maybeNick, maybeJob)
-              onSuccess(loot(partyId, playerId)) { response =>
-                complete(response.map(PlayerModel.fromPlayer))
+              onComplete(loot(partyId, playerId)) {
+                case Success(response) => complete(response.map(PlayerResponse.fromPlayer))
+                case Failure(exception) => throw exception
               }
             }
           }
@@ -103,39 +76,22 @@ class LootEndpoint(override val storage: ActorRef[Message], override val auth: A
   @POST
   @Consumes(value = Array("application/json"))
   @Path("party/{partyId}/loot")
-  @Operation(
-    summary = "modify loot list",
-    description = "Add or remove an item from the loot list",
+  @Operation(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(
-      description = "action and piece description",
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[PieceActionModel])))
-    ),
+    requestBody = new RequestBody(description = "action and piece description", 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(
-        responseCode = "400",
-        description = "Invalid parameters were supplied",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
+      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("loot"),
@@ -145,10 +101,11 @@ class LootEndpoint(override val storage: ActorRef[Message], override val auth: A
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
           post {
-            entity(as[PieceActionModel]) { action =>
+            entity(as[PieceActionResponse]) { action =>
               val playerId = action.playerId.withPartyId(partyId)
-              onSuccess(doModifyLoot(action.action, playerId, action.piece.toPiece, action.isFreeLoot)) {
-                complete(StatusCodes.Accepted, HttpEntity.Empty)
+              onComplete(doModifyLoot(action.action, playerId, action.piece.toPiece)) {
+                case Success(_) => complete(StatusCodes.Accepted, HttpEntity.Empty)
+                case Failure(exception) => throw exception
               }
             }
           }
@@ -160,47 +117,25 @@ class LootEndpoint(override val storage: ActorRef[Message], override val auth: A
   @Path("party/{partyId}/loot")
   @Consumes(value = Array("application/json"))
   @Produces(value = Array("application/json"))
-  @Operation(
-    summary = "suggest loot",
-    description = "Suggest loot piece to party",
+  @Operation(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(
-      description = "piece description",
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[PieceModel])))
-    ),
+    requestBody = new RequestBody(description = "piece description", required = true,
+      content = Array(new Content(schema = new Schema(implementation = classOf[PieceResponse])))),
     responses = Array(
-      new ApiResponse(
-        responseCode = "200",
-        description = "Players with counters ordered by priority to get this item",
-        content = Array(
-          new Content(
-            array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerIdWithCountersModel])),
-          )
-        )
-      ),
-      new ApiResponse(
-        responseCode = "400",
-        description = "Invalid parameters were supplied",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
+      new ApiResponse(responseCode = "200", description = "Players with counters ordered by priority to get this item",
+        content = Array(new Content(
+          array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerIdWithCountersResponse])),
+        ))),
+      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("get"))),
     tags = Array("loot"),
@@ -210,9 +145,10 @@ class LootEndpoint(override val storage: ActorRef[Message], override val auth: A
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
           put {
-            entity(as[PieceModel]) { piece =>
-              onSuccess(suggestPiece(partyId, piece.toPiece)) { response =>
-                complete(response.map(PlayerIdWithCountersModel.fromPlayerId))
+            entity(as[PieceResponse]) { piece =>
+              onComplete(suggestPiece(partyId, piece.toPiece)) {
+                case Success(response) => complete(response.map(PlayerIdWithCountersResponse.fromPlayerId))
+                case Failure(exception) => throw exception
               }
             }
           }

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

@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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.helpers.PlayerHelper
-import me.arcanis.ffxivbis.http.{Authorization, AuthorizationProvider}
-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],
-  override val auth: AuthorizationProvider
-)(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[PartyDescriptionModel])))
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-    ),
-    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 {
-            onSuccess(getPartyDescription(partyId)) { response =>
-              complete(PartyDescriptionModel.fromDescription(response))
-            }
-          }
-        }
-      }
-    }
-
-  @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[PartyDescriptionModel])))
-    ),
-    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[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-    ),
-    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[PartyDescriptionModel]) { partyDescription =>
-              val description = partyDescription.copy(partyId = partyId)
-              onSuccess(updateDescription(description.toDescription)) {
-                complete(StatusCodes.Accepted, HttpEntity.Empty)
-              }
-            }
-          }
-        }
-      }
-    }
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -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,71 +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.helpers.PlayerHelper
-import me.arcanis.ffxivbis.http.{Authorization, AuthorizationProvider}
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, Message}
+import me.arcanis.ffxivbis.http.{Authorization, PlayerHelper}
 import me.arcanis.ffxivbis.models.PlayerId
 
 import scala.util.{Failure, Success}
 
-@Path("/api/v1")
-class PlayerEndpoint(
-  override val storage: ActorRef[Message],
-  override val provider: ActorRef[BiSProviderMessage],
-  override val auth: AuthorizationProvider
-)(implicit
-  timeout: Timeout,
-  scheduler: Scheduler
-) extends PlayerHelper
-  with Authorization
-  with JsonSupport
-  with HttpHandler {
+@Path("api/v1")
+class PlayerEndpoint(override val storage: ActorRef, ariyala: ActorRef)(implicit timeout: Timeout)
+  extends PlayerHelper(storage, ariyala) with Authorization with JsonSupport with HttpHandler {
 
-  def route: Route = getParty ~ getPartyStats ~ modifyParty
+  def route: Route = getParty ~ modifyParty
 
   @GET
   @Path("party/{partyId}")
   @Produces(value = Array("application/json"))
-  @Operation(
-    summary = "get party",
-    description = "Return the players who belong to the party",
+  @Operation(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(
-        name = "nick",
-        in = ParameterIn.QUERY,
-        description = "player nick name to filter",
-        example = "Siuan Sanche"
-      ),
+      new Parameter(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(
-        responseCode = "200",
-        description = "Players list",
-        content = Array(
-          new Content(
-            array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerModel])),
-          )
-        )
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
+      new ApiResponse(responseCode = "200", description = "Players list",
+        content = Array(new Content(
+          array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerResponse])),
+        ))),
+      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"),
@@ -95,69 +63,9 @@ class PlayerEndpoint(
           get {
             parameters("nick".as[String].?, "job".as[String].?) { (maybeNick, maybeJob) =>
               val playerId = PlayerId(partyId, maybeNick, maybeJob)
-              onSuccess(getPlayers(partyId, playerId)) { response =>
-                complete(response.map(PlayerModel.fromPlayer))
-              }
-            }
-          }
-        }
-      }
-    }
-
-  @GET
-  @Path("party/{partyId}/stats")
-  @Produces(value = Array("application/json"))
-  @Operation(
-    summary = "get party statistics",
-    description = "Return the party statistics",
-    parameters = Array(
-      new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
-      new Parameter(
-        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(
-        responseCode = "200",
-        description = "Party loot statistics",
-        content = Array(
-          new Content(
-            array = new ArraySchema(schema = new Schema(implementation = classOf[PlayerIdWithCountersModel])),
-          )
-        )
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-    ),
-    security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("get"))),
-    tags = Array("party"),
-  )
-  def getPartyStats: Route =
-    path("party" / Segment / "stats") { partyId =>
-      extractExecutionContext { implicit executionContext =>
-        authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
-          get {
-            parameters("nick".as[String].?, "job".as[String].?) { (maybeNick, maybeJob) =>
-              val playerId = PlayerId(partyId, maybeNick, maybeJob)
-              onSuccess(getPlayers(partyId, playerId)) { response =>
-                complete(response.map(player => PlayerIdWithCountersModel.fromPlayerId(player.withCounters(None))))
+              onComplete(getPlayers(partyId, playerId)) {
+                case Success(response) => complete(response.map(PlayerResponse.fromPlayer))
+                case Failure(exception) => throw exception
               }
             }
           }
@@ -168,39 +76,22 @@ class PlayerEndpoint(
   @POST
   @Path("party/{partyId}")
   @Consumes(value = Array("application/json"))
-  @Operation(
-    summary = "modify party",
-    description = "Add or remove a player from party list",
+  @Operation(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(
-      description = "player description",
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[PlayerActionModel])))
-    ),
+    requestBody = new RequestBody(description = "player description", 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(
-        responseCode = "400",
-        description = "Invalid parameters were supplied",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
+      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"),
@@ -209,12 +100,11 @@ class PlayerEndpoint(
     path("party" / Segment) { partyId =>
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
-          post {
-            entity(as[PlayerActionModel]) { action =>
-              val player = action.playerId.toPlayer.copy(partyId = partyId)
-              onSuccess(doModifyPlayer(action.action, player)) {
-                complete(StatusCodes.Accepted, HttpEntity.Empty)
-              }
+          entity(as[PlayerActionResponse]) { action =>
+            val player = action.playerId.toPlayer.copy(partyId = partyId)
+            onComplete(doModifyPlayer(action.action, player)) {
+              case Success(_) => complete(StatusCodes.Accepted, HttpEntity.Empty)
+              case Failure(exception) => throw exception
             }
           }
         }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -8,38 +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.AuthorizationProvider
 import me.arcanis.ffxivbis.http.api.v1.json.JsonSupport
-import me.arcanis.ffxivbis.messages.{BiSProviderMessage, Message}
 
-class RootApiV1Endpoint(
-  storage: ActorRef[Message],
-  auth: AuthorizationProvider,
-  provider: ActorRef[BiSProviderMessage],
-  config: Config
-)(implicit
-  timeout: Timeout,
-  scheduler: Scheduler
-) extends JsonSupport
-  with HttpHandler {
+class RootApiV1Endpoint(storage: ActorRef, ariyala: ActorRef, config: Config)
+                       (implicit timeout: Timeout)
+  extends JsonSupport with HttpHandler {
 
-  private val biSEndpoint = new BiSEndpoint(storage, provider, auth)
-  private val lootEndpoint = new LootEndpoint(storage, auth)
-  private val partyEndpoint = new PartyEndpoint(storage, provider, auth)
-  private val playerEndpoint = new PlayerEndpoint(storage, provider, auth)
+  private val biSEndpoint = new BiSEndpoint(storage, ariyala)
+  private val lootEndpoint = new LootEndpoint(storage)
+  private val playerEndpoint = new PlayerEndpoint(storage, ariyala)
   private val typesEndpoint = new TypesEndpoint(config)
-  private val userEndpoint = new UserEndpoint(storage, auth)
+  private val userEndpoint = new UserEndpoint(storage)
 
   def route: Route =
     handleExceptions(exceptionHandler) {
       handleRejections(rejectionHandler) {
-        biSEndpoint.route ~ lootEndpoint.route ~ partyEndpoint.route ~
-          playerEndpoint.route ~ typesEndpoint.route ~ userEndpoint.route
+        biSEndpoint.route ~ lootEndpoint.route ~ playerEndpoint.route ~
+          typesEndpoint.route ~ userEndpoint.route
       }
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -11,101 +11,50 @@ package me.arcanis.ffxivbis.http.api.v1
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
 import com.typesafe.config.Config
-import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.media.{ArraySchema, Content, Schema}
 import io.swagger.v3.oas.annotations.responses.ApiResponse
-import jakarta.ws.rs._
+import io.swagger.v3.oas.annotations.Operation
+import javax.ws.rs._
 import me.arcanis.ffxivbis.http.api.v1.json._
-import me.arcanis.ffxivbis.models._
+import me.arcanis.ffxivbis.models.{Job, Party, Permission, Piece}
 
-@Path("/api/v1")
+@Path("api/v1")
 class TypesEndpoint(config: Config) extends JsonSupport {
 
-  def route: Route = getAllJobs ~ getJobs ~ getPermissions ~ getPieces ~ getPieceTypes ~ getPriority
-
-  @GET
-  @Path("types/jobs/all")
-  @Produces(value = Array("application/json"))
-  @Operation(
-    summary = "full jobs list",
-    description = "Returns the available jobs including any job",
-    responses = Array(
-      new ApiResponse(
-        responseCode = "200",
-        description = "List of available jobs with AnyJob",
-        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[ErrorModel])))
-      ),
-    ),
-    tags = Array("types"),
-  )
-  def getAllJobs: Route =
-    path("types" / "jobs" / "all") {
-      get {
-        complete(Job.availableWithAnyJob.map(_.toString))
-      }
-    }
+  def route: Route = getJobs ~ getPermissions ~ getPieces ~ getPriority
 
   @GET
   @Path("types/jobs")
   @Produces(value = Array("application/json"))
-  @Operation(
-    summary = "jobs list",
-    description = "Returns the available jobs",
+  @Operation(summary = "jobs list", description = "Returns the available jobs",
     responses = Array(
-      new ApiResponse(
-        responseCode = "200",
-        description = "List of available jobs",
-        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[ErrorModel])))
-      ),
+      new ApiResponse(responseCode = "200", description = "List of available jobs",
+        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 getJobs: Route =
     path("types" / "jobs") {
       get {
-        complete(Job.available.map(_.toString))
+        complete(Job.availableWithAnyJob.map(_.toString))
       }
     }
 
   @GET
   @Path("types/permissions")
   @Produces(value = Array("application/json"))
-  @Operation(
-    summary = "permissions list",
-    description = "Returns the available permissions",
+  @Operation(summary = "permissions list", description = "Returns the available permissions",
     responses = Array(
-      new ApiResponse(
-        responseCode = "200",
-        description = "List of available permissions",
-        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[ErrorModel])))
-      ),
+      new ApiResponse(responseCode = "200", description = "List of available permissions",
+        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"),
   )
@@ -119,24 +68,14 @@ class TypesEndpoint(config: Config) extends JsonSupport {
   @GET
   @Path("types/pieces")
   @Produces(value = Array("application/json"))
-  @Operation(
-    summary = "pieces list",
-    description = "Returns the available pieces",
+  @Operation(summary = "pieces list", description = "Returns the available pieces",
     responses = Array(
-      new ApiResponse(
-        responseCode = "200",
-        description = "List of available pieces",
-        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[ErrorModel])))
-      ),
+      new ApiResponse(responseCode = "200", description = "List of available pieces",
+        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"),
   )
@@ -147,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[ErrorModel])))
-      ),
-    ),
-    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(
-    summary = "priority list",
-    description = "Returns the current priority list",
+  @Operation(summary = "priority list", description = "Returns the current priority list",
     responses = Array(
-      new ApiResponse(
-        responseCode = "200",
-        description = "Priority order",
-        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[ErrorModel])))
-      ),
+      new ApiResponse(responseCode = "200", description = "Priority order",
+        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"),
   )

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -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,57 +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.helpers.UserHelper
-import me.arcanis.ffxivbis.http.{Authorization, AuthorizationProvider}
-import me.arcanis.ffxivbis.messages.Message
+import me.arcanis.ffxivbis.http.{Authorization, UserHelper}
 import me.arcanis.ffxivbis.models.Permission
 
 import scala.util.{Failure, Success}
 
-@Path("/api/v1")
-class UserEndpoint(override val storage: ActorRef[Message], override val auth: AuthorizationProvider)(implicit
-  timeout: Timeout,
-  scheduler: Scheduler
-) extends UserHelper
-  with Authorization
-  with JsonSupport {
+@Path("api/v1")
+class UserEndpoint(override val storage: ActorRef)(implicit timeout: Timeout)
+  extends UserHelper(storage) with Authorization with JsonSupport {
 
-  def route: Route = createParty ~ createUser ~ deleteUser ~ getUsers ~ getUsersCurrent
+  def route: Route = createParty ~ createUser ~ deleteUser ~ getUsers
 
   @PUT
   @Path("party")
   @Consumes(value = Array("application/json"))
-  @Operation(
-    summary = "create new party",
-    description = "Create new party with specified ID",
-    requestBody = new RequestBody(
-      description = "party administrator description",
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[UserModel])))
-    ),
+  @Operation(summary = "create new party", description = "Create new party with specified ID",
+    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",
-        content = Array(new Content(schema = new Schema(implementation = classOf[PartyIdModel])))
-      ),
-      new ApiResponse(
-        responseCode = "400",
-        description = "Invalid parameters were supplied",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "406",
-        description = "Party with the specified ID already exists",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
+      new ApiResponse(responseCode = "200", description = "Party has been created"),
+      new ApiResponse(responseCode = "400", description = "Invalid parameters were supplied",
+        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorResponse])))),
+      new ApiResponse(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"),
   )
@@ -77,12 +53,15 @@ class UserEndpoint(override val storage: ActorRef[Message], override val auth: A
     path("party") {
       extractExecutionContext { implicit executionContext =>
         put {
-          entity(as[UserModel]) { user =>
-            onSuccess(newPartyId) { partyId =>
-              val admin = user.toUser.copy(partyId = partyId, permission = Permission.admin)
-              onSuccess(addUser(admin, isHashedPassword = false)) {
-                complete(PartyIdModel(partyId))
-              }
+          entity(as[UserResponse]) { user =>
+            onComplete(newPartyId) {
+              case Success(partyId) =>
+                val admin = user.toUser.copy(partyId = partyId, permission = Permission.admin)
+                onComplete(addUser(admin, isHashedPassword = false)) {
+                  case Success(_) => complete(PartyIdResponse(partyId))
+                  case Failure(exception) => throw exception
+                }
+              case Failure(exception) => throw exception
             }
           }
         }
@@ -92,39 +71,22 @@ class UserEndpoint(override val storage: ActorRef[Message], override val auth: A
   @POST
   @Path("party/{partyId}/users")
   @Consumes(value = Array("application/json"))
-  @Operation(
-    summary = "create new user",
-    description = "Add an user to the specified party",
+  @Operation(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(
-      description = "user description",
-      required = true,
-      content = Array(new Content(schema = new Schema(implementation = classOf[UserModel])))
-    ),
+    requestBody = new RequestBody(description = "user description", 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(
-        responseCode = "400",
-        description = "Invalid parameters were supplied",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
+      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("admin"))),
     tags = Array("users"),
@@ -134,10 +96,11 @@ class UserEndpoint(override val storage: ActorRef[Message], override val auth: A
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authAdmin(partyId)) { _ =>
           post {
-            entity(as[UserModel]) { user =>
+            entity(as[UserResponse]) { user =>
               val withPartyId = user.toUser.copy(partyId = partyId)
-              onSuccess(addUser(withPartyId, isHashedPassword = false)) {
-                complete(StatusCodes.Accepted, HttpEntity.Empty)
+              onComplete(addUser(withPartyId, isHashedPassword = false)) {
+                case Success(_) => complete(StatusCodes.Accepted, HttpEntity.Empty)
+                case Failure(exception) => throw exception
               }
             }
           }
@@ -147,30 +110,19 @@ class UserEndpoint(override val storage: ActorRef[Message], override val auth: A
 
   @DELETE
   @Path("party/{partyId}/users/{username}")
-  @Operation(
-    summary = "remove user",
-    description = "Remove an user from the specified party",
+  @Operation(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(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
+      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("admin"))),
     tags = Array("users"),
@@ -180,8 +132,9 @@ class UserEndpoint(override val storage: ActorRef[Message], override val auth: A
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authAdmin(partyId)) { _ =>
           delete {
-            onSuccess(removeUser(partyId, username)) {
-              complete(StatusCodes.Accepted, HttpEntity.Empty)
+            onComplete(removeUser(partyId, username)) {
+              case Success(_) => complete(StatusCodes.Accepted, HttpEntity.Empty)
+              case Failure(exception) => throw exception
             }
           }
         }
@@ -191,39 +144,23 @@ class UserEndpoint(override val storage: ActorRef[Message], override val auth: A
   @GET
   @Path("party/{partyId}/users")
   @Produces(value = Array("application/json"))
-  @Operation(
-    summary = "get users",
-    description = "Return the list of users belong to party",
+  @Operation(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(
-        responseCode = "200",
-        description = "Users list",
-        content = Array(
-          new Content(
-            array = new ArraySchema(schema = new Schema(implementation = classOf[UserModel])),
-          )
-        )
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
+      new ApiResponse(responseCode = "200", description = "Users list",
+        content = Array(new Content(
+          array = new ArraySchema(schema = new Schema(implementation = classOf[UserResponse])),
+        ))),
+      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"))),
+    security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("admin"))),
     tags = Array("users"),
   )
   def getUsers: Route =
@@ -231,56 +168,12 @@ class UserEndpoint(override val storage: ActorRef[Message], override val auth: A
       extractExecutionContext { implicit executionContext =>
         authenticateBasicBCrypt(s"party $partyId", authAdmin(partyId)) { _ =>
           get {
-            onSuccess(users(partyId)) { response =>
-              complete(response.map(UserModel.fromUser))
+            onComplete(users(partyId)) {
+              case Success(response) => complete(response.map(UserResponse.fromUser))
+              case Failure(exception) => throw exception
             }
           }
         }
       }
     }
-
-  @GET
-  @Path("party/{partyId}/users/current")
-  @Produces(value = Array("application/json"))
-  @Operation(
-    summary = "get current user",
-    description = "Return the current user descriptor",
-    parameters = Array(
-      new Parameter(name = "partyId", in = ParameterIn.PATH, description = "unique party ID", example = "abcdefgh"),
-    ),
-    responses = Array(
-      new ApiResponse(
-        responseCode = "200",
-        description = "User descriptor",
-        content = Array(new Content(schema = new Schema(implementation = classOf[UserModel])))
-      ),
-      new ApiResponse(
-        responseCode = "401",
-        description = "Supplied authorization is invalid",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "403",
-        description = "Access is forbidden",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-      new ApiResponse(
-        responseCode = "500",
-        description = "Internal server error",
-        content = Array(new Content(schema = new Schema(implementation = classOf[ErrorModel])))
-      ),
-    ),
-    security = Array(new SecurityRequirement(name = "basic auth", scopes = Array("admin"))),
-    tags = Array("users"),
-  )
-  def getUsersCurrent: Route =
-    path("party" / Segment / "users" / "current") { partyId =>
-      extractExecutionContext { implicit executionContext =>
-        authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { user =>
-          get {
-            complete(UserModel.fromUser(user))
-          }
-        }
-      }
-    }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -10,4 +10,5 @@ package me.arcanis.ffxivbis.http.api.v1.json
 
 import io.swagger.v3.oas.annotations.media.Schema
 
-case class PartyIdModel(@Schema(description = "party id", required = true, example = "abcdefgh") partyId: String)
+case class ErrorResponse(
+  @Schema(description = "error message", required = true) message: String)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -12,8 +12,6 @@ import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
 import me.arcanis.ffxivbis.models.Permission
 import spray.json._
 
-import java.time.Instant
-
 trait JsonSupport extends SprayJsonSupport with DefaultJsonProtocol {
 
   private def enumFormat[E <: Enumeration](enum: E): RootJsonFormat[E#Value] =
@@ -26,31 +24,18 @@ 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[ErrorModel] = jsonFormat1(ErrorModel.apply)
-  implicit val partyIdFormat: RootJsonFormat[PartyIdModel] = jsonFormat1(PartyIdModel.apply)
-  implicit val pieceFormat: RootJsonFormat[PieceModel] = jsonFormat3(PieceModel.apply)
-  implicit val lootFormat: RootJsonFormat[LootModel] = jsonFormat3(LootModel.apply)
-  implicit val partyDescriptionFormat: RootJsonFormat[PartyDescriptionModel] = jsonFormat2(
-    PartyDescriptionModel.apply
-  )
-  implicit val playerFormat: RootJsonFormat[PlayerModel] = jsonFormat9(PlayerModel.apply)
-  implicit val playerActionFormat: RootJsonFormat[PlayerActionModel] = jsonFormat2(PlayerActionModel.apply)
-  implicit val playerIdFormat: RootJsonFormat[PlayerIdModel] = jsonFormat3(PlayerIdModel.apply)
-  implicit val pieceActionFormat: RootJsonFormat[PieceActionModel] = jsonFormat4(PieceActionModel.apply)
-  implicit val playerBiSLinkFormat: RootJsonFormat[PlayerBiSLinkModel] = jsonFormat2(PlayerBiSLinkModel.apply)
-  implicit val playerIdWithCountersFormat: RootJsonFormat[PlayerIdWithCountersModel] =
-    jsonFormat9(PlayerIdWithCountersModel.apply)
-  implicit val userFormat: RootJsonFormat[UserModel] = jsonFormat4(UserModel.apply)
+  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 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] = jsonFormat3(PieceActionResponse.apply)
+  implicit val playerBiSLinkFormat: RootJsonFormat[PlayerBiSLinkResponse] = jsonFormat2(PlayerBiSLinkResponse.apply)
+  implicit val playerIdWithCountersFormat: RootJsonFormat[PlayerIdWithCountersResponse] =
+    jsonFormat9(PlayerIdWithCountersResponse.apply)
+  implicit val userFormat: RootJsonFormat[UserResponse] = jsonFormat4(UserResponse.apply)
 }

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

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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.Loot
-
-import java.time.Instant
-
-case class LootModel(
-  @Schema(description = "looted piece", required = true) piece: PieceModel,
-  @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 LootModel {
-
-  def fromLoot(loot: Loot): LootModel =
-    LootModel(PieceModel.fromPiece(loot.piece), loot.timestamp, loot.isFreeLoot)
-}

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

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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 PartyDescriptionModel(
-  @Schema(description = "party id", required = true, example = "abcdefgh") partyId: String,
-  @Schema(description = "party name") partyAlias: Option[String]
-) {
-
-  def toDescription: PartyDescription = PartyDescription(partyId, partyAlias)
-}
-
-object PartyDescriptionModel {
-
-  def fromDescription(description: PartyDescription): PartyDescriptionModel =
-    PartyDescriptionModel(description.partyId, description.partyAlias)
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -10,4 +10,5 @@ package me.arcanis.ffxivbis.http.api.v1.json
 
 import io.swagger.v3.oas.annotations.media.Schema
 
-case class ErrorModel(@Schema(description = "error message", required = true) message: String)
+case class PartyIdResponse(
+  @Schema(description = "party id", required = true) partyId: String)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -10,14 +10,7 @@ package me.arcanis.ffxivbis.http.api.v1.json
 
 import io.swagger.v3.oas.annotations.media.Schema
 
-case class PieceActionModel(
-  @Schema(
-    description = "action to perform",
-    required = true,
-    `type` = "string",
-    allowableValues = Array("add", "remove")
-  ) action: ApiAction.Value,
-  @Schema(description = "piece description", required = true) piece: PieceModel,
-  @Schema(description = "player description", required = true) playerId: PlayerIdModel,
-  @Schema(description = "is piece free to roll or not", `type` = "boolean") isFreeLoot: Option[Boolean]
-)
+case class PieceActionResponse(
+  @Schema(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)

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

@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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.{Job, Piece, PieceType}
-
-case class PieceModel(
-  @Schema(description = "piece type", required = true, example = "Savage") pieceType: String,
-  @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
-) {
-
-  def toPiece: Piece = Piece(piece, PieceType.withName(pieceType), Job.withName(job))
-}
-
-object PieceModel {
-
-  def fromPiece(piece: Piece): PieceModel =
-    PieceModel(piece.pieceType.toString, piece.job.toString, piece.piece)
-}

src/main/scala/me/arcanis/ffxivbis/http/api/v1/json/PieceResponse.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.api.v1.json
+
+import io.swagger.v3.oas.annotations.media.Schema
+import me.arcanis.ffxivbis.models.{Job, Piece}
+
+case class PieceResponse(
+  @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) {
+  def toPiece: Piece = Piece(piece, isTome, Job.withName(job))
+}
+
+object PieceResponse {
+  def fromPiece(piece: Piece): PieceResponse =
+    PieceResponse(piece.isTome, piece.job.toString, piece.piece)
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -10,13 +10,6 @@ package me.arcanis.ffxivbis.http.api.v1.json
 
 import io.swagger.v3.oas.annotations.media.Schema
 
-case class PlayerActionModel(
-  @Schema(
-    description = "action to perform",
-    required = true,
-    `type` = "string",
-    allowableValues = Array("add", "remove"),
-    example = "add"
-  ) action: ApiAction.Value,
-  @Schema(description = "player description", required = true) playerId: PlayerModel
-)
+case class PlayerActionResponse(
+  @Schema(description = "action to perform", 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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -10,11 +10,6 @@ package me.arcanis.ffxivbis.http.api.v1.json
 
 import io.swagger.v3.oas.annotations.media.Schema
 
-case class PlayerBiSLinkModel(
-  @Schema(
-    description = "link to player best in slot",
-    required = true,
-    example = "https://ffxiv.ariyala.com/19V5R"
-  ) link: String,
-  @Schema(description = "player description", required = true) playerId: PlayerIdModel
-)
+case class PlayerBiSLinkResponse(
+  @Schema(description = "link to player best in slot", 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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -11,18 +11,15 @@ package me.arcanis.ffxivbis.http.api.v1.json
 import io.swagger.v3.oas.annotations.media.Schema
 import me.arcanis.ffxivbis.models.{Job, PlayerId}
 
-case class PlayerIdModel(
+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 PlayerIdModel {
-
-  def fromPlayerId(playerId: PlayerId): PlayerIdModel =
-    PlayerIdModel(Some(playerId.partyId), playerId.job.toString, playerId.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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -11,22 +11,20 @@ package me.arcanis.ffxivbis.http.api.v1.json
 import io.swagger.v3.oas.annotations.media.Schema
 import me.arcanis.ffxivbis.models.PlayerIdWithCounters
 
-case class PlayerIdWithCountersModel(
+case class PlayerIdWithCountersResponse(
   @Schema(description = "unique party ID", required = true, example = "abcdefgh") partyId: 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 = "is piece required by player or not", required = true) isRequired: Boolean,
   @Schema(description = "player loot priority", required = true) priority: Int,
   @Schema(description = "count of savage pieces in best in slot", required = true) bisCountTotal: Int,
-  @Schema(description = "count of looted pieces of this type", required = true) lootCount: 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 PlayerIdWithCountersModel {
-
-  def fromPlayerId(playerIdWithCounters: PlayerIdWithCounters): PlayerIdWithCountersModel =
-    PlayerIdWithCountersModel(
+object PlayerIdWithCountersResponse {
+  def fromPlayerId(playerIdWithCounters: PlayerIdWithCounters): PlayerIdWithCountersResponse =
+    PlayerIdWithCountersResponse(
       playerIdWithCounters.partyId,
       playerIdWithCounters.job.toString,
       playerIdWithCounters.nick,
@@ -35,6 +33,5 @@ object PlayerIdWithCountersModel {
       playerIdWithCounters.bisCountTotal,
       playerIdWithCounters.lootCount,
       playerIdWithCounters.lootCountBiS,
-      playerIdWithCounters.lootCountTotal
-    )
+      playerIdWithCounters.lootCountTotal)
 }

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

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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.{BiS, Job, Player}
-
-case class PlayerModel(
-  @Schema(description = "unique party ID", required = true, example = "abcdefgh") partyId: 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 = "pieces in best in slot") bis: Option[Seq[PieceModel]],
-  @Schema(description = "looted pieces") loot: Option[Seq[LootModel]],
-  @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 = "count of looted pieces which are parts of best in slot") lootCountBiS: Option[Int],
-  @Schema(description = "total count of looted pieces", `type` = "number") lootCountTotal: Option[Int],
-) {
-
-  def toPlayer: Player =
-    Player(
-      -1,
-      partyId,
-      Job.withName(job),
-      nick,
-      BiS(bis.getOrElse(Seq.empty).map(_.toPiece)),
-      loot.getOrElse(Seq.empty).map(_.toLoot),
-      link,
-      priority.getOrElse(0)
-    )
-}
-
-object PlayerModel {
-
-  def fromPlayer(player: Player): PlayerModel =
-    PlayerModel(
-      player.partyId,
-      player.job.toString,
-      player.nick,
-      Some(player.bis.pieces.map(PieceModel.fromPiece)),
-      Some(player.loot.map(LootModel.fromLoot)),
-      player.link,
-      Some(player.priority),
-      Some(player.lootCountBiS),
-      Some(player.lootCountTotal),
-    )
-}

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

@@ -0,0 +1,33 @@
+/*
+ * 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.api.v1.json
+
+import io.swagger.v3.oas.annotations.media.Schema
+import me.arcanis.ffxivbis.models.{BiS, Job, Player}
+
+case class PlayerResponse(
+  @Schema(description = "unique party ID", required = true, example = "abcdefgh") partyId: 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 = "pieces in best in slot") bis: Option[Seq[PieceResponse]],
+  @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]) {
+  def toPlayer: Player =
+    Player(partyId, Job.withName(job), nick,
+      BiS(bis.getOrElse(Seq.empty).map(_.toPiece)), loot.getOrElse(Seq.empty).map(_.toPiece),
+      link, priority.getOrElse(0))
+}
+
+object PlayerResponse {
+  def fromPlayer(player: Player): PlayerResponse =
+    PlayerResponse(player.partyId, player.job.toString, player.nick,
+      Some(player.bis.pieces.map(PieceResponse.fromPiece)), Some(player.loot.map(PieceResponse.fromPiece)),
+      player.link, Some(player.priority))
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -11,24 +11,16 @@ package me.arcanis.ffxivbis.http.api.v1.json
 import io.swagger.v3.oas.annotations.media.Schema
 import me.arcanis.ffxivbis.models.{Permission, User}
 
-case class UserModel(
+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(
-    description = "user permission",
-    defaultValue = "get",
-    `type` = "string",
-    allowableValues = Array("get", "post", "admin")
-  ) permission: Option[Permission.Value] = None
-) {
-
+  @Schema(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 UserModel {
-
-  def fromUser(user: User): UserModel =
-    UserModel(user.partyId, user.username, "", Some(user.permission))
+object UserResponse {
+  def fromUser(user: User): UserResponse =
+    UserResponse(user.partyId, user.username, "", Some(user.permission))
 }

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

@@ -1,50 +0,0 @@
-package me.arcanis.ffxivbis.http.helpers
-
-import akka.actor.typed.scaladsl.AskPattern.Askable
-import akka.actor.typed.{ActorRef, Scheduler}
-import akka.util.Timeout
-import me.arcanis.ffxivbis.http.api.v1.json.ApiAction
-import me.arcanis.ffxivbis.messages._
-import me.arcanis.ffxivbis.models.{Piece, Player, PlayerId}
-
-import scala.concurrent.{ExecutionContext, Future}
-
-trait BiSHelper extends BisProviderHelper {
-
-  def storage: ActorRef[Message]
-
-  def addPieceBiS(playerId: PlayerId, piece: Piece)(implicit timeout: Timeout, scheduler: Scheduler): Future[Unit] =
-    storage.ask(AddPieceToBis(playerId, piece.withJob(playerId.job), _))
-
-  def bis(partyId: String, playerId: Option[PlayerId])(implicit
-    timeout: Timeout,
-    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
-    executionContext: ExecutionContext,
-    timeout: Timeout,
-    scheduler: Scheduler
-  ): Future[Unit] =
-    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] =
-    storage.ask(RemovePieceFromBiS(playerId, piece, _))
-
-}

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

@@ -1,17 +0,0 @@
-package me.arcanis.ffxivbis.http.helpers
-
-import akka.actor.typed.scaladsl.AskPattern.Askable
-import akka.actor.typed.{ActorRef, Scheduler}
-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/helpers/LootHelper.scala

@@ -1,47 +0,0 @@
-package me.arcanis.ffxivbis.http.helpers
-
-import akka.actor.typed.scaladsl.AskPattern.Askable
-import akka.actor.typed.{ActorRef, Scheduler}
-import akka.util.Timeout
-import me.arcanis.ffxivbis.http.api.v1.json.ApiAction
-import me.arcanis.ffxivbis.messages._
-import me.arcanis.ffxivbis.models.{Piece, Player, PlayerId, PlayerIdWithCounters}
-
-import scala.concurrent.{ExecutionContext, Future}
-
-trait LootHelper {
-
-  def storage: ActorRef[Message]
-
-  def addPieceLoot(playerId: PlayerId, piece: Piece, isFreeLoot: Boolean)(implicit
-    timeout: Timeout,
-    scheduler: Scheduler
-  ): Future[Unit] =
-    storage.ask(AddPieceTo(playerId, piece, isFreeLoot, _))
-
-  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
-    timeout: Timeout,
-    scheduler: Scheduler
-  ): Future[Seq[Player]] =
-    storage.ask(GetLoot(partyId, playerId, _))
-
-  def removePieceLoot(playerId: PlayerId, piece: Piece)(implicit timeout: Timeout, scheduler: Scheduler): Future[Unit] =
-    storage.ask(RemovePieceFrom(playerId, piece, _))
-
-  def suggestPiece(partyId: String, piece: Piece)(implicit
-    executionContext: ExecutionContext,
-    timeout: Timeout,
-    scheduler: Scheduler
-  ): Future[Seq[PlayerIdWithCounters]] =
-    storage.ask(SuggestLoot(partyId, piece, _)).map(_.result)
-}

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

@@ -1,66 +0,0 @@
-package me.arcanis.ffxivbis.http.helpers
-
-import akka.actor.typed.scaladsl.AskPattern.Askable
-import akka.actor.typed.{ActorRef, Scheduler}
-import akka.util.Timeout
-import me.arcanis.ffxivbis.http.api.v1.json.ApiAction
-import me.arcanis.ffxivbis.messages._
-import me.arcanis.ffxivbis.models.{PartyDescription, Player, PlayerId}
-
-import scala.concurrent.{ExecutionContext, Future}
-
-trait PlayerHelper extends BisProviderHelper {
-
-  def storage: ActorRef[Message]
-
-  def addPlayer(
-    player: Player
-  )(implicit executionContext: ExecutionContext, timeout: Timeout, scheduler: Scheduler): Future[Unit] =
-    storage
-      .ask(ref => AddPlayer(player, ref))
-      .map { res =>
-        player.link.map(_.trim).filter(_.nonEmpty) match {
-          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
-
-  def doModifyPlayer(action: ApiAction.Value, player: Player)(implicit
-    executionContext: ExecutionContext,
-    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] =
-    storage.ask(GetPartyDescription(partyId, _))
-
-  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)
-      case None =>
-        storage.ask(GetParty(partyId, _)).map(_.players.values.toSeq)
-    }
-
-  def removePlayer(playerId: PlayerId)(implicit timeout: Timeout, scheduler: Scheduler): Future[Unit] =
-    storage.ask(RemovePlayer(playerId, _))
-
-  def updateDescription(
-    partyDescription: PartyDescription
-  )(implicit executionContext: ExecutionContext, timeout: Timeout, scheduler: Scheduler): Future[Unit] =
-    storage.ask(UpdateParty(partyDescription, _))
-}

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

@@ -1,29 +0,0 @@
-package me.arcanis.ffxivbis.http.helpers
-
-import akka.actor.typed.scaladsl.AskPattern.Askable
-import akka.actor.typed.{ActorRef, Scheduler}
-import akka.util.Timeout
-import me.arcanis.ffxivbis.messages._
-import me.arcanis.ffxivbis.models.User
-
-import scala.concurrent.Future
-
-trait UserHelper {
-
-  def storage: ActorRef[Message]
-
-  def addUser(user: User, isHashedPassword: Boolean)(implicit timeout: Timeout, scheduler: Scheduler): Future[Unit] =
-    storage.ask(AddUser(user, isHashedPassword, _))
-
-  def newPartyId(implicit timeout: Timeout, scheduler: Scheduler): Future[String] =
-    storage.ask(GetNewPartyId)
-
-  def user(partyId: String, username: String)(implicit timeout: Timeout, scheduler: Scheduler): Future[Option[User]] =
-    storage.ask(GetUser(partyId, username, _))
-
-  def users(partyId: String)(implicit timeout: Timeout, scheduler: Scheduler): Future[Seq[User]] =
-    storage.ask(GetUsers(partyId, _))
-
-  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/view/BasePartyView.scala

@@ -0,0 +1,64 @@
+/*
+ * 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.view
+
+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
+
+class BasePartyView(override val storage: ActorRef)(implicit timeout: Timeout)
+  extends Authorization {
+
+  def route: Route = getIndex
+
+  def getIndex: Route =
+    path("party" / Segment) { partyId =>
+      extractExecutionContext { implicit executionContext =>
+        authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
+          get {
+            complete {
+              (StatusCodes.OK, RootView.toHtml(BasePartyView.template(partyId)))
+            }
+          }
+        }
+      }
+    }
+}
+
+object BasePartyView {
+  import scalatags.Text
+  import scalatags.Text.all._
+  import scalatags.Text.tags2.{title => titleTag}
+
+  def root(partyId: String): Text.TypedTag[String] =
+    a(href:=s"/party/$partyId", title:="root")("root")
+
+  def template(partyId: String): String =
+    "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">" +
+      html(lang:="en",
+        head(
+          titleTag(s"Party $partyId"),
+          link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css")
+        ),
+
+        body(
+          h2(s"Party $partyId"),
+          br,
+          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/loot", title:="loot management")("loot")),
+          h2(a(href:=s"/party/$partyId/suggest", title:="suggest loot")("suggest")),
+          hr,
+          h2(a(href:=s"/party/$partyId/users", title:="user management")("users"))
+        )
+      )
+}

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

@@ -0,0 +1,152 @@
+/*
+ * 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.view
+
+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.models.{Piece, Player, PlayerId}
+
+import scala.concurrent.{ExecutionContext, Future}
+import scala.util.Try
+
+class BiSView(override val storage: ActorRef, ariyala: ActorRef)(implicit timeout: Timeout)
+  extends BiSHelper(storage, ariyala) with Authorization {
+
+  def route: Route = getBiS ~ modifyBiS
+
+  def getBiS: Route =
+    path("party" / Segment / "bis") { partyId: String =>
+      extractExecutionContext { implicit executionContext =>
+        authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
+          get {
+            complete {
+              bis(partyId, None).map { players =>
+                BiSView.template(partyId, players, None)
+              }.map { text =>
+                (StatusCodes.OK, RootView.toHtml(text))
+              }
+            }
+          }
+        }
+      }
+    }
+
+  def modifyBiS: Route =
+    path("party" / Segment / "bis") { partyId: String =>
+      extractExecutionContext { implicit executionContext =>
+        authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
+          post {
+            formFields("player".as[String], "piece".as[String].?, "is_tome".as[String].?, "link".as[String].?, "action".as[String]) {
+              (player, maybePiece, maybeIsTome, maybeLink, action) =>
+                onComplete(modifyBiSCall(partyId, player, maybePiece, maybeIsTome, maybeLink, action)) {
+                  case _ => redirect(s"/party/$partyId/bis", StatusCodes.Found)
+                }
+            }
+          }
+        }
+      }
+    }
+
+  private def modifyBiSCall(partyId: String, player: String,
+                            maybePiece: Option[String], maybeIsTome: Option[String],
+                            maybeLink: Option[String], action: String)
+                           (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Unit] = {
+    import me.arcanis.ffxivbis.utils.Implicits._
+
+    def getPiece(playerId: PlayerId, piece: String) =
+      Try(Piece(piece, maybeIsTome, playerId.job)).toOption
+
+    PlayerId(partyId, player) match {
+      case Some(playerId) => (maybePiece, action, maybeLink) match {
+        case (Some(piece), "add", _) => getPiece(playerId, piece) match {
+          case Some(item) => addPieceBiS(playerId, item).map(_ => ())
+          case _ => Future.failed(new Error(s"Could not construct piece from `$piece`"))
+        }
+        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`"))
+    }
+  }
+}
+
+object BiSView {
+  import scalatags.Text.all._
+  import scalatags.Text.tags2.{title => titleTag}
+
+  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(lang:="en",
+        head(
+          titleTag("Best in slot"),
+          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")
+                  (for (player <- party) yield option(player.playerId.toString)),
+            select(name:="piece", id:="piece", title:="piece")
+                  (for (piece <- Piece.available) yield option(piece)),
+            input(name:="is_tome", id:="is_tome", title:="is tome", `type`:="checkbox"),
+            label(`for`:="is_tome")("is tome gear"),
+            input(name:="action", id:="action", `type`:="hidden", value:="add"),
+            input(name:="add", id:="add", `type`:="submit", value:="add")
+          ),
+
+          form(action:="/bis", method:="post")(
+            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:="action", id:="action", `type`:="hidden", value:="create"),
+            input(name:="add", id:="add", `type`:="submit", value:="add")
+          ),
+
+          table(id:="result")(
+            tr(
+              th("player"),
+              th("piece"),
+              th("is tome"),
+              th("")
+            ),
+            for (player <- party; piece <- player.bis.pieces) yield tr(
+              td(`class`:="include_search")(player.playerId.toString),
+              td(`class`:="include_search")(piece.piece),
+              td(piece.isTomeToString),
+              td(
+                form(action:=s"/party/$partyId/bis", method:="post")(
+                  input(name:="player", id:="player", `type`:="hidden", value:=player.playerId.toString),
+                  input(name:="piece", id:="piece", `type`:="hidden", value:=piece.piece),
+                  input(name:="is_tome", id:="is_tome", `type`:="hidden", value:=piece.isTomeToString),
+                  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")
+        )
+      )
+}

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

@@ -0,0 +1,19 @@
+/*
+ * 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.view
+
+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 None => p("")
+  }
+}

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

@@ -0,0 +1,20 @@
+/*
+ * 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.view
+
+import scalatags.Text
+import scalatags.Text.all._
+
+object ExportToCSVView {
+  def template: Text.TypedTag[String] =
+    div(
+      button(onclick:="exportTableToCsv('result.csv')")("Export to CSV"),
+      script(src:="/static/table_export.js", `type`:="text/javascript")
+    )
+}

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

@@ -0,0 +1,85 @@
+/*
+ * 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.view
+
+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.UserHelper
+import me.arcanis.ffxivbis.models.{Permission, User}
+
+import scala.util.{Failure, Success}
+
+class IndexView(storage: ActorRef)(implicit timeout: Timeout)
+  extends UserHelper(storage) {
+
+  def route: Route = createParty ~ getIndex
+
+  def createParty: Route =
+    path("party") {
+      extractExecutionContext { implicit executionContext =>
+        post {
+          formFields("username".as[String], "password".as[String]) { (username, password) =>
+            onComplete(newPartyId) {
+              case Success(partyId) =>
+                val user = User(partyId, username, password, Permission.admin)
+                onComplete(addUser(user, isHashedPassword = false)) {
+                  case _ => redirect(s"/party/$partyId", StatusCodes.Found)
+                }
+              case Failure(exception) => throw exception
+            }
+          }
+        }
+      }
+    }
+
+  def getIndex: Route =
+    pathEndOrSingleSlash {
+      get {
+        parameters("partyId".as[String].?) {
+          case Some(partyId) => redirect(s"/party/$partyId", StatusCodes.Found)
+          case _ => complete(StatusCodes.OK, RootView.toHtml(IndexView.template))
+        }
+      }
+    }
+}
+
+object IndexView {
+  import scalatags.Text.all._
+  import scalatags.Text.tags2.{title => titleTag}
+
+  def template: String =
+    "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">" +
+      html(
+        head(
+          titleTag("FFXIV loot helper"),
+          link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css")
+        ),
+
+        body(
+          form(action:=s"party", method:="post")(
+            label("create a new party"),
+            input(name:="username", 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")(
+            label("already have party?"),
+            input(name:="partyId", id:="partyId", placeholder:="party id", title:="party id", `type`:="text"),
+            input(name:="go", id:="go", `type`:="submit", value:="go")
+          )
+        )
+      )
+}
+

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

@@ -0,0 +1,132 @@
+/*
+ * 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.view
+
+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.models.{Job, Piece, PlayerIdWithCounters}
+
+import scala.concurrent.{ExecutionContext, Future}
+import scala.util.{Failure, Success, Try}
+
+class LootSuggestView(override val storage: ActorRef)(implicit timeout: Timeout)
+  extends LootHelper(storage) with Authorization {
+
+  def route: Route = getIndex ~ suggestLoot
+
+  def getIndex: Route =
+    path("party" / Segment / "suggest") { partyId: String =>
+      extractExecutionContext { implicit executionContext =>
+        authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
+          get {
+            complete {
+              val text = LootSuggestView.template(partyId, Seq.empty, None, None)
+              (StatusCodes.OK, RootView.toHtml(text))
+            }
+          }
+        }
+      }
+    }
+
+  def suggestLoot: Route =
+    path("party" / Segment / "suggest") { partyId: String =>
+      extractExecutionContext { implicit executionContext =>
+        authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
+          post {
+            formFields("piece".as[String], "job".as[String], "is_tome".as[String].?) { (piece, job, maybeTome) =>
+              import me.arcanis.ffxivbis.utils.Implicits._
+              val maybePiece = Try(Piece(piece, maybeTome, Job.withName(job))).toOption
+
+              onComplete(suggestLootCall(partyId, maybePiece)) {
+                case Success(players) =>
+                  val text = LootSuggestView.template(partyId, players, maybePiece, None)
+                  complete(StatusCodes.OK, RootView.toHtml(text))
+                case Failure(exception) =>
+                  val text = LootSuggestView.template(partyId, Seq.empty, maybePiece, Some(exception.getMessage))
+                  complete(StatusCodes.OK, RootView.toHtml(text))
+              }
+            }
+          }
+        }
+      }
+    }
+
+  private def suggestLootCall(partyId: String, maybePiece: Option[Piece])
+                             (implicit executionContext: ExecutionContext, 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`"))
+    }
+}
+
+object LootSuggestView {
+  import scalatags.Text.all._
+  import scalatags.Text.tags2.{title => titleTag}
+
+  def template(partyId: String, party: Seq[PlayerIdWithCounters], piece: Option[Piece], error: Option[String]): String =
+    "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">" +
+      html(lang:="en",
+        head(
+          titleTag("Suggest loot"),
+          link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css")
+        ),
+
+        body(
+          h2("Suggest loot"),
+
+          ErrorView.template(error),
+          SearchLineView.template,
+
+          form(action:=s"/party/$partyId/suggest", method:="post")(
+            select(name:="piece", id:="piece", title:="piece")
+                  (for (piece <- Piece.available) yield option(piece)),
+            select(name:="job", id:="job", title:="job")
+                  (for (job <- Job.availableWithAnyJob) yield option(job.toString)),
+            input(name:="is_tome", id:="is_tome", title:="is tome", `type`:="checkbox"),
+            label(`for`:="is_tome")("is tome gear"),
+            input(name:="suggest", id:="suggest", `type`:="submit", value:="suggest")
+          ),
+
+          table(id:="result")(
+            tr(
+              th("player"),
+              th("is required"),
+              th("these pieces looted"),
+              th("total bis pieces looted"),
+              th("total pieces looted"),
+              th("")
+            ),
+            for (player <- party) yield tr(
+              td(`class`:="include_search")(player.playerId.toString),
+              td(player.isRequiredToString),
+              td(player.lootCount),
+              td(player.lootCountBiS),
+              td(player.lootCountTotal),
+              td(
+                form(action:=s"/party/$partyId/loot", method:="post")(
+                  input(name:="player", id:="player", `type`:="hidden", value:=player.playerId.toString),
+                  input(name:="piece", id:="piece", `type`:="hidden", value:=piece.map(_.piece).getOrElse("")),
+                  input(name:="is_tome", id:="is_tome", `type`:="hidden", value:=piece.map(_.isTomeToString).getOrElse("")),
+                  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")
+        )
+      )
+}

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

@@ -0,0 +1,138 @@
+/*
+ * 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.view
+
+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.models.{Piece, Player, PlayerId}
+
+import scala.concurrent.{ExecutionContext, Future}
+import scala.util.Try
+
+class LootView (override val storage: ActorRef)(implicit timeout: Timeout)
+  extends LootHelper(storage) with Authorization {
+
+  def route: Route = getLoot ~ modifyLoot
+
+  def getLoot: Route =
+    path("party" / Segment / "loot") { partyId: String =>
+      extractExecutionContext { implicit executionContext =>
+        authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
+          get {
+            complete {
+              loot(partyId, None).map { players =>
+                LootView.template(partyId, players, None)
+              }.map { text =>
+                (StatusCodes.OK, RootView.toHtml(text))
+              }
+            }
+          }
+        }
+      }
+    }
+
+  def modifyLoot: Route =
+    path("party" / Segment / "loot") { partyId: String =>
+      extractExecutionContext { implicit executionContext =>
+        authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
+          post {
+            formFields("player".as[String], "piece".as[String], "is_tome".as[String].?, "action".as[String]) {
+              (player, maybePiece, maybeIsTome, action) =>
+                onComplete(modifyLootCall(partyId, player, maybePiece, maybeIsTome, action)) {
+                  case _ => redirect(s"/party/$partyId/loot", StatusCodes.Found)
+                }
+            }
+          }
+        }
+      }
+    }
+
+  private def modifyLootCall(partyId: String, player: String,
+                             maybePiece: String, maybeIsTome: Option[String],
+                             action: String)
+                            (implicit executionContext: ExecutionContext, timeout: Timeout): Future[Unit] = {
+    import me.arcanis.ffxivbis.utils.Implicits._
+
+    def getPiece(playerId: PlayerId) =
+      Try(Piece(maybePiece, maybeIsTome, playerId.job)).toOption
+
+    PlayerId(partyId, player) match {
+      case Some(playerId) => (getPiece(playerId), action) match {
+        case (Some(piece), "add") => addPieceLoot(playerId, piece).map(_ => ())
+        case (Some(piece), "remove") => removePieceLoot(playerId, piece).map(_ => ())
+        case _ => Future.failed(new Error(s"Could not construct piece from `$maybePiece`"))
+      }
+      case _ => Future.failed(new Error(s"Could not construct player id from `$player`"))
+    }
+  }
+}
+
+object LootView {
+  import scalatags.Text.all._
+  import scalatags.Text.tags2.{title => titleTag}
+
+  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(lang:="en",
+        head(
+          titleTag("Loot"),
+          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")
+                  (for (player <- party) yield option(player.playerId.toString)),
+            select(name:="piece", id:="piece", title:="piece")
+                  (for (piece <- Piece.available) yield option(piece)),
+            input(name:="is_tome", id:="is_tome", title:="is tome", `type`:="checkbox"),
+            label(`for`:="is_tome")("is tome gear"),
+            input(name:="action", id:="action", `type`:="hidden", value:="add"),
+            input(name:="add", id:="add", `type`:="submit", value:="add")
+          ),
+
+          table(id:="result")(
+            tr(
+              th("player"),
+              th("piece"),
+              th("is tome"),
+              th("")
+            ),
+            for (player <- party; piece <- player.loot) yield tr(
+              td(`class`:="include_search")(player.playerId.toString),
+              td(`class`:="include_search")(piece.piece),
+              td(piece.isTomeToString),
+              td(
+                form(action:=s"/party/$partyId/loot", method:="post")(
+                  input(name:="player", id:="player", `type`:="hidden", value:=player.playerId.toString),
+                  input(name:="piece", id:="piece", `type`:="hidden", value:=piece.piece),
+                  input(name:="is_tome", id:="is_tome", `type`:="hidden", value:=piece.isTomeToString),
+                  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")
+        )
+      )
+
+}

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

@@ -0,0 +1,134 @@
+/*
+ * 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.view
+
+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.models._
+
+import scala.concurrent.{ExecutionContext, Future}
+
+class PlayerView(override val storage: ActorRef, ariyala: ActorRef)(implicit timeout: Timeout)
+  extends PlayerHelper(storage, ariyala) with Authorization {
+
+  def route: Route = getParty ~ modifyParty
+
+  def getParty: Route =
+    path("party" / Segment / "players") { partyId: String =>
+      extractExecutionContext { implicit executionContext =>
+        authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { _ =>
+          get {
+            complete {
+              getPlayers(partyId, None).map { players =>
+                PlayerView.template(partyId, players.map(_.withCounters(None)), None)
+              }.map { text =>
+                (StatusCodes.OK, RootView.toHtml(text))
+              }
+            }
+          }
+        }
+      }
+    }
+
+  def modifyParty: Route =
+    path("party" / Segment / "players") { partyId: String =>
+      extractExecutionContext { implicit executionContext =>
+        authenticateBasicBCrypt(s"party $partyId", authPost(partyId)) { _ =>
+          post {
+            formFields("nick".as[String], "job".as[String], "priority".as[Int].?, "link".as[String].?, "action".as[String]) {
+              (nick, job, maybePriority, maybeLink, action) =>
+                onComplete(modifyPartyCall(partyId, nick, job, maybePriority, maybeLink, action)) {
+                  case _ => redirect(s"/party/$partyId/players", StatusCodes.Found)
+                }
+            }
+          }
+        }
+      }
+    }
+
+  private def modifyPartyCall(partyId: String, nick: String, job: String,
+                              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(partyId, playerId.job, playerId.nick, BiS(), Seq.empty, maybeLink, maybePriority.getOrElse(0))
+
+    (action, maybePlayerId) match {
+      case ("add", Some(playerId)) => addPlayer(player(playerId)).map(_ => ())
+      case ("remove", Some(playerId)) => removePlayer(playerId).map(_ => ())
+      case _ => Future.failed(new Error(s"Could not perform $action with $nick ($job)"))
+    }
+  }
+}
+
+object PlayerView {
+  import scalatags.Text.all._
+  import scalatags.Text.tags2.{title => titleTag}
+
+  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(lang:="en",
+        head(
+          titleTag("Party"),
+          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"),
+            select(name:="job", id:="job", title:="job")
+                  (for (job <- Job.available) yield option(job.toString)),
+            input(name:="link", id:="link", placeholder:="player bis link", title:="link", `type`:="text"),
+            input(name:="prioiry", id:="priority", placeholder:="priority", title:="priority", `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")(
+            tr(
+              th("nick"),
+              th("job"),
+              th("total bis pieces looted"),
+              th("total pieces looted"),
+              th("priority"),
+              th("")
+            ),
+            for (player <- party) yield tr(
+              td(`class`:="include_search")(player.nick),
+              td(`class`:="include_search")(player.job.toString),
+              td(player.lootCountBiS),
+              td(player.lootCountTotal),
+              td(player.priority),
+              td(
+                form(action:=s"/party/$partyId/players", method:="post")(
+                  input(name:="nick", id:="nick", `type`:="hidden", value:=player.nick),
+                  input(name:="job", id:="job", `type`:="hidden", value:=player.job.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")
+        )
+      )
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -8,73 +8,29 @@
  */
 package me.arcanis.ffxivbis.http.view
 
-import akka.http.scaladsl.model.headers.RawHeader
+import akka.actor.ActorRef
+import akka.http.scaladsl.model.{ContentTypes, HttpEntity}
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.Route
-import me.arcanis.ffxivbis.http.{Authorization, AuthorizationProvider}
+import akka.util.Timeout
 
-class RootView(override val auth: AuthorizationProvider) extends Authorization {
+class RootView(storage: ActorRef, ariyala: ActorRef)(implicit timeout: Timeout) {
 
-  def route: Route = getBiS ~ getIndex ~ getLoot ~ getParty ~ getUsers
+  private val basePartyView = new BasePartyView(storage)
+  private val indexView = new IndexView(storage)
 
-  def getBiS: Route =
-    path("party" / Segment / "bis") { partyId: String =>
-      extractExecutionContext { implicit executionContext =>
-        authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { user =>
-          respondWithHeaders(
-            RawHeader("X-Party-Id", partyId),
-            RawHeader("X-User-Permission", user.permission.toString)
-          ) {
-            getFromResource("html/bis.html")
-          }
-        }
-      }
-    }
+  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, ariyala)
+  private val userView = new UserView(storage)
 
-  def getIndex: Route =
-    pathEndOrSingleSlash {
-      getFromResource("html/index.html")
-    }
-
-  def getLoot: Route =
-    path("party" / Segment / "loot") { partyId: String =>
-      extractExecutionContext { implicit executionContext =>
-        authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { user =>
-          respondWithHeaders(
-            RawHeader("X-Party-Id", partyId),
-            RawHeader("X-User-Permission", user.permission.toString)
-          ) {
-            getFromResource("html/loot.html")
-          }
-        }
-      }
-    }
-
-  def getParty: Route =
-    path("party" / Segment) { partyId: String =>
-      extractExecutionContext { implicit executionContext =>
-        authenticateBasicBCrypt(s"party $partyId", authGet(partyId)) { user =>
-          respondWithHeaders(
-            RawHeader("X-Party-Id", partyId),
-            RawHeader("X-User-Permission", user.permission.toString)
-          ) {
-            getFromResource("html/party.html")
-          }
-        }
-      }
-    }
-
-  def getUsers: Route =
-    path("party" / Segment / "users") { partyId: String =>
-      extractExecutionContext { implicit executionContext =>
-        authenticateBasicBCrypt(s"party $partyId", authAdmin(partyId)) { user =>
-          respondWithHeaders(
-            RawHeader("X-Party-Id", partyId),
-            RawHeader("X-User-Permission", user.permission.toString)
-          ) {
-            getFromResource("html/users.html")
-          }
-        }
-      }
-    }
+  def route: Route =
+    basePartyView.route ~ indexView.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

@@ -0,0 +1,22 @@
+/*
+ * 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.view
+
+import scalatags.Text
+import scalatags.Text.all._
+
+object SearchLineView {
+  def template: Text.TypedTag[String] =
+    div(
+      input(
+        `type`:="text", id:="search", onkeyup:="searchTable()",
+        placeholder:="search for data", title:="search"
+      )
+    )
+}

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

@@ -0,0 +1,128 @@
+/*
+ * 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.view
+
+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.models.{Permission, User}
+
+import scala.concurrent.{ExecutionContext, Future}
+import scala.util.Try
+
+class UserView(override val storage: ActorRef)(implicit timeout: Timeout)
+  extends UserHelper(storage) with Authorization {
+
+  def route: Route = getUsers ~ modifyUsers
+
+  def getUsers: Route =
+    path("party" / Segment / "users") { partyId: String =>
+      extractExecutionContext { implicit executionContext =>
+        authenticateBasicBCrypt(s"party $partyId", authAdmin(partyId)) { _ =>
+          get {
+            complete {
+              users(partyId).map { users =>
+                UserView.template(partyId, users, None)
+              }.map { text =>
+                (StatusCodes.OK, RootView.toHtml(text))
+              }
+            }
+          }
+        }
+      }
+    }
+
+  def modifyUsers: Route =
+    path("party" / Segment / "users") { partyId: String =>
+      extractExecutionContext { implicit executionContext =>
+        authenticateBasicBCrypt(s"party $partyId", authAdmin(partyId)) { _ =>
+          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 _ => redirect(s"/party/$partyId/users", StatusCodes.Found)
+                }
+            }
+          }
+        }
+      }
+    }
+
+  private def modifyUsersCall(partyId: String, username: String,
+                              maybePassword: Option[String], 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" => (maybePassword, permission) match {
+        case (Some(password), Some(permission)) => addUser(User(partyId, username, password, permission), isHashedPassword = false).map(_ => ())
+        case _ => Future.failed(new Error(s"Could not construct permission/password from `$maybePermission`/`$maybePassword`"))
+      }
+      case "remove" => removeUser(partyId, username).map(_ => ())
+      case _ => Future.failed(new Error(s"Could not perform $action"))
+    }
+  }
+}
+
+object UserView {
+  import scalatags.Text.all._
+  import scalatags.Text.tags2.{title => titleTag}
+
+  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(lang:="en",
+        head(
+          titleTag("Users"),
+          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(name:="username", id:="username", placeholder:="username", title:="username", `type`:="text"),
+            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")(
+            tr(
+              th("username"),
+              th("permission"),
+              th("")
+            ),
+            for (user <- users) yield tr(
+              td(`class`:="include_search")(user.username),
+              td(user.permission.toString),
+              td(
+                form(action:=s"/party/$partyId/users", method:="post")(
+                  input(name:="username", id:="username", `type`:="hidden", value:=user.username.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")
+        )
+      )
+}

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

@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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.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,18 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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.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,97 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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.messages
-
-import akka.actor.typed.{ActorRef, Behavior}
-import me.arcanis.ffxivbis.models._
-import me.arcanis.ffxivbis.service.LootSelector
-
-sealed trait DatabaseMessage extends Message {
-
-  def partyId: String
-}
-
-object DatabaseMessage {
-
-  type Handler = PartialFunction[DatabaseMessage, Behavior[DatabaseMessage]]
-}
-
-// bis handler
-trait BisDatabaseMessage extends DatabaseMessage
-
-case class AddPieceToBis(playerId: PlayerId, piece: Piece, replyTo: ActorRef[Unit]) extends BisDatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-case class GetBiS(partyId: String, playerId: Option[PlayerId], replyTo: ActorRef[Seq[Player]])
-  extends BisDatabaseMessage
-
-case class RemovePieceFromBiS(playerId: PlayerId, piece: Piece, replyTo: ActorRef[Unit]) extends BisDatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-case class RemovePiecesFromBiS(playerId: PlayerId, replyTo: ActorRef[Unit]) extends BisDatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-// loot handler
-trait LootDatabaseMessage extends DatabaseMessage
-
-case class AddPieceTo(playerId: PlayerId, piece: Piece, isFreeLoot: Boolean, replyTo: ActorRef[Unit])
-  extends LootDatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-case class GetLoot(partyId: String, playerId: Option[PlayerId], replyTo: ActorRef[Seq[Player]])
-  extends LootDatabaseMessage
-
-case class RemovePieceFrom(playerId: PlayerId, piece: Piece, replyTo: ActorRef[Unit]) extends LootDatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-case class SuggestLoot(partyId: String, piece: Piece, replyTo: ActorRef[LootSelector.LootSelectorResult])
-  extends LootDatabaseMessage
-
-// party handler
-trait PartyDatabaseMessage extends DatabaseMessage
-
-case class AddPlayer(player: Player, replyTo: ActorRef[Unit]) extends PartyDatabaseMessage {
-  override def partyId: String = player.partyId
-}
-
-case class GetParty(partyId: String, replyTo: ActorRef[Party]) extends PartyDatabaseMessage
-
-case class GetPartyDescription(partyId: String, replyTo: ActorRef[PartyDescription]) extends PartyDatabaseMessage
-
-case class GetPlayer(playerId: PlayerId, replyTo: ActorRef[Option[Player]]) extends PartyDatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-case class RemovePlayer(playerId: PlayerId, replyTo: ActorRef[Unit]) extends PartyDatabaseMessage {
-  override def partyId: String = playerId.partyId
-}
-
-case class UpdateParty(partyDescription: PartyDescription, replyTo: ActorRef[Unit]) extends PartyDatabaseMessage {
-  override def partyId: String = partyDescription.partyId
-}
-
-// user handler
-trait UserDatabaseMessage extends DatabaseMessage
-
-case class AddUser(user: User, isHashedPassword: Boolean, replyTo: ActorRef[Unit]) extends UserDatabaseMessage {
-  override def partyId: String = user.partyId
-}
-
-case class DeleteUser(partyId: String, username: String, replyTo: ActorRef[Unit]) extends UserDatabaseMessage
-
-case class Exists(partyId: String, replyTo: ActorRef[Boolean]) extends UserDatabaseMessage
-
-case class GetUser(partyId: String, username: String, replyTo: ActorRef[Option[User]]) extends UserDatabaseMessage
-
-case class GetUsers(partyId: String, replyTo: ActorRef[Seq[User]]) extends UserDatabaseMessage

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

@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2019-2022 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.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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -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,32 +30,51 @@ case class BiS(pieces: Seq[Piece]) {
   }
 
   def upgrades: Map[PieceUpgrade, Int] =
-    pieces
-      .groupBy(_.upgrade)
-      .foldLeft(Map.empty[PieceUpgrade, Int]) {
-        case (acc, (Some(k), v)) => acc + (k -> v.size)
-        case (acc, _) => acc
-      }
-      .withDefaultValue(0)
+    pieces.groupBy(_.upgrade).foldLeft(Map.empty[PieceUpgrade, Int]) {
+      case (acc, (Some(k), v)) => acc + (k -> v.length)
+      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 = copyWithPiece(piece.piece, None)
 
-  def withoutPiece(piece: Piece): BiS = copy(pieces.filterNot(_.strictEqual(piece)))
-
-  override def equals(obj: Any): Boolean = {
-    def comparePieces(left: Seq[Piece], right: Seq[Piece]): Boolean =
-      left.groupBy(identity).view.mapValues(_.size).forall { case (key, count) =>
-        right.count(_.strictEqual(key)) == count
-      }
-
-    obj match {
-      case left: BiS => comparePieces(left.pieces, pieces)
-      case _ => false
-    }
+  private def copyWithPiece(name: String, piece: Option[Piece]): BiS = {
+    val params = Map(
+      "weapon" -> weapon,
+      "head" -> head,
+      "body" -> body,
+      "hands" -> hands,
+      "waist" -> waist,
+      "legs" -> legs,
+      "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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -9,7 +9,6 @@
 package me.arcanis.ffxivbis.models
 
 object Job {
-
   sealed trait RightSide
   object AccessoriesDex extends RightSide
   object AccessoriesInt extends RightSide
@@ -26,16 +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
@@ -63,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
@@ -84,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 RPR extends Drgs
+  case object DRG extends Job {
+    val leftSide: LeftSide = BodyDrgs
+    val rightSide: RightSide = AccessoriesStr
+  }
   case object NIN extends Job {
     val leftSide: LeftSide = BodyNins
     val rightSide: RightSide = AccessoriesDex
@@ -104,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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -8,9 +8,4 @@
  */
 package me.arcanis.ffxivbis.models
 
-import java.time.Instant
-
-case class Loot(playerId: Long, piece: Piece, timestamp: Instant, isFreeLoot: Boolean) {
-
-  def isFreeLootToString: String = if (isFreeLoot) "yes" else "no"
-}
+case class Loot(playerId: Long, piece: Piece)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -15,18 +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 =>
@@ -39,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(
-    party: PartyDescription,
-    config: Config,
-    players: Map[Long, Player],
-    bis: Seq[Loot],
-    loot: Seq[Loot]
-  ): Party = {
+  def apply(partyId: String, 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 playersWithItems = players.foldLeft(Map.empty[PlayerId, Player]) { case (acc, (playerId, player)) =>
-      acc + (player.playerId -> player
-        .withBiS(bisByPlayer.get(playerId))
-        .withLoot(lootByPlayer.getOrElse(playerId, Seq.empty)))
+    val lootByPlayer = loot.groupBy(_.playerId).view.mapValues(_.map(_.piece))
+    val playersWithItems = players.foldLeft(Map.empty[PlayerId, Player]) {
+      case (acc, (playerId, player)) =>
+        acc + (player.playerId -> player
+          .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) 2019-2022 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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Evgeniy Alekseev.
+ * Copyright (c) 2019 Evgeniy Alekseev.
  *
  * This file is part of ffxivbis
  * (see https://github.com/arcan1s/ffxivbis).
@@ -8,90 +8,79 @@
  */
 package me.arcanis.ffxivbis.models
 
-sealed trait Piece extends Equals {
-
-  def pieceType: PieceType.PieceType
-
+sealed trait Piece {
+  def isTome: Boolean
   def job: Job.Job
-
   def piece: String
 
   def withJob(other: Job.Job): Piece
 
-  def upgrade: Option[PieceUpgrade] = {
-    val isTome = pieceType == PieceType.Tome
-    Some(this).collect {
-      case _: PieceAccessory if isTome => AccessoryUpgrade
-      case _: PieceBody if isTome => BodyUpgrade
-      case _: PieceWeapon if isTome => WeaponUpgrade
-    }
+  def isTomeToString: String = if (isTome) "yes" else "no"
+  def upgrade: Option[PieceUpgrade] = this match {
+    case _ if !isTome => None
+    case _: Waist => Some(AccessoryUpgrade)
+    case _: PieceAccessory => Some(AccessoryUpgrade)
+    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(
-  override val pieceType: PieceType.PieceType,
-  override val job: Job.Job,
-  override val piece: String = "ring"
-) extends PieceAccessory {
+case class Ring(override val isTome: Boolean, 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 _ => false
-  }
-
-  override def strictEqual(obj: Any): Boolean = obj match {
-    case ring: Ring => equals(obj) && (ring.piece == this.piece)
+    case Ring(thatIsTome, thatJob, _) => (thatIsTome == isTome) && (thatJob == job)
     case _ => false
   }
 }
@@ -107,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 "head" => Head(pieceType, job)
-      case "body" => Body(pieceType, job)
-      case "hands" => Hands(pieceType, job)
-      case "legs" => Legs(pieceType, job)
-      case "feet" => Feet(pieceType, job)
-      case "ears" => Ears(pieceType, job)
-      case "neck" => Neck(pieceType, job)
-      case "wrist" | "wrists" => Wrist(pieceType, job)
-      case ring @ ("ring" | "left ring" | "right ring") => Ring(pieceType, job, ring)
+      case "weapon" => Weapon(isTome, job)
+      case "head" => Head(isTome, job)
+      case "body" => Body(isTome, job)
+      case "hands" => Hands(isTome, job)
+      case "waist" => Waist(isTome, job)
+      case "legs" => Legs(isTome, job)
+      case "feet" => Feet(isTome, job)
+      case "ears" => Ears(isTome, job)
+      case "neck" => Neck(isTome, job)
+      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(
-    "weapon",
-    "head",
-    "body",
-    "hands",
-    "legs",
-    "feet",
-    "ears",
-    "neck",
-    "wrist",
-    "left ring",
-    "right ring",
-    "accessory upgrade",
-    "body upgrade",
-    "weapon upgrade"
-  )
+  lazy val available: Seq[String] = Seq("weapon",
+    "head", "body", "hands", "waist", "legs", "feet",
+    "ears", "neck", "wrist", "left ring", "right ring",
+    "accessory upgrade", "body upgrade", "weapon upgrade")
 }