adds AddPlayer endpoint

Cargo.toml

@@ -7,12 +7,15 @@ edition = "2018"
 [dependencies]
 actix-web = "1.0.*"
 actix-files = "*"
+actix-service = "*"
+actix-identity = "*"
 lootalot-db = { version = "0.1", path = "./lootalot_db" }
 dotenv = "*"
 env_logger = "*"
 futures = "0.1"
 diesel = "*"
 serde = "*"
+serde_json = "*"
 actix-cors = "0.1.0"
 
 [workspace]

lootalot_db/Cargo.toml

@@ -9,6 +9,7 @@ dotenv = "*"
 diesel_migrations = "*"
 serde = "*"
 serde_derive = "*"
+serde_json = "*"
 
 [dependencies.diesel]
 version = "1.4"

lootalot_db/migrations/2019-06-10-123922_create_items/down.sql

@@ -1,3 +1,3 @@
 DROP TABLE items;
 DROP TABLE looted;
-
+DROP TABLE shop;

lootalot_db/migrations/2019-06-10-123922_create_items/up.sql

@@ -13,3 +13,10 @@ CREATE TABLE looted (
   owner_id INTEGER NOT NULL,
   FOREIGN KEY (owner_id) REFERENCES players(id)
 );
+
+-- The items that are available in shop
+CREATE TABLE shop (
+  id INTEGER PRIMARY KEY NOT NULL,
+  name VARCHAR NOT NULL,
+  base_price INTEGER NOT NULL
+);

lootalot_db/src/lib.rs

@@ -18,8 +18,9 @@ mod schema;
 
 pub use models::{
     claim::{Claim, Claims},
-    item::{Item, LootManager, Inventory},
-    player::{Player, Wealth, Players, AsPlayer},
+    history::{Event, UpdateList},
+    item::{Inventory, Shop, Item, LootManager},
+    player::{AsPlayer, Player, Players, Wealth},
 };
 
 /// The connection used
@@ -28,6 +29,7 @@ pub type DbConnection = SqliteConnection;
 pub type Pool = r2d2::Pool<ConnectionManager<DbConnection>>;
 /// The result of a query on DB
 pub type QueryResult<T> = Result<T, diesel::result::Error>;
+pub type UpdateResult = QueryResult<Update>;
 
 /// Sets up a connection pool and returns it.
 /// Uses the DATABASE_URL environment variable (must be set)
@@ -40,9 +42,8 @@ pub fn create_pool() -> Pool {
         .expect("Failed to create pool.")
 }
 
-
 /// Every possible update which can happen during a query
-#[derive(Serialize, Debug)]
+#[derive(Serialize, Deserialize, Debug)]
 pub enum Update {
     Wealth(Wealth),
     ItemAdded(Item),
@@ -51,6 +52,27 @@ pub enum Update {
     ClaimRemoved(Claim),
 }
 
+impl Update {
+    /// Change back what has been updated
+    fn undo(&self, conn: &DbConnection, id: i32) -> UpdateResult {
+        Ok(match self {
+            Update::Wealth(diff) => AsPlayer(conn, id).update_wealth(-diff.to_gp())?,
+            Update::ItemAdded(item) => LootManager(conn, id).find(item.id)?.remove(conn)?,
+            Update::ItemRemoved(item) => LootManager(conn, id).add_from(&item)?,
+            // Unused for now
+            Update::ClaimAdded(claim) => Update::ClaimRemoved(*claim),
+            Update::ClaimRemoved(claim) => Update::ClaimAdded(*claim),
+        })
+    }
+}
+
+/// TODO: use this to wrap update in UpdateResult, allowing unified interface
+/// whether a query makes multiple updates or just one.
+enum OneOrMore {
+    One(Update),
+    More(Vec<Update>),
+}
+
 /// Every value which can be queried
 #[derive(Debug)]
 pub enum Value {
@@ -86,17 +108,19 @@ pub fn sell_item_transaction(
     id: i32,
     loot_id: i32,
     price_mod: Option<f64>,
-) -> QueryResult<(Item, Wealth)> {
+) -> QueryResult<(Update, Wealth)> {
     conn.transaction(|| {
-        let deleted = LootManager(conn, id)
-            .remove(loot_id)?;
-        let mut sell_value = deleted.sell_value() as f64;
+        let to_delete = LootManager(conn, id).find(loot_id)?;
+        let mut sell_value = to_delete.sell_value() as f64;
         if let Some(modifier) = price_mod {
             sell_value *= modifier;
         }
-        let wealth = AsPlayer(conn, id)
-            .update_wealth(sell_value)?;
+        let deleted = to_delete.remove(conn)?;
+        if let Update::Wealth(wealth) = AsPlayer(conn, id).update_wealth(sell_value)? {
             Ok((deleted, wealth))
+        } else {
+            Err(diesel::result::Error::RollbackTransaction)
+        }
     })
 }
 
@@ -110,25 +134,47 @@ pub fn buy_item_from_inventory(
     id: i32,
     item_id: i32,
     price_mod: Option<f64>,
-) -> QueryResult<(Item, Wealth)> {
+) -> QueryResult<(Update, Wealth)> {
     conn.transaction(|| {
         // Find item in inventory
         let item = Inventory(conn).find(item_id)?;
         let new_item = LootManager(conn, id).add_from(&item)?;
         let sell_price = match price_mod {
-            Some(modifier) => item.value() as f64 * modifier,
-            None => item.value() as f64,
+            Some(modifier) => item.value() * modifier,
+            None => item.value(),
         };
-        AsPlayer(conn, id)
-            .update_wealth(-sell_price)
-            .map(|diff| (new_item, diff))
+        if let Update::Wealth(diff) = AsPlayer(conn, id).update_wealth(-sell_price)? {
+            Ok((new_item, diff))
+        } else {
+            Err(diesel::result::Error::RollbackTransaction)
+        }
     })
 }
 
-/// Fetch all existing claims
-pub fn fetch_claims(conn: &DbConnection) -> QueryResult<Vec<models::Claim>> {
-    schema::claims::table.load::<models::Claim>(conn)
+pub fn buy_item_from_shop(
+    conn: &DbConnection,
+    id: i32,
+    item_id: i32,
+    price_mod: Option<f64>,
+) -> QueryResult<(Update, Wealth)> {
+    conn.transaction(|| {
+        let shop = Shop(conn);
+        // Find item in inventory
+        let item = shop.get(item_id)?;
+        let new_item = LootManager(conn, id).add_from(&item)?;
+        let _deleted = shop.remove(item_id)?;
+        let sell_price = match price_mod {
+            Some(modifier) => item.value() * modifier,
+            None => item.value(),
+        };
+        if let Update::Wealth(diff) = AsPlayer(conn, id).update_wealth(-sell_price)? {
+            Ok((new_item, diff))
+        } else {
+            Err(diesel::result::Error::RollbackTransaction)
         }
+    })
+}
+
 
 /// Resolve all pending claims and dispatch claimed items.
 ///
@@ -145,39 +191,58 @@ pub fn resolve_claims(conn: &DbConnection) -> QueryResult<()> {
             let winner = claims.get(0).expect("Claims should not be empty !");
             let player_id = winner.player_id;
             winner.resolve_claim(conn)?;
-                models::player::AsPlayer(conn, player_id)
-                    .update_debt(item.sell_value())?;
+            models::player::AsPlayer(conn, player_id).update_debt(item.sell_value() as i32)?;
         }
         Ok(())
     })
 }
 
-/// Split up and share group money among selected players
-pub fn split_and_share(conn: &DbConnection, amount: i32, players: Vec<i32>) -> QueryResult<Wealth> {
+/// Split up and share an certain amount of group money among selected players
+///
+/// The group first solve players debts,
+/// then give what's left.
+///
+/// # Returns
+///
+/// A Wealth update with the amount of money shared with players
+pub fn split_and_share(
+    conn: &DbConnection,
+    amount: i32,
+    players: Vec<i32>,
+) -> UpdateResult {
+    let players = match players.is_empty() {
+        true => Players(conn)
+            .all_except_group()?
+            .iter()
+            .map(|p| p.id)
+            .collect(),
+        false => players
+    };
     let share = (
-        amount / (players.len() + 1) as i32  // +1 share for the group
+        amount / (players.len() + 1) as i32
+        // +1 share for the group
     ) as f64;
     conn.transaction(|| {
-        for p in players.into_iter() {
-            let player = Players(conn).find(p)?;
+        let mut shared_total = 0.0;
+        for id in players {
+            let player = Players(conn).find(id)?;
             // Take debt into account
             match share - player.debt as f64 {
                 rest if rest > 0.0 => {
-                    AsPlayer(conn, p).update_debt(-player.debt)?;
-                    AsPlayer(conn, p).update_wealth(rest)?;
+                    AsPlayer(conn, id).update_debt(-player.debt)?;
+                    AsPlayer(conn, id).update_wealth(rest)?;
                     AsPlayer(conn, 0).update_wealth(-rest)?;
-                },
+                    shared_total += rest;
+                }
                 _ => {
-                    AsPlayer(conn, p).update_debt(-share as i32)?;
+                    AsPlayer(conn, id).update_debt(-share as i32)?;
                 }
             }
         }
-        Ok(Wealth::from_gp(share))
+        Ok(Update::Wealth(Wealth::from_gp(shared_total)))
     })
 }
 
-
-
 #[cfg(none)]
 mod tests_old {
     use super::*;

lootalot_db/src/models/claim.rs

@@ -1,11 +1,11 @@
-use crate::{DbConnection, QueryResult};
 use diesel::prelude::*;
 
+use crate::{DbConnection, QueryResult, Update, UpdateResult};
 use crate::models::{self, item::Loot};
 use crate::schema::claims;
 
 /// A Claim is a request by a single player on an item from group chest.
-#[derive(Identifiable, Queryable, Associations, Serialize, Deserialize, Debug)]
+#[derive(Identifiable, Queryable, Associations, Serialize, Deserialize, Clone, Copy, Debug)]
 #[belongs_to(Loot)]
 pub struct Claim {
     /// DB Identifier
@@ -41,6 +41,11 @@ impl<'q> Claims<'q> {
         claims::table.load(self.0)
     }
 
+    pub fn by_player(&self, id: i32) -> QueryResult<Vec<Claim>> {
+        claims::table.filter(claims::dsl::player_id.eq(id))
+            .load(self.0)
+    }
+
     /// Finds a single claim by association of player and loot ids.
     pub fn find(&self, player_id: i32, loot_id: i32) -> QueryResult<Claim> {
         claims::table
@@ -54,7 +59,7 @@ impl<'q> Claims<'q> {
     /// Will validate that the claimed item exists and is
     /// actually owned by the group.
     /// Duplicates are also ignored.
-    pub fn add(self, player_id: i32, loot_id: i32) -> QueryResult<Claim> {
+    pub fn add(self, player_id: i32, loot_id: i32) -> UpdateResult {
         // We need to validate that the claimed item exists
         // AND is actually owned by group (id 0)
         let _item = models::item::LootManager(self.0, 0).find(loot_id)?;
@@ -68,16 +73,22 @@ impl<'q> Claims<'q> {
             .values(&claim)
             .execute(self.0)?;
         // Return the created claim
+        Ok(
+            Update::ClaimAdded(
                 claims::table
                     .order(claims::dsl::id.desc())
-            .first::<Claim>(self.0)
+                    .first::<Claim>(self.0)?
+            )
+        )
     }
 
     /// Removes a claim from database, returning it
-    pub fn remove(self, player_id: i32, loot_id: i32) -> QueryResult<Claim> {
+    pub fn remove(self, player_id: i32, loot_id: i32) -> UpdateResult {
         let claim = self.find(player_id, loot_id)?;
         claim.remove(self.0)?;
-        Ok(claim)
+        Ok(
+            Update::ClaimRemoved(claim)
+        )
     }
 
     pub fn filtered_by_loot(&self, loot_id: i32) -> QueryResult<Vec<Claim>> {
@@ -86,6 +97,15 @@ impl<'q> Claims<'q> {
             .load(self.0)
     }
 
+    pub(crate) fn delete_for_loot(&self, loot_id: i32) -> QueryResult<usize> {
+        diesel::delete(
+            claims::table
+                .filter(claims::dsl::loot_id.eq(loot_id))
+        )
+            .execute(self.0)
+
+    }
+
     pub(crate) fn grouped_by_item(&self) -> QueryResult<Vec<(models::item::Item, Vec<Claim>)>> {
         let group_loot: Vec<Loot> = Loot::owned_by(0).load(self.0)?;
         let claims = claims::table.load(self.0)?.grouped_by(&group_loot);

lootalot_db/src/models/history.rs

@@ -1,6 +1,26 @@
+use serde_json;
 use diesel::prelude::*;
+use diesel::sql_types::Text;
+use diesel::deserialize::FromSql;
+use diesel::backend::Backend;
 use crate::schema::history;
-use crate::{DbConnection, QueryResult};
+use crate::{DbConnection, QueryResult, Update};
+
+#[derive(Debug, FromSqlRow)]
+pub struct UpdateList(Vec<Update>);
+
+impl UpdateList {
+    pub fn inner(&self) -> &Vec<Update> {
+        &self.0
+    }
+
+    pub fn into_inner(self) -> Vec<Update> {
+        self.0
+    }
+}
+
+// TODO: decide if updates is really optionnal or not
+// (like if storing an event without update is usefull ?)
 
 /// An event in history
 #[derive(Debug, Queryable)]
@@ -9,24 +29,62 @@ pub struct Event {
     player_id: i32,
     event_date: String,
     text: String,
-    updates: Option<String>,
+    updates: Option<UpdateList>,
 }
 
+impl Event {
+    pub fn name(&self) -> &str {
+        &self.text
+    }
+
+    /// TODO: why a move here ??
+    /// Undo all updates in a single transaction
+    pub fn undo(self, conn: &DbConnection) -> QueryResult<UpdateList> {
+        conn.transaction(move || {
+            if let Some(ref updates) = self.updates {
+                let undone = updates.0.iter()
+                        // TODO: swallow errors !
+                         .filter_map(|u| u.undo(conn, self.player_id).ok())
+                         .collect();
+                diesel::delete(history::table.find(self.id)).execute(conn)?;
+                Ok(UpdateList(undone))
+            } else {
+                Ok(UpdateList(vec![]))
+            }
+        })
+    }
+}
+
+impl<DB: Backend> FromSql<Text, DB> for UpdateList
+where
+    String: FromSql<Text, DB>,
+{
+    fn from_sql(bytes: Option<&DB::RawValue>) -> diesel::deserialize::Result<Self> {
+        let repr = String::from_sql(bytes)?;
+        Ok(UpdateList(serde_json::from_str::<Vec<Update>>(&repr)?))
+    }
+}
+
+
 #[derive(Debug, Insertable)]
 #[table_name = "history"]
 struct NewEvent<'a> {
     player_id: i32,
     text: &'a str,
-    updates: &'a str,
+    updates: Option<String>,
 }
 
+
 /// Insert a new event
-pub fn insert_event(conn: &DbConnection, id: i32, text: &str, updates: &str) -> QueryResult<Event> {
+///
+/// # Warning
+/// This actually swallow up conversion errors
+pub fn insert_event(conn: &DbConnection, id: i32, text: &str, updates: &Vec<Update>) -> QueryResult<Event> {
     diesel::insert_into(history::table)
         .values(&NewEvent {
             player_id: id,
             text,
-            updates,
+            updates: serde_json::to_string(updates).ok(),
         })
         .execute(conn)?;
     history::table
@@ -40,3 +98,12 @@ pub fn get_last_of_player(conn: &DbConnection, id: i32) -> QueryResult<Event> {
         .order(history::dsl::id.desc())
         .first(conn)
 }
+
+#[cfg(test)]
+mod tests {
+
+    #[test]
+    fn test_insert_event_with_updates() {
+
+    }
+}

lootalot_db/src/models/item.rs

@@ -2,8 +2,8 @@ use diesel::dsl::{exists, Eq, Filter, Find, Select};
 use diesel::expression::exists::Exists;
 use diesel::prelude::*;
 
-use crate::schema::{items, looted};
-use crate::{DbConnection, QueryResult};
+use crate::schema::{items, looted, shop};
+use crate::{DbConnection, QueryResult, Update, UpdateResult, Claims };
 type ItemColumns = (looted::id, looted::name, looted::base_price);
 const ITEM_COLUMNS: ItemColumns = (looted::id, looted::name, looted::base_price);
 type OwnedBy = Select<OwnedLoot, ItemColumns>;
@@ -18,13 +18,25 @@ pub struct Item {
 
 impl Item {
     /// Returns this item value
-    pub fn value(&self) -> i32 {
-        self.base_price
+    pub fn value(&self) -> f64 {
+        self.base_price as f64
     }
 
     /// Returns this item sell value
-    pub fn sell_value(&self) -> i32 {
-        self.base_price / 2
+    pub fn sell_value(&self) -> f64 {
+        self.base_price as f64 / 2.0
+    }
+
+    pub fn remove(self, conn: &DbConnection) -> UpdateResult {
+        conn.transaction(
+            || -> UpdateResult
+            {
+                Claims(conn).delete_for_loot(self.id)?;
+                diesel::delete(looted::table.find(self.id)).execute(conn)?;
+
+                Ok(Update::ItemRemoved(self))
+            }
+        )
     }
 
     fn owned_by(player: i32) -> OwnedBy {
@@ -46,6 +58,47 @@ impl<'q> Inventory<'q> {
     }
 }
 
+pub struct Shop<'q>(pub &'q DbConnection);
+
+impl<'q> Shop<'q> {
+    pub fn all(&self) -> QueryResult<Vec<Item>> {
+        shop::table.load(self.0)
+    }
+
+    pub fn get(&self, id: i32) -> QueryResult<Item> {
+        shop::table.find(&id).first::<Item>(self.0)
+    }
+
+    pub fn remove(&self, id: i32) -> QueryResult<()> {
+        diesel::delete(
+            shop::table.find(&id)
+        ).execute(self.0)?;
+        Ok(())
+    }
+
+    pub fn replace_list(&self, items: Vec<Item>) -> QueryResult<()> {
+        self.0.transaction(
+            || -> QueryResult<()>
+            {
+                // Remove all content
+                diesel::delete(shop::table).execute(self.0)?;
+                // Adds new list
+                for item in &items {
+                    let new_item = NewItem {
+                        name: &item.name,
+                        base_price: item.base_price,
+                    };
+                    diesel::insert_into(shop::table)
+                        .values(&new_item)
+                        .execute(self.0)?;
+
+                }
+                Ok(())
+            }
+        )
+    }
+}
+
 type WithOwner = Eq<looted::owner_id, i32>;
 type OwnedLoot = Filter<looted::table, WithOwner>;
 
@@ -124,7 +177,7 @@ impl<'q> LootManager<'q> {
             .first(self.0)?)
     }
 
-    pub(crate) fn add<S: Into<String>>(self, name: S, base_price: i32) -> QueryResult<Item> {
+    pub(crate) fn add<S: Into<String>>(self, name: S, base_price: i32) -> UpdateResult {
         self.add_from(&Item {
             id: 0,
             name: name.into(),
@@ -133,7 +186,7 @@ impl<'q> LootManager<'q> {
     }
 
     /// Adds a copy of the given item inside player chest
-    pub fn add_from(self, item: &Item) -> QueryResult<Item> {
+    pub fn add_from(self, item: &Item) -> UpdateResult {
         let new_item = NewLoot {
             name: &item.name,
             base_price: item.base_price,
@@ -142,13 +195,7 @@ impl<'q> LootManager<'q> {
         diesel::insert_into(looted::table)
             .values(&new_item)
             .execute(self.0)?;
-        self.last()
-    }
-
-    pub fn remove(self, item_id: i32) -> QueryResult<Item> {
-        let deleted = self.find(item_id)?;
-        diesel::delete(looted::table.find(deleted.id)).execute(self.0)?;
-        Ok(deleted)
+        Ok(Update::ItemAdded(self.last()?))
     }
 }
 
@@ -163,3 +210,10 @@ struct NewLoot<'a> {
     base_price: i32,
     owner_id: i32,
 }
+
+#[derive(Insertable)]
+#[table_name = "shop"]
+struct NewItem<'a> {
+    name: &'a str,
+    base_price: i32,
+}

lootalot_db/src/models/player/mod.rs

@@ -1,5 +1,5 @@
 use crate::schema::players;
-use crate::{DbConnection, QueryResult};
+use crate::{DbConnection, QueryResult, Update, UpdateResult};
 use diesel::prelude::*;
 
 mod notification;
@@ -35,6 +35,12 @@ impl<'q> Players<'q> {
         players::table.load(self.0)
     }
 
+    /// Get all non-group players
+    pub fn all_except_group(&self) -> QueryResult<Vec<Player>> {
+        use diesel::dsl::not;
+        players::table.filter(not(players::id.eq(0))).load(self.0)
+    }
+
     /// Find a player by id
     pub fn find(&self, id: i32) -> QueryResult<Player> {
         players::table.find(id).first(self.0)
@@ -50,10 +56,7 @@ impl<'q> Players<'q> {
 
     /// Notify all players of an event
     pub fn notifiy_all(&self, text: &str) -> QueryResult<()> {
-        for id in self.all()?
-            .into_iter()
-            .map(|p| p.id)
-        {
+        for id in self.all()?.into_iter().map(|p| p.id) {
             self.notify(id, text);
         }
         Ok(())
@@ -75,7 +78,7 @@ impl<'q> AsPlayer<'q> {
         notification::pop_all_for(self.1, self.0)
     }
     /// Updates this player's wealth, returning the difference
-    pub fn update_wealth(&self, value_in_gp: f64) -> QueryResult<Wealth> {
+    pub fn update_wealth(&self, value_in_gp: f64) -> UpdateResult {
         use crate::schema::players::dsl::*;
         let current_wealth = players
             .find(self.1)
@@ -86,7 +89,7 @@ impl<'q> AsPlayer<'q> {
             .filter(id.eq(self.1))
             .set(&updated_wealth)
             .execute(self.0)?;
-        Ok(updated_wealth - current_wealth)
+        Ok(Update::Wealth(updated_wealth - current_wealth))
     }
 
     /// Updates this player's debt

lootalot_db/src/models/player/wealth.rs

@@ -22,7 +22,7 @@ fn unpack_gold_value(gold: f64) -> (i32, i32, i32, i32) {
 ///
 /// Values are held as individual pieces counts.
 /// Allows conversion from and to a floating amount of gold pieces.
-#[derive(Queryable, AsChangeset, Serialize, Deserialize, Debug)]
+#[derive(Queryable, AsChangeset, Serialize, Deserialize, PartialEq, Copy, Clone, Debug)]
 #[table_name = "players"]
 pub struct Wealth {
     pub cp: i32,
@@ -69,12 +69,7 @@ impl std::ops::Sub for Wealth {
     /// What needs to be added to 'other' so that
     /// the result equals 'self'
     fn sub(self, other: Self) -> Self {
-        Wealth {
-            cp: self.cp - other.cp,
-            sp: self.sp - other.sp,
-            gp: self.gp - other.gp,
-            pp: self.pp - other.pp,
-        }
+        Wealth::from_gp(self.to_gp() - other.to_gp())
     }
 }
 
@@ -82,12 +77,7 @@ impl std::ops::Add for Wealth {
     type Output = Self;
 
     fn add(self, other: Self) -> Self {
-        Wealth {
-            cp: self.cp + other.cp,
-            sp: self.sp + other.sp,
-            gp: self.gp + other.gp,
-            pp: self.pp + other.pp
-        }
+        Wealth::from_gp(self.to_gp() + other.to_gp())
     }
 }
 
@@ -116,4 +106,52 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_negative_wealth() {
+        use super::Wealth;
+
+        assert_eq!(
+            Wealth{ cp: 3, sp: 2, gp: 1, pp: 0 } + Wealth{ cp: -8, pp: 0, sp: 0, gp: 0 },
+            Wealth::from_gp(1.23 - 0.08)
+        )
+
+    }
+    #[test]
+    fn test_negative_wealth_inverse() {
+        use super::Wealth;
+
+        assert_eq!(
+            (Wealth{ cp: 3, sp: 2, gp: 1, pp: 0 } + Wealth{ cp: -8, pp: 0, sp: 0, gp: 0 }).to_gp(),
+            1.23 - 0.08
+        )
+
+    }
+    #[test]
+    fn test_diff_adding() {
+        use super::Wealth;
+
+        // Let say we add 0.08 gp
+        // 1.23 + 0.08 gold is 1.31, diff is cp: -2, sp: +1
+        let old = Wealth::from_gp(1.23);
+        let new = Wealth::from_gp(1.31);
+        let diff = new - old;
+        assert_eq!(diff.as_tuple(), (-2, 1, 0, 0));
+        assert_eq!(diff.to_gp(), 0.08);
+        assert_eq!(new - diff, old);
+
+    }
+    #[test]
+    fn test_diff_subbing() {
+        use super::Wealth;
+
+        // Let say we sub 0.08 gp
+        // 1.31 - 0.08 gold is 1.23, diff is cp: +2, sp: -1
+        let old = Wealth::from_gp(1.31);
+        let new = Wealth::from_gp(1.23);
+        let diff = new - old;
+        assert_eq!(diff.as_tuple(), (2, -1, 0, 0));
+        assert_eq!(diff.to_gp(), -0.08);
+        assert_eq!(new - diff, old);
+    }
+
 }

lootalot_db/src/schema.rs

@@ -54,6 +54,14 @@ table! {
     }
 }
 
+table! {
+    shop (id) {
+        id -> Integer,
+        name -> Text,
+        base_price -> Integer,
+    }
+}
+
 joinable!(claims -> looted (loot_id));
 joinable!(claims -> players (player_id));
 joinable!(history -> players (player_id));
@@ -67,4 +75,5 @@ allow_tables_to_appear_in_same_query!(
     looted,
     notifications,
     players,
+    shop,
 );

lootalot_front/.browserslistrc

@@ -1,2 +0,0 @@
-> 1%
-last 2 versions

lootalot_front/.eslintrc.js

@@ -1,27 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true
-  },
-  'extends': [
-    'plugin:vue/essential',
-    'eslint:recommended'
-  ],
-  rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
-  },
-  parserOptions: {
-    parser: 'babel-eslint'
-  },
-  overrides: [
-    {
-      files: [
-        '**/__tests__/*.{j,t}s?(x)'
-      ],
-      env: {
-        mocha: true
-      }
-    }
-  ]
-}

lootalot_front/.gitignore

@@ -1,21 +0,0 @@
-.DS_Store
-node_modules
-/dist
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?

lootalot_front/README.md

@@ -1,29 +0,0 @@
-# lootalot_front
-
-## Project setup
-```
-npm install
-```
-
-### Compiles and hot-reloads for development
-```
-npm run serve
-```
-
-### Compiles and minifies for production
-```
-npm run build
-```
-
-### Run your tests
-```
-npm run test
-```
-
-### Lints and fixes files
-```
-npm run lint
-```
-
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).

lootalot_front/babel.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  presets: [
-    '@vue/app'
-  ]
-}

lootalot_front/package.json

@@ -1,29 +0,0 @@
-{
-  "name": "lootalot_front",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint",
-    "test:unit": "vue-cli-service test:unit"
-  },
-  "main": "sass/scroll.scss",
-  "dependencies": {
-    "bulma": "^0.7.5",
-    "core-js": "^2.6.5",
-    "vue": "^2.6.10"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.11.0",
-    "@vue/cli-plugin-eslint": "^3.11.0",
-    "@vue/cli-plugin-unit-mocha": "^3.11.0",
-    "@vue/cli-service": "^3.11.0",
-    "@vue/test-utils": "1.0.0-beta.29",
-    "babel-eslint": "^10.0.1",
-    "chai": "^4.1.2",
-    "eslint": "^5.16.0",
-    "eslint-plugin-vue": "^5.0.0",
-    "vue-template-compiler": "^2.6.10"
-  }
-}

lootalot_front/postcss.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  plugins: {
-    autoprefixer: {}
-  }
-}

lootalot_front/public/index.html

@@ -1,20 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
-        <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-        <link rel="stylesheet" href="<%= BASE_URL %>css/scroll.css">
-        <title>Loot-a-Lot !</title>
-        <script defer src="<%= BASE_URL %>fontawesome/js/all.js"></script>
-</head>
-<body>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-    <noscript>
-      <strong>We're sorry but lootalot_front doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-  </body>
-</html>

lootalot_front/sass/scroll.scss

@@ -1,21 +0,0 @@
-@charset "utf-8";
-
-$brown: #757763;
-$beige: #C9AD6A;
-$beige-light: #E0E5C1;
-$beige-lighter: #EEE5CE;
-$red: #B7321B;
-$dark-red: #58180D;
-$yellow-light: #FCF2C5;
-
-$link: $brown;
-$primary: $brown;
-$info: $beige;
-$danger: $red;
-
-$table-cell-border: 1px solid $dark-red;
-$table-striped-row-even-background-color: $yellow-light;
-
-$button-padding-horizontal: 1em;
-
-@import "../node_modules/bulma/bulma.sass";

lootalot_front/src/App.vue

@@ -1,187 +0,0 @@
-<template>
-  <PlayerView
-    :id="player_id"
-    v-slot="{ player, loot, notifications, actions, claims }"
-  >
-    <main id="app" class="container">
-      <header>
-        <HeaderBar>
-          <template v-slot:title>
-            {{ player.name }}
-          </template>
-          <template v-slot:links>
-            <a class="navbar-item">History of Loot</a>
-            <template v-if="playerIsGroup">
-              <hr class="navbar-divider">
-              <div class="navbar-item heading">Admin</div>
-              <a class="navbar-item">"Resolve claims"</a>
-              <a class="navbar-item">"Add player"</a>
-            </template>
-            <hr class="navbar-divider">
-            <div class="navbar-item heading">Changer</div>
-            <a v-for="(p,i) in playerList" :key="i"
-              @click="setActivePlayer(i)"
-              href="#" class="navbar-item">
-              {{ p.name }}</a>
-          </template>
-        </HeaderBar>
-        <Wealth 
-            :wealth="[player.cp, player.sp, player.gp, player.pp]" 
-            :debt="player.debt"
-            @update="actions.updateWealth"
-        ></Wealth>
-        <p v-show="notifications.length > 0">{{ notifications }}</p>
-      </header>
-      <nav>
-        <div class="tabs is-centered is-boxed is-medium">
-          <ul>
-            <li :class="{ 'is-active': activeView == 'group' }">
-              <a @click="switchView('group')">
-                Coffre de groupe
-              </a>
-            </li>
-            <li v-show="!playerIsGroup" :class="{ 'is-active': activeView == 'player' }">
-              <a @click="switchView('player')">
-                Mon coffre
-              </a>
-            </li>
-            <li :class="{'is-active': activeView == 'adding' }">
-              <a class="has-text-grey-light"
-                 @click="switchView('adding')">
-                + {{ playerIsGroup ? 'Nouveau Loot' : 'Acheter' }}
-              </a>
-            </li>
-           </ul>
-        </div>
-      </nav>
-      <main class="section">
-        <template v-if="isAdding">
-          <Loot v-if="playerIsGroup"
-            :inventory="itemsInventory"
-            @addItem="item => pending_loot.push(item)"
-            @confirmAction="addNewLoot"
-          ></Loot>
-          <AddingChest
-              :player="player.id"
-              :claims="claims"
-              :items="playerIsGroup ? pending_loot : itemsInShop"
-              :perms="playerIsGroup ? {} : { canBuy: true }"
-              @buy="(data) => { switchView('player'); actions.buyItems(data); }">
-          </AddingChest>
-        </template>
-        <Chest v-else
-            :player="player.id"
-            :claims="claims"
-            :items="showPlayerChest ? loot : groupLoot"
-            :perms="{ 
-                canGrab: !(showPlayerChest || playerIsGroup), 
-                canSell: showPlayerChest || playerIsGroup
-            }"
-            @sell="actions.sellItems"
-            @claim="actions.putClaim"
-            @unclaim="actions.withdrawClaim">
-        </Chest>
-      </main>
-    </main>
-  </PlayerView>
-</template>
-
-<script>
-import PlayerView from './components/PlayerView.js'
-import HeaderBar from './components/HeaderBar.vue'
-import Wealth from './components/Wealth.vue'
-import Chest from './components/Chest.vue'
-import Loot from './components/Loot.vue'
-import { api } from './lootalot.js'
-
-function getCookie(cname) {
-  var name = cname + "=";
-  var decodedCookie = decodeURIComponent(document.cookie);
-  var ca = decodedCookie.split(';');
-  for(var i = 0; i <ca.length; i++) {
-    var c = ca[i];
-    while (c.charAt(0) == ' ') {
-      c = c.substring(1);
-    }
-    if (c.indexOf(name) == 0) {
-      return c.substring(name.length, c.length);
-    }
-  }
-  return "";
-}
-
-export default {
-  name: 'app',
-  data () {
-      return {
-        player_id: 0,
-        playerList: [],
-        activeView: 'group',
-        groupLoot: [],
-        itemsInventory: [],
-        itemsInShop: [{id: 1, name: "Item from shop #1", base_price: 2000}],
-        pending_loot: [],
-        initiated: false,
-      };
-  },
-  components: {
-    PlayerView,
-    HeaderBar,
-    'AddingChest': Chest, // Alias to prevent component re-use 
-    Chest,
-    Wealth,
-    Loot,
-  },
-  created () {
-      const cookie = getCookie("player_id");
-      this.player_id = cookie ? Number(cookie) : 0;
-      Promise.all([
-          api.fetch("players/", "GET", null),
-          api.fetch("players/0/loot", "GET", null),
-          api.fetch("items", "GET", null),
-      ])
-          .then(([players, loot, items]) => {
-              this.playerList = players.value;
-              this.groupLoot = loot.value;
-              this.itemsInventory = items.value;
-          })
-          .catch(r => alert("Error ! \n" + r))
-          .then(() => this.initiated = true);
-  },
-  methods: {
-    setActivePlayer (idx) { 
-        if (idx == 0) this.switchView('group');
-        this.player_id = Number(idx)
-        document.cookie = `player_id=${idx};`;
-    },
-    switchView (viewId) {
-        if (!['group', 'player', 'adding'].includes(viewId)) {
-            console.error("Not a valid view ID :", viewId);
-        }
-        this.activeView = viewId;
-    },
-    addNewLoot () {
-        api.fetch("players/0/loot", "POST", {
-            source_name: "Dummy name",
-            items: this.pending_loot,
-        })
-           .then(() => {
-               this.pending_loot = []
-               this.switchView('group');
-           })
-           .catch(r => alert("Error: " + r));
-    }
-  },
-  computed: {
-    showPlayerChest () { return this.activeView == 'player' },
-    isAdding () { return this.activeView == 'adding' },
-    playerIsGroup () { return this.player_id == 0 },
-  }
-}
-</script>
-
-<style scoped>
-    header {
-        padding-bottom: 1.5em;
-    }
-</style>

lootalot_front/src/components/Chest.vue

@@ -1,166 +0,0 @@
-<template>
-  <article>
-    <p class="control has-icons-left">
-      <input type="text" class="input" v-model="searchText">
-      <span class="icon is-small is-left"><i class="fas fa-search"></i></span>
-    </p>
-    <table class="table is-fullwidth is-striped">
-      <thead>
-        <tr>
-          <th width="100%">Objets</th>
-          <th>Valeur</th>
-          <th>
-            <div v-if="perms.canSell" class="buttons" :class="{'has-addons': is_selling}">
-              <button class="button"
-                :class="is_selling ? 'is-danger' : 'is-warning'"
-                @click="sellSelectedItems"
-              >
-                <span class="icon">
-                  <i class="fas fa-coins"></i>
-                </span>
-                <p v-if="!is_selling">Vendre</p>
-                <p v-else>{{ selected_items.length > 0 ? `${totalSelectedValue} po` : 'Annuler' }}</p>
-              </button>
-              <PercentInput v-show="is_selling" v-model="global_mod"></PercentInput>
-            </div>
-            <div v-else-if="perms.canBuy">
-              <button class="button is-danger is-fullwidth"
-                :disabled="selected_items.length == 0"
-                @click="buySelectedItems"
-              >Acheter ({{ totalSelectedValue}}po)</button>
-            </div>
-            <div v-else-if="perms.canGrab">
-              <button class="button is-static is-fullwidth">Demander</button>
-            </div>
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-        <template v-for="(item, idx) in shownItems">
-          <tr :key="`row-${idx}`">
-            <td>
-              <strong>{{item.name}}</strong>
-            </td>
-            <td>
-              {{ is_selling ? item.base_price / 2 : item.base_price }}po
-            </td>
-            <td>
-              <Request
-                v-if="perms.canGrab"
-                :id="player"
-                :claims="claims"
-                :item="item.id"
-                @claim="(data) => $emit('claim', data)"
-                @unclaim="(data) => $emit('unclaim', data)"
-              ></Request>
-              <Selector
-                v-else-if="showSelectors"
-                :id="item.id"
-                v-model="selected_items"
-              ></Selector>
-            </td>
-          </tr>
-        </template>
-      </tbody>
-    </table>
-  </article>
-</template>
-
-<script>
-    import Request from './Request.vue'
-    import PercentInput from './PercentInput.vue'
-    import Selector from './Selector.vue'
-    import { api } from '../lootalot.js'
-    /*
-        The chest displays a collection of items.
-
-        A set of permissions is passed as props, to update
-        the possible actions of active user upon these items.
-
-    */
-    export default {
-        props: {
-            player: {
-                type: Number,
-                required: true,
-            },
-            items: {
-                type: Array,
-                required: true,
-            },
-            perms: {
-                type: Object,
-                required: true,
-            },
-            claims: {
-                type: Object,
-                required: true,
-            },
-        },
-        components: {
-            Request,
-            PercentInput,
-            Selector,
-        },
-        data () {
-            return {
-                is_selling: false,
-                selected_items: [],
-                global_mod: 0,
-                searchText: "",
-            };
-        },
-        methods: {
-            buySelectedItems () {
-                this.$emit("buy", this.selected_items);
-                this.selected_items = [];
-            },
-            sellSelectedItems () {
-                if (!this.is_selling) {
-                    this.is_selling = true;
-                } else {
-                    this.is_selling = false;
-                    if (this.selected_items.length > 0) {
-                        this.$emit("sell", this.selected_items);
-                        this.selected_items = [];
-                    }
-                }
-            },
-        },
-        computed: {
-            shownItems () {
-                if (this.searchText != "") {
-                    const searchText = this.searchText.toUpperCase();
-                    return this.items.filter(item => item.name.toUpperCase().includes(searchText));
-                } else {
-                    return this.items;
-                }
-            },
-            showSelectors () {
-                return !this.perms.canGrab
-                    && (this.is_selling || this.perms.canBuy);
-            },
-            totalSelectedValue () {
-                var total = this.selected_items
-                    .map(([id, mod]) => {
-                        const item = this.items.find(item => item.id == id);
-                        var price = item.base_price * mod;
-                        if (this.is_selling) { 
-                            price = price / 2;
-                        }
-                        return price;
-                    })
-                    .reduce((total,value) => total + value, 0);
-                return (1 + this.global_mod / 100) * total;
-            },
-        },
-    }
-</script>
-
-<style scoped>
-    .table td, .table th { vertical-align: middle; }
-    .buttons { flex-wrap: nowrap; }
-    label.is-checkbox {
-        background-color: #eee;
-    }
-</style>

lootalot_front/src/components/HeaderBar.vue

@@ -1,36 +0,0 @@
-<template>
-  <nav class="navbar is-info">
-    <div class="navbar-brand">
-      <p class="navbar-item is-size-4"><slot name="title">...</slot></p>
-      <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false"
-         @click="switchMobileVisibility">
-        <span aria-hidden="true"></span>
-        <span aria-hidden="true"></span>
-        <span aria-hidden="true"></span>
-      </a>
-    </div>
-    <div id="menu" class="navbar-menu" :class="{'is-active': showOnMobile }">
-      <div class="navbar-end">
-      <div class="navbar-item has-dropdown is-hoverable">
-        <a class="navbar-link">Autres</a>
-        <div class="navbar-dropdown is-right" @click="switchMobileVisibility">
-          <slot name="links">
-          <a class="navbar-item">History of Loot</a>
-          </slot>
-        </div>
-      </div>
-      </div>
-    </div>
-  </nav>
-</template>
-
-<script>
-    export default {
-        data () { return { showOnMobile: false } },
-        methods: {
-            switchMobileVisibility () {
-                this.showOnMobile = !this.showOnMobile
-            }
-        }
-    }
-</script>

lootalot_front/src/components/ItemInput.vue

@@ -1,109 +0,0 @@
-<template>
-    <div class="field is-horizontal">
-        <div class="field-label">
-            <label class="label">Nouvel objet</label>
-        </div>
-        <div class="field-body">
-            <div class="field">
-                <div class="control is-expanded">
-                    <input type="text"
-                        name="name"
-                        placeholder="Nom de l'objet"
-                        v-model="item.name"
-                        @input="autoCompletion"
-                        class="input"
-                        autocomplete="on"
-                    >
-                </div>
-                <div class="dropdown" :class="{'is-active': showCompletionFrame}">
-                    <div class="dropdown-menu">
-                        <div class="dropdown-content">
-                            <a v-for="(result,i) in results"
-                                :key="i"
-                                @click="setResult(result)"
-                                class="dropdown-item"
-                            >{{ result.name }}</a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="field is-expanded has-addons" v-show="item.name != ''">
-                <p class="control"><a class="button is-static">PO</a></p>
-                <p class="control">
-                    <input type="text"
-                        name="base_price"
-                        placeholder="Prix"
-                        class="input"
-                        :class="{'is-danger': item.base_price == ''}"
-                        v-model.number="item.base_price"
-                    >
-                </p>
-            </div>
-            <div class="field">
-                <div class="control">
-                    <button class="button is-primary"
-                        @click="addItem"
-                        :disabled="!isItemValid"
-                    >Ajouter</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-    export default {
-        props: ["source"],
-        data () {
-            return {
-                is_loading: false,
-                item: {
-                    id: 0,
-                    name: '',
-                    base_price: '',
-                },
-                results: [],
-            };
-        },
-        methods: {
-            autoCompletion () {
-                // Unset any previous value on input (for every field except item's name)
-                this.item.base_price = '';
-                if (this.item.name == '') {
-                    this.results = [];
-                } else {
-                    this.results = this.source.filter(
-                        item => item.name.toUpperCase().includes(this.item.name.toUpperCase())
-                    );
-                }
-            },
-            setResult(result) {
-                this.item.id = result.id;
-                this.item.name = result.name;
-                this.item.base_price = result.base_price;
-                // Clear results to close completionFrame
-                this.results = [];
-            },
-            addItem () {
-                this.$emit("addItem", this.item);
-                this.item = {
-                    name: '',
-                    base_price: '',
-                };
-                this.results = [];
-            },
-        },
-        computed: {
-            showCompletionFrame () { return this.results.length > 0 },
-            isItemValid () { return this.item.name != '' && this.item.base_price != '' },
-        }
-    }
-</script>
-
-<style scoped>
-.dropdown, .dropdown-menu {
-    min-width: 100%;
-    margin-top: 0;
-    padding-top: 0;
-}
-</style>

lootalot_front/src/components/Loot.vue

@@ -1,35 +0,0 @@
-<template>
-  <div class="box">
-    <ItemInput
-      @addItem="onAddItem"
-      :source="inventory"
-    ></ItemInput>
-    <div class="field is-horizontal">
-      <div class="field-label"><label class="label">ou</label></div>
-      <div class="field-body">
-        <div class="field">
-            <div class="control">
-                <button class="button is-primary">Depuis une liste</button>
-            </div>
-        </div>
-      </div>
-    </div>
-    <button class="button is-danger" @click="$emit('confirmAction')">Finaliser</button>
-  </div>
-</template>
-
-<script>
-    import ItemInput from './ItemInput.vue'
-
-    export default {
-        props: ["inventory"],
-        components: { ItemInput },
-        data () { return {}; },
-        methods: {
-            onAddItem (item) {
-                this.$emit('addItem', item);
-            },
-        }
-
-    }
-</script>

lootalot_front/src/components/PercentInput.vue

@@ -1,41 +0,0 @@
-<template>
-  <div class="field has-addons">
-    <div v-show="is_opened" class="control has-icons-left">
-      <input class="input" :value="value" @input="input" type="number" size="3" min="-50" max=50 step=5>
-      <span class="icon is-left">
-        <i class="fas fa-percent"></i>
-      </span>
-    </div>
-    <div class="control">
-      <button class="button" @click="switchOpenedState">
-        <small v-if="!is_opened">Mod.</small>
-        <span v-else class="icon"><i class="fas fa-times-circle"></i></span>
-      </button>
-    </div>
-  </div>
-</template>
-
-<script>
-    export default {
-        props: ["value"],
-        data () {
-            return {
-                is_opened: false,
-            };
-        },
-        methods: {
-            input (event) { this.$emit("input", event.target.value); },
-            switchOpenedState () {
-                this.is_opened = !this.is_opened;
-                // Reset the modifier in closed state
-                if (!this.is_opened) {
-                    this.$emit("input", 0);
-                }
-            }
-        }
-    }
-</script>
-
-<style scoped>
-  .input { width: 6em; }
-</style>

lootalot_front/src/components/PlayerView.js

@@ -1,107 +0,0 @@
-import { api } from '../lootalot.js'
-
-export default {
-    props: ["id"],
-    data () { return {
-        player: {
-            name: "Loading",
-            id: 0,
-            cp: '-', sp: '-', gp: '-', pp: '-',
-            debt: 0,
-        },
-        notifications: [],
-        loot: [],
-        claims: {},
-    }},
-    created () {
-        api.fetch("claims", "GET", null)
-            .then(r => {
-                for (var idx in r.value) {
-                    var claim = r.value[idx];
-                    if (!(claim.player_id in this.claims)) {
-                        this.$set(this.claims, claim.player_id, []);
-                    }
-                    this.claims[claim.player_id].push(claim.loot_id);
-                }
-            });
-    },
-    methods: {
-        parseUpdate (update) {
-            if (update.Wealth) {
-                var w = update.Wealth;
-                this.player.cp += w.cp;
-                this.player.sp += w.sp;
-                this.player.gp += w.gp;
-                this.player.pp += w.pp;
-            }
-            else if (update.ItemAdded) {
-                var i = update.ItemAdded;
-                this.loot.push(i);
-            }
-            else if (update.ItemRemoved) {
-                var i = update.ItemRemoved;
-                this.loot.splice(this.loot.indexOf(i), 1);
-            }
-            else if (update.ClaimAdded) {
-                var c = update.ClaimAdded;
-                this.claims[c.player_id].push(c.loot_id);
-            }
-            else if (update.ClaimRemoved) {
-                var c = update.ClaimRemoved;
-                this.claims[c.player_id].splice(
-                    this.claims[c.player_id].indexOf(c.loot_id),
-                    1
-                );
-            }
-        },
-        call (resource, method, payload) {
-            return api.fetch(`players/${this.id}/${resource}`, method, payload)
-                .then(response => {
-                    if (response.notification) {
-                        this.notifications.push(response.notification)
-                    }
-                    if (response.errors) {
-                        this.notifications.push(response.errors)
-                    }
-                    if (response.updates) {
-                        for (var idx in response.updates) {
-                            this.parseUpdate(response.updates[idx]);
-                        }
-                    }
-                    return response.value;
-                })
-        },
-        updateWealth (value) { this.call("wealth", "PUT", Number(value)) },
-        putClaim (itemId) { this.call("claims", "PUT", itemId) },
-        withdrawClaim (itemId) { this.call("claims", "DELETE", itemId) },
-        buyItems(items) { this.call("loot", "PUT", items) },
-        sellItems (items) { this.call("loot", "DELETE", items) },
-    },
-    watch: {
-        id: {
-            immediate: true,
-            handler: function(newId) {
-                this.call("", "GET", null)
-                    .then(p => this.player = p)
-                this.call("loot", "GET", null)
-                    .then(l => this.loot = l)
-            }
-        },
-    },
-    computed: {},
-    render () {
-        return this.$scopedSlots.default({
-            player: this.player, 
-            loot: this.loot,
-            notifications: this.notifications,
-            actions: {
-                    updateWealth: this.updateWealth,
-                    putClaim: this.putClaim,
-                    withdrawClaim: this.withdrawClaim,
-                    buyItems: this.buyItems,
-                    sellItems: this.sellItems,
-            },
-            claims: this.claims,
-        })
-    }
-}

lootalot_front/src/components/Request.vue

@@ -1,92 +0,0 @@
-<template>
-  <div class="buttons">
-    <template v-if="isInConflict">
-      <button class="button is-success" 
-        @click="cancelRequest">
-        <span class="icon is-small">
-          <i class="fas fa-hand-peace"></i>
-        </span>
-      </button>
-      <button class="button is-danger" 
-        @click="hardenRequest">
-        <span class="icon is-small">
-          <i class="fas fa-hand-middle-finger"></i>
-        </span>
-      </button>
-    </template>
-    <button class="button is-primary"
-      @click="putRequest"
-      :disabled="isRequested">
-      <span class="icon is-small">
-        <i class="fas fa-praying-hands"></i>
-      </span>
-    </button>
-  </div>
-</template>
-
-<script>
-    export default {
-        props: {
-            // Id of active player
-            id: {
-                type: Number,
-                required: true,
-            },
-            // Map of all claims
-            claims: {
-                type: Object,
-                required: true,
-            },
-            // Id of item we are bound to
-            item: {
-                type: Number,
-                required: true,
-            }
-        },
-        computed: {
-            // Check if item is requested by active player
-            isRequested () {
-                if (this.claims[this.id]) {
-                    return this.claims[this.id].includes(this.item);
-                } else {
-                    return false;
-                }
-            },
-            // Check if item is requested by multiple players including active one
-            isInConflict () {
-                var reqByPlayer = false;
-                var reqByOther = false;
-                for (var id in this.claims) {
-                    const isReq = this.claims[id].includes(this.item);
-                    if (isReq) {
-                        if (id == this.id) {
-                            reqByPlayer = true;
-                        } else {
-                            reqByOther = true;
-                        }
-                    }
-                }
-                return reqByPlayer && reqByOther;
-            },
-        },
-        methods: {
-            // The active player claims the item
-            putRequest () {
-                this.$emit("claim", this.item);
-            },
-            // The active player withdraws his request
-            cancelRequest () {
-                this.$emit("unclaim", this.item);
-            },
-            // The active player insist on his claim
-            // TODO: Find a simple and fun system to express
-            //       how much each player want an item
-            hardenRequest () {
-            }
-        },
-    }
-</script>
-
-<style scoped>
-    .buttons, .button { margin-bottom: 0; }
-</style>

lootalot_front/src/components/Selector.vue

@@ -1,57 +0,0 @@
-<template>
-  <div class="buttons has-addons">
-    <label class="button is-fullwidth">
-        <input type="checkbox" class="checkbox" v-model="selected">
-    </label>
-    <PercentInput v-show="selected" v-model.number="mod_value"></PercentInput>
-  </div>
-</template>
-
-<script>
-import PercentInput from './PercentInput.vue'
-
-/*  Selector for a specific item, with an associated price modifier.
-    Acts as checkbox on a v-model, except it populates an array with [value, modifier] instead of value alone
-*/
-
-export default {
-    props: ["id", "value"],
-    components: { PercentInput },
-    data () {
-        return {
-            selected: false,
-            mod_value: 0,
-        };
-    },
-    computed: {
-        modifier () {
-            return 1 + this.mod_value / 100;
-        }
-    },
-    watch: {
-        selected (newState) {
-            let idx = this._findData();
-            var updated = this.value;
-            if (newState == true && idx == -1) {
-                updated.push([this.id, this.modifier]);
-            } else if (newState == false && idx != -1 ) {
-                updated.splice(idx, 1);
-            }
-            this.$emit('input', updated);
-        },
-        mod_value (newState) {
-            let idx = this._findData();
-            var updated = this.value;
-            if (idx != -1) {
-                updated.splice(idx, 1, [this.id, this.modifier]);
-                this.$emit('input', updated);
-            }
-        }
-    },
-    methods: {
-        _findData () {
-            return this.value.findIndex(([val,mod]) => this.id == val);
-        }
-    }
-  }
-</script>

lootalot_front/src/components/Wealth.vue

@@ -1,97 +0,0 @@
-<template>
-  <section class="level is-mobile">
-    <div class="level-left">
-      <div class="level-item">
-	    <span class="icon is-large" @click="editing = !editing">
-	      <i class="fas fa-2x fa-piggy-bank"></i>
-	    </span>
-      </div>
-      <template v-if="editing">
-      <div class="level-item">
-        <div class="field has-addons">
-          <p class="control">
-    	    <input class="input" type="number" step="0.01" v-model="edit_value"></input>
-          </p>
-          <p class="control">
-            <a class="button is-static">po</a>
-          </p>
-        </div>
-      </div>
-      <div class="level-item">
-        <button class="button is-danger" @click="updateWealth()">
-          Modifier
-        </button>
-      </div>
-      </template>
-      <template v-else>
-      <div class="level-item ">
-       <p class="is-size-4">{{ pp }}</p>
-       <p class="heading">PP</p>
-      </div>
-     <div class="level-item ">
-       <p class="is-size-4">{{ gp }}</p>
-       <p class="heading">PO</p>
-     	</div>
-     <div class="level-item ">
-       <p class="is-size-4 has-text-grey-light">{{ sp }}</p>
-       <p class="heading">PA</p>
-       </div>
-     <div class="level-item ">
-       <p class="is-size-4 has-text-grey-light">{{ cp }}</p>
-       <p class="heading">PC</p>
-       </div>
-    </template>
-    </div>
-    <div class="level-right" v-if="debt">
-      <div class="level-item">
-        <p class="heading is-size-4 has-text-danger">Dette: {{ debt }}gp </p>
-      </div>
-    </div>
-    </div>
-  </section>
-</template>
-
-<script>
-    export default {
-        props: ["wealth", "debt"],
-        data () { 
-            return {
-              editing: false,
-              edit_value: 0,
-            }; 
-        },
-        methods: {
-            updateWealth () {
-                this.$emit("update", this.edit_value);
-                this.resetValues();
-            },
-            resetValues () {
-              this.editing = false;
-              this.edit_value = 0;
-            }
-        },
-        computed: {
-            pp () {
-                return this.wealth[3];
-            },
-            gp () {
-                const gp = this.wealth[2];
-                if (gp < 10) {
-                    return "0" + gp;
-                } else {
-                    return gp;
-                }
-            },
-            sp () {
-                return this.wealth[1];
-            },
-            cp () {
-                return this.wealth[0];
-            },
-        }
-    }
-</script>
-
-<style scoped>
-    .input { max-width: 9em; }
-</style>

lootalot_front/src/lootalot.js

@@ -1,20 +0,0 @@
-const API_BASEURL = "http://localhost:8088/api/"
-const API_ENDPOINT = function (tailString) {
-  return API_BASEURL + tailString;
-}
-
-export const api = {
-    fetch: function(endpoint, method, payload) {
-        var config = {
-            method,
-             headers: {
-                'Content-Type': 'application/json',
-            },
-        };
-        if (payload) {
-            config.body = JSON.stringify(payload);
-        }
-        return fetch(API_ENDPOINT(endpoint), config)
-            .then(r => r.json());
-    }
-}

lootalot_front/src/main.js

@@ -1,8 +0,0 @@
-import Vue from 'vue'
-import App from './App.vue'
-
-Vue.config.productionTip = false
-
-new Vue({
-  render: h => h(App),
-}).$mount('#app')

lootalot_front/tests/unit/.eslintrc.js

@@ -1,5 +0,0 @@
-module.exports = {
-  env: {
-    mocha: true
-  }
-}

lootalot_front/tests/unit/ItemInput.spec.js

@@ -1,94 +0,0 @@
-import { expect } from 'chai'
-import { mount } from '@vue/test-utils'
-import ItemInput from '@/components/ItemInput.vue'
-
-const MOCK_SOURCE = [
-    { id: 1, name: "Épée", base_price: 20 },
-    { id: 2, name: "Arc", base_price: 30 },
-]
-
-const withItemFactory = function (item) {
-    const wrapper = mount(ItemInput, {
-        propsData: {
-            source: MOCK_SOURCE,
-        }
-    })
-    wrapper.setData({ item })
-    return wrapper
-}
-
-describe('ItemInput.vue', () => {
-
-    // Tests on validation of the item data
-    it('item with name and price is valid', () => {
-        const localItem = {
-            item: {
-                id: 0,
-                name: 'Epee',
-                base_price: 200
-            }
-        }
-        expect(ItemInput.computed.isItemValid.call(localItem)).to.equal(true)
-    })
-
-    it('item without data is not valid', () => {
-        const localItem = {
-            item: {
-                id: 0,
-                name: '',
-                base_price: ''
-            }
-        }
-        expect(ItemInput.computed.isItemValid.call(localItem)).to.equal(false)
-    })
-
-    it('item without price is not valid', () => {
-        const localItem = {
-            item: {
-                id: 0,
-                name: 'Epee',
-                base_price: ''
-            }
-        }
-        expect(ItemInput.computed.isItemValid.call(localItem)).to.equal(false)
-    })
-
-    it('item without name is not valid', () => {
-        const localItem = {
-            item: {
-                id: 0,
-                name: '',
-                base_price: 200
-            }
-        }
-        expect(ItemInput.computed.isItemValid.call(localItem)).to.equal(false)
-    })
-
-    it('item price must be a number', () => {
-        const localItem = {
-            item: {
-                id: 0,
-                name: 'Epee',
-                base_price: 'cheap'
-            }
-        }
-        expect(ItemInput.computed.isItemValid.call(localItem)).to.equal(false)
-    })
-
-    // Test on auto-completion
-    it('show completion suggestions on input', () => {
-        const wrapper = withItemFactory({ id: 0, name: '', base_price: '' })
-        const input = wrapper.find({ name: "name" })
-        const suggestionBox = wrapper.find('.dropdown')
-        console.log(input)
-        expect(suggestionBox.classes('is-active')).to.equal(true)
-    })
-
-    it('hides suggestion box when no suggestions are available', () => {
-
-    })
-
-    it('click on suggestion sets the item', () => {
-
-    })
-})

lootalot_front/tests/unit/Wealth.spec.js

@@ -1,14 +0,0 @@
-import { expect } from 'chai'
-import { shallowMount  } from '@vue/test-utils'
-import Wealth from '@/components/Wealth.vue'
-
-describe('Wealth.vue', () => {
-    it('renders wealth when passed', () => {
-        const wealth = [1, 2, 3, 4]
-        const wrapper = shallowMount(Wealth, {
-            propsData: { wealth }
-        })
-        var divs = wrapper.findAll('div')
-        expect(wrapper.text()).to.include(wealth)
-    })
-})

src/api.rs

@@ -1,14 +1,31 @@
+use diesel::connection::Connection;
 use lootalot_db::{self as db, DbConnection, Update, Value};
+use std::collections::HashSet;
 
+pub type IdList = Vec<i32>;
 pub type ItemListWithMods = Vec<(i32, Option<f64>)>;
+pub type ItemList = Vec<db::Item>;
 
 #[derive(Serialize, Deserialize, Debug)]
-pub struct SellParams {
+pub struct BuySellParams {
     pub items: ItemListWithMods,
-    players: Option<Vec<i32>>,
+    players: Option<IdList>,
     global_mod: Option<f64>,
 }
 
+#[derive(Serialize, Deserialize, Debug)]
+pub struct NewGroupLoot {
+    source_name: String,
+    // claims_limit_date: String
+    pub items: ItemList,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct NewPlayer {
+    name : String,
+    wealth : f64,
+}
+
 /// A generic response for all queries
 #[derive(Serialize, Debug, Default)]
 pub struct ApiResponse {
@@ -55,26 +72,29 @@ pub enum ApiError {
 
 /// Every allowed queries on the database
 pub enum ApiActions {
+    // Application level
     FetchPlayers,
     FetchInventory,
+    FetchShopInventory,
     FetchClaims,
-    // Player actions
+    CheckItemList(Vec<String>),
+    // Player level
     FetchPlayer(i32),
+    FetchPlayerClaims(i32),
     FetchNotifications(i32),
     FetchLoot(i32),
     UpdateWealth(i32, f64),
-    BuyItems(i32, Vec<(i32, Option<f64>)>),
-    SellItems(i32, SellParams),
-    ClaimItem(i32, i32),
-    UnclaimItem(i32, i32),
-    // Group actions
-    AddLoot(Vec<db::Item>),
-}
-
-pub enum AdminActions {
-    AddPlayer(String, f64),
+    BuyItems(i32, BuySellParams),
+    SellItems(i32, BuySellParams),
+    ClaimItems(i32, IdList),
+    UndoLastAction(i32),
+    // Group level
+    AddLoot(NewGroupLoot),
+    // Admin level
+    RefreshShopInventory(ItemList),
+    AddPlayer(NewPlayer),
     //AddInventoryItem(pub String, pub i32),
-    ResolveClaims,
+    //ResolveClaims,
     //SetClaimsTimeout(pub i32),
 }
 
@@ -83,25 +103,53 @@ pub fn execute(
     query: ApiActions,
 ) -> Result<ApiResponse, diesel::result::Error> {
     let mut response = ApiResponse::default();
-    // TODO: Return an Option<String> that describes what happened.
+    // Return an Option<String> that describes what happened.
     // If there is some value, store the actions in db so that it can be reversed.
-    let action_text: Option<&str> = match query {
+    let action_text: Option<(i32, &str)> = match query {
+        ApiActions::CheckItemList(names) => {
+            let (items, errors) = {
+                let mut found = Vec::new();
+                let mut errors = String::new();
+                let items = db::Inventory(conn).all()?;
+                for name in &names {
+                    if let Some(item) = items.iter().filter(|i| &i.name == name).take(1).next() {
+                        found.push(item.clone())
+                    } else {
+                        errors.push_str(&format!("{},\n", name));
+                    }
+                }
+                (found, errors)
+            };
+
+            response.set_value(Value::ItemList(items));
+            response.push_error(errors);
+            dbg!(&names, &response);
+            None
+        }
         ApiActions::FetchPlayers => {
-            response.set_value(Value::PlayerList(db::Players(conn).all()?));
+            response.set_value(Value::PlayerList(db::Players(conn).all_except_group()?));
             None
         }
         ApiActions::FetchInventory => {
             response.set_value(Value::ItemList(db::Inventory(conn).all()?));
             None
         }
+        ApiActions::FetchShopInventory => {
+            response.set_value(Value::ItemList(db::Shop(conn).all()?));
+            None
+        }
         ApiActions::FetchClaims => {
-            response.set_value(Value::ClaimList(db::fetch_claims(conn)?));
+            response.set_value(Value::ClaimList(db::Claims(conn).all()?));
             None
         }
         ApiActions::FetchPlayer(id) => {
             response.set_value(Value::Player(db::Players(conn).find(id)?));
             None
         }
+        ApiActions::FetchPlayerClaims(id) => {
+            response.set_value(Value::ClaimList(db::Claims(conn).by_player(id)?));
+            None
+        }
         ApiActions::FetchNotifications(id) => {
             response.set_value(Value::Notifications(
                 db::AsPlayer(conn, id).notifications()?,
@@ -113,27 +161,26 @@ pub fn execute(
             None
         }
         ApiActions::UpdateWealth(id, amount) => {
-            response.push_update(Update::Wealth(
-                db::AsPlayer(conn, id).update_wealth(amount)?,
-            ));
+            response.push_update(db::AsPlayer(conn, id).update_wealth(amount)?);
             response.notify(format!("Mis à jour ({}po)!", amount));
-            Some("Argent mis à jour")
+            Some((id, "Argent mis à jour"))
         }
         ApiActions::BuyItems(id, params) => {
             // TODO: check that player has enough money !
-            let mut cumulated_diff: Vec<db::Wealth> = Vec::with_capacity(params.len());
-            let mut added_items: u16 = 0;
-            for (item_id, price_mod) in params.into_iter() {
-                if let Ok((item, diff)) = db::buy_item_from_inventory(conn, id, item_id, price_mod)
-                {
-                    cumulated_diff.push(diff);
-                    response.push_update(Update::ItemAdded(item));
-                    added_items += 1;
+            let has_enough_gold = true;
+
+            if has_enough_gold {
+                let mut gains: Vec<db::Wealth> = Vec::with_capacity(params.items.len());
+                for (item_id, price_mod) in params.items.into_iter() {
+                    if let Ok((item, diff)) = db::buy_item_from_shop(conn, id, item_id, price_mod) {
+                        response.push_update(item);
+                        gains.push(diff);
                     } else {
                         response.push_error(format!("Error adding {}", item_id));
                     }
                 }
-            let total_amount = cumulated_diff
+                let added_items = gains.len();
+                let total_amount = gains
                     .into_iter()
                     .fold(db::Wealth::from_gp(0.0), |acc, i| acc + i);
                 response.notify(format!(
@@ -142,39 +189,44 @@ pub fn execute(
                     total_amount.to_gp()
                 ));
                 response.push_update(Update::Wealth(total_amount));
-            Some("Achat d'objets")
+                Some((id, "Achat d'objets"))
+            } else {
+                response.push_error("Vous n'avez pas assez d'argent !");
+                None
+            }
         }
         // Behavior differs if player is group or regular.
         // Group sells item like players then split the total amount among players.
         ApiActions::SellItems(id, params) => {
-            let mut all_results: Vec<db::Wealth> = Vec::with_capacity(params.items.len());
-            let mut sold_items: u16 = 0;
+            conn.transaction(|| -> Result<Option<(i32, &str)>, diesel::result::Error> {
+                let mut gains: Vec<db::Wealth> = Vec::with_capacity(params.items.len());
                 for (loot_id, price_mod) in params.items.iter() {
                     if let Ok((deleted, diff)) =
                         db::sell_item_transaction(conn, id, *loot_id, *price_mod)
                     {
-                    all_results.push(diff);
-                    response.push_update(Update::ItemRemoved(deleted));
-                    sold_items += 1;
+                        response.push_update(deleted);
+                        gains.push(diff);
                     } else {
-                    response.push_error(format!("Erreur lors de la vente (loot_id : {})", loot_id));
+                        response
+                            .push_error(format!("Erreur lors de la vente (loot_id : {})", loot_id));
                     }
                 }
-            let total_amount = all_results
+                let sold_items = gains.len();
+                let total_amount = gains
                     .into_iter()
                     .fold(db::Wealth::from_gp(0.0), |acc, i| acc + i);
                 match id {
                     0 => {
-                    let share = db::split_and_share(
-                        conn,
-                        total_amount.to_gp() as i32,
-                        params.players.expect("Should not be None"),
-                    )?;
+                        let players = params.players.unwrap_or_default();
+                        if let Update::Wealth(shared) =
+                            db::split_and_share(conn, total_amount.to_gp() as i32, players)?
+                        {
                             response.notify(format!(
-                        "Les objets ont été vendus, chaque joueur a reçu {} po",
-                        share.to_gp()
+                                "Les objets ont été vendus, les joueurs ont reçu (au total) {} po",
+                                shared.to_gp()
                             ));
-                    response.push_update(Update::Wealth(share));
+                            response.push_update(Update::Wealth(total_amount - shared));
+                        };
                     }
                     _ => {
                         response.notify(format!(
@@ -185,24 +237,47 @@ pub fn execute(
                         response.push_update(Update::Wealth(total_amount));
                     }
                 }
-            Some("Vente d'objets")
+                Ok(Some((id, "Vente d'objets")))
+            })?
         }
-        ApiActions::ClaimItem(id, item) => {
-            response.push_update(Update::ClaimAdded(db::Claims(conn).add(id, item)?));
-            response.notify(format!("Pour moi !"));
-            None
+        ApiActions::ClaimItems(id, items) => {
+            conn.transaction(|| -> Result<Option<(i32, &str)>, diesel::result::Error> {
+                let current_claims: HashSet<i32> = db::Claims(conn)
+                    .all()?
+                    .iter()
+                    .filter(|c| c.player_id == id)
+                    .map(|c| c.loot_id)
+                    .collect();
+                let new_claims: HashSet<i32> = items.into_iter().collect();
+                // Claims to delete
+                for item in current_claims.difference(&new_claims) {
+                    response.push_update(db::Claims(conn).remove(id, *item)?);
                 }
-        ApiActions::UnclaimItem(id, item) => {
-            response.push_update(Update::ClaimRemoved(db::Claims(conn).remove(id, item)?));
-            response.notify(format!("Bof! Finalement non."));
+                // Claims to add
+                for item in new_claims.difference(&current_claims) {
+                    response.push_update(db::Claims(conn).add(id, *item)?);
+                }
+                Ok(None)
+            })?
+        }
+        ApiActions::UndoLastAction(id) => {
+            if let Ok(event) = db::models::history::get_last_of_player(conn, id) {
+                let name = String::from(event.name());
+                for undone in event.undo(conn)?.into_inner().into_iter() {
+                    response.push_update(undone);
+                }
+                response.notify(format!("'{}' annulé(e)", name));
+            } else {
+                response.push_error("Aucune action trouvée")
+            };
             None
         }
         // Group actions
-        ApiActions::AddLoot(items) => {
+        ApiActions::AddLoot(data) => {
             let mut added_items = 0;
-            for item in items.into_iter() {
+            for item in data.items.into_iter() {
                 if let Ok(added) = db::LootManager(conn, 0).add_from(&item) {
-                    response.push_update(Update::ItemAdded(added));
+                    response.push_update(added);
                     added_items += 1;
                 } else {
                     response.push_error(format!("Error adding {:?}", item));
@@ -215,20 +290,34 @@ pub fn execute(
             {
                 response.push_error(format!("Erreur durant la notification : {:?}", e));
             };
-            Some("Nouveau loot")
+            Some((0, "Nouveau loot"))
+        }
+        // Admin actions
+        ApiActions::RefreshShopInventory(items) => {
+            db::Shop(conn).replace_list(items)?;
+            response.notify("Inventaire du marchand renouvelé !");
+            None
+        }
+        ApiActions::AddPlayer(data) => {
+            db::Players(conn).add(&data.name, data.wealth)?;
+            response.notify("Joueur ajouté !");
+            None
         }
     };
 
-    // match _action_text -> Save updates in DB
+    // Store the event if it can be undone.
     dbg!(&action_text);
-    Ok(response)
-}
-
-/// Reverts the last action stored for player
-fn revert_last_action(conn: &DbConnection, id: i32) -> Result<ApiResponse, diesel::result::Error> {
-    let mut response = ApiResponse::default();
-    // 1. Load the last action
-    // 2. Iterate trought updates and reverse them (in a single transaction)
-    // 3. Send nice message back ("'action desc text' annulé !")
+    if let Some((id, text)) = action_text {
+        db::models::history::insert_event(
+            conn,
+            id,
+            text,
+            response
+                .updates
+                .as_ref()
+                .expect("there should be updates in here !"),
+        )?;
+    }
+    // match _action_text -> Save updates in DB
     Ok(response)
 }

src/server.rs

@@ -1,30 +1,37 @@
 use actix_cors::Cors;
 use actix_files as fs;
-use actix_web::{web, middleware, App, Error, HttpResponse, HttpServer, Either};
-use futures::{Future, IntoFuture};
+use actix_identity::{CookieIdentityPolicy, Identity, IdentityService, RequestIdentity};
+use actix_service::{Service, Transform};
+use actix_web::{
+    dev::{ServiceRequest, ServiceResponse},
+    http::{header, StatusCode},
+    middleware, web, App, Error, HttpResponse, HttpServer,
+};
+use futures::{
+    future::{ok, Either, FutureResult},
+    Future,
+};
+use serde_json;
 use std::env;
 
-use lootalot_db as db;
 use crate::api;
+use lootalot_db as db;
 
 type AppPool = web::Data<db::Pool>;
 type PlayerId = web::Path<i32>;
 type ItemId = web::Json<i32>;
+type IdList = web::Json<api::IdList>;
+type BuySellParams = web::Json<api::BuySellParams>;
+type NewGroupLoot = web::Json<api::NewGroupLoot>;
 
-#[derive(Serialize, Deserialize, Debug)]
-struct NewGroupLoot {
-    source_name: String,
-    items: Vec<db::Item>,
-}
-
-type MaybeForbidden = actix_web::Either<Box<dyn Future<Item = HttpResponse, Error = Error>>, HttpResponse>;
+type MaybeForbidden =
+    actix_web::Either<Box<dyn Future<Item = HttpResponse, Error = Error>>, HttpResponse>;
 
 /// Wraps call to the database query and convert its result as a async HttpResponse
 fn db_call(
     pool: AppPool,
     query: api::ApiActions,
-) -> impl Future<Item = HttpResponse, Error = Error>
-{
+) -> impl Future<Item = HttpResponse, Error = Error> {
     let conn = pool.get().unwrap();
     web::block(move || api::execute(&conn, query)).then(|res| match res {
         Ok(r) => HttpResponse::Ok().json(r),
@@ -35,48 +42,102 @@ fn db_call(
     })
 }
 
-fn forbidden_to_players(id: i32, params: (AppPool, api::ApiActions)) -> MaybeForbidden {
+fn restricted_to_group(id: i32, params: (AppPool, api::ApiActions)) -> MaybeForbidden {
     if id != 0 {
-        Either::B(HttpResponse::Forbidden().finish())
+        actix_web::Either::B(HttpResponse::Forbidden().finish())
     } else {
-        Either::A(Box::new(db_call(params.0, params.1)))
+        actix_web::Either::A(Box::new(db_call(params.0, params.1)))
+    }
 }
 
+struct RestrictedAccess;
+
+impl<S, B> Transform<S> for RestrictedAccess
+where
+    S: Service<Request = ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
+    S::Future: 'static,
+{
+    type Request = ServiceRequest;
+    type Response = ServiceResponse<B>;
+    type Error = Error;
+    type InitError = ();
+    type Transform = RestrictedAccessMiddleware<S>;
+    type Future = FutureResult<Self::Transform, Self::InitError>;
+
+    fn new_transform(&self, service: S) -> Self::Future {
+        ok(RestrictedAccessMiddleware { service })
+    }
 }
 
-fn configure_app(config: &mut web::ServiceConfig) {
+struct RestrictedAccessMiddleware<S> {
+    service: S,
+}
+
+impl<S, B> Service for RestrictedAccessMiddleware<S>
+where
+    S: Service<Request = ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
+    S::Future: 'static,
+{
+    type Request = ServiceRequest;
+    type Response = ServiceResponse<B>;
+    type Error = Error;
+    type Future = Either<S::Future, FutureResult<Self::Response, Self::Error>>;
+
+    fn poll_ready(&mut self) -> futures::Poll<(), Self::Error> {
+        self.service.poll_ready()
+    }
+
+    fn call(&mut self, req: ServiceRequest) -> Self::Future {
+        let is_logged_in = req.get_identity().is_some();
+
+        if is_logged_in {
+            Either::A(self.service.call(req))
+        } else {
+            Either::B(ok(
+                req.into_response(HttpResponse::Forbidden().finish().into_body())
+            ))
+        }
+    }
+}
+
+fn configure_api(config: &mut web::ServiceConfig) {
     use api::ApiActions as Q;
     config.service(
         web::scope("/api")
+            .wrap(RestrictedAccess)
             .service(
                 web::scope("/players")
                     .service(
-                        web::resource("/").route(
-                            web::get().to_async(|pool| db_call(pool, Q::FetchPlayers)),
-                        ), //.route(web::post().to_async(endpoints::new_player))
+                        web::resource("/")
+                            .route(web::get().to_async(|pool| db_call(pool, Q::FetchPlayers)))
+                            .route(web::post().to_async(
+                                |pool, player: web::Json<api::NewPlayer>| {
+                                    db_call(pool, Q::AddPlayer(player.into_inner()))
+                                },
+                            )),
                     ) // List of players
                     .service(
                         web::scope("/{player_id}")
-                            .route("/", web::get().to_async(|pool, player: PlayerId| {
+                            .route(
+                                "/",
+                                web::get().to_async(|pool, player: PlayerId| {
                                     db_call(pool, Q::FetchPlayer(*player))
-                            }))
-                            .route("/notifications", web::get().to_async(|pool, player: PlayerId| {
+                                }),
+                            )
+                            .route(
+                                "/notifications",
+                                web::get().to_async(|pool, player: PlayerId| {
                                     db_call(pool, Q::FetchNotifications(*player))
-                            }))
+                                }),
+                            )
                             .service(
                                 web::resource("/claims")
-                                    //.route(web::get().to_async(endpoints::player_claims))
-                                    .route(web::put().to_async(
-                                        |pool, (player, data): (PlayerId, ItemId)| {
-                                            db_call(pool, Q::ClaimItem(*player, *data))
-                                        },
-                                    ))
-                                    .route(web::delete().to_async(
-                                        |pool, (player, data): (PlayerId, ItemId)| {
-                                            db_call(
-                                                pool,
-                                                Q::UnclaimItem(*player, *data),
-                                            )
+                                    .route(web::get().to_async(|pool, player: PlayerId| {
+                                        db_call(pool, Q::FetchPlayerClaims(*player))
+                                    }))
+                                    .route(web::post().to_async(
+                                        |pool, (player, data): (PlayerId, IdList)| {
+                                            db_call(pool, Q::ClaimItems(*player, data.into_inner()))
                                         },
                                     )),
                             )
@@ -85,10 +146,7 @@ fn configure_app(config: &mut web::ServiceConfig) {
                                     //.route(web::get().to_async(...))
                                     .route(web::put().to_async(
                                         |pool, (player, data): (PlayerId, web::Json<f64>)| {
-                                            db_call(
-                                                pool,
-                                                Q::UpdateWealth(*player, *data),
-                                            )
+                                            db_call(pool, Q::UpdateWealth(*player, *data))
                                         },
                                     )),
                             )
@@ -98,49 +156,169 @@ fn configure_app(config: &mut web::ServiceConfig) {
                                         db_call(pool, Q::FetchLoot(*player))
                                     }))
                                     .route(web::put().to_async(
-                                        move |pool, (player, data): (PlayerId, web::Json<api::ItemListWithMods>)| {
+                                        move |pool, (player, data): (PlayerId, BuySellParams)| {
                                             db_call(pool, Q::BuyItems(*player, data.into_inner()))
                                         },
                                     ))
                                     .route(web::post().to(
-                                        move |pool, (player, data): (PlayerId, web::Json<NewGroupLoot>)| {
-                                            forbidden_to_players(*player, (pool, Q::AddLoot(data.into_inner().items)))
+                                        move |pool, (player, data): (PlayerId, NewGroupLoot)| {
+                                            restricted_to_group(
+                                                *player,
+                                                (pool, Q::AddLoot(data.into_inner())),
+                                            )
                                         },
                                     ))
                                     .route(web::delete().to_async(
-                                        move |pool, (player, data): (PlayerId, web::Json<api::SellParams>)| {
+                                        move |pool, (player, data): (PlayerId, BuySellParams)| {
                                             db_call(pool, Q::SellItems(*player, data.into_inner()))
                                         },
                                     )),
-                            ),
+                            )
+                            .service(web::scope("/events").route(
+                                "/last",
+                                web::delete().to_async(|pool, player: PlayerId| {
+                                    db_call(pool, Q::UndoLastAction(*player))
+                                }),
+                            )),
                     ),
             )
-            .route("/claims", web::get().to_async(|pool| db_call(pool, Q::FetchClaims)))
             .route(
-                "/items",
-                web::get()
-                    .to_async(move |pool: AppPool| db_call(pool, Q::FetchInventory)),
+                "/claims",
+                web::get().to_async(|pool| db_call(pool, Q::FetchClaims)),
+            )
+            .service(
+                web::resource("/shop")
+                    .route(web::get().to_async(|pool| db_call(pool, Q::FetchShopInventory)))
+                    .route(
+                        web::post().to_async(|pool, items: web::Json<api::ItemList>| {
+                            db_call(pool, Q::RefreshShopInventory(items.into_inner()))
+                        }),
+                    ),
+            )
+            .service(
+                web::resource("/items")
+                    .route(
+                        web::get().to_async(move |pool: AppPool| db_call(pool, Q::FetchInventory)),
+                    )
+                    .route(web::post().to_async(
+                        move |pool: AppPool, items: web::Json<Vec<String>>| {
+                            db_call(pool, Q::CheckItemList(items.into_inner()))
+                        },
+                    )),
             ),
     );
 }
 
+#[derive(Deserialize)]
+struct AuthRequest {
+    key: String,
+}
+
+#[derive(Debug, Copy, Clone, Serialize, Deserialize)]
+enum SessionKind {
+    Player(i32),
+    Admin,
+}
+
+use std::collections::HashMap;
+
+fn check_key(key: &str, db: HashMap<&str, SessionKind>) -> Option<SessionKind> {
+    db.get(&key).map(Clone::clone)
+}
+
+fn login(id: Identity, key: web::Query<AuthRequest>) -> HttpResponse {
+    if let Some(session_kind) = check_key(
+        &key.key.to_string(),
+        [
+            ("0", SessionKind::Player(0)),
+            ("1", SessionKind::Player(1)),
+            ("2", SessionKind::Player(2)),
+            ("admin", SessionKind::Admin),
+        ]
+        .iter()
+        .cloned()
+        .collect::<HashMap<&str, SessionKind>>(),
+    ) {
+        id.remember(serde_json::to_string(&session_kind).expect("Serialize SessionKind error"));
+        HttpResponse::build(StatusCode::TEMPORARY_REDIRECT)
+            .header(header::LOCATION, "/")
+            .finish()
+    } else {
+        HttpResponse::Forbidden().finish()
+    }
+}
+
+fn logout(id: Identity) -> HttpResponse {
+    id.forget();
+    HttpResponse::build(StatusCode::TEMPORARY_REDIRECT)
+        .header(header::LOCATION, "/")
+        .finish()
+}
+
+/// This endpoint shall be called by client,
+/// at initialization, to retrieve the current
+/// logging session info.
+///
+/// # Returns
+///
+/// The player data if a player is logged in
+/// The admin data if the admin is logged in
+/// A Forbidden response otherwise
+fn enter_session(id: Identity, pool: AppPool) -> impl Future<Item = HttpResponse, Error = Error> {
+    let conn = pool.get().unwrap();
+    let logged: SessionKind = id
+        .identity()
+        .map(|s| serde_json::from_str(&s).expect("Deserialize SessionKind error"))
+        // This will fail, fastest way to handle
+        // unlogged case with web::block below
+        .unwrap_or(SessionKind::Player(-1));
+
+    web::block(move || {
+        api::execute(
+            &conn,
+            match logged {
+                SessionKind::Player(id) => api::ApiActions::FetchPlayer(id),
+                SessionKind::Admin => api::ApiActions::FetchPlayers,
+            },
+        )
+    })
+    .then(|res| match res {
+        Ok(r) => HttpResponse::Ok().json(r.value),
+        Err(e) => {
+            dbg!(&e);
+            HttpResponse::Forbidden().finish()
+        }
+    })
+}
+
 pub fn serve() -> std::io::Result<()> {
-    let www_root: String = env::var("WWW_ROOT").expect("WWW_ROOT must be set");
+    let domain: String = env::var("DOMAIN").expect("DOMAIN must be set");
     let pool = db::create_pool();
-    dbg!(&www_root);
+    println!("Serving Loot-a-lot on {}", domain);
+
+    let key = [0; 32]; // TODO: Use a real key
 
     HttpServer::new(move || {
         App::new()
             .data(pool.clone())
-            .configure(configure_app)
+            .configure(configure_api)
             .wrap(
                 Cors::new()
-                    .allowed_origin("http://localhost:8080")
+                    .allowed_origin(&domain)
                     .allowed_methods(vec!["GET", "POST", "PUT", "DELETE", "OPTIONS"])
                     .max_age(3600),
             )
-            .wrap(middleware::Logger::default())
-            .service(fs::Files::new("/", www_root.clone()).index_file("index.html"))
+            .wrap(IdentityService::new(
+                CookieIdentityPolicy::new(&key)
+                    .name("logged-in")
+                    .secure(false),
+            ))
+            //.wrap(middleware::Logger::default())
+            .wrap(middleware::Logger::new("%r -> %s (%{User-Agent}i)"))
+            .route("/session", web::get().to_async(enter_session))
+            .route("/login", web::get().to(login))
+            .route("/logout", web::get().to(logout))
+        //.service(fs::Files::new("/", www_root.clone()).index_file("index.html"))
     })
     .bind("127.0.0.1:8088")?
     .run()