learning how to test
This commit is contained in:
@@ -1,13 +1,11 @@
|
||||
use diesel::prelude::*;
|
||||
use diesel::dsl::{Eq, Filter, Select, exists, Find };
|
||||
use diesel::expression::exists::Exists;
|
||||
use crate::schema::{looted, items};
|
||||
use crate::schema::{items, looted};
|
||||
use crate::DbConnection;
|
||||
use diesel::dsl::{exists, Eq, Filter, Find, Select};
|
||||
use diesel::expression::exists::Exists;
|
||||
use diesel::prelude::*;
|
||||
|
||||
type ItemColumns =
|
||||
( looted::id, looted::name, looted::base_price, );
|
||||
const ITEM_COLUMNS: ItemColumns =
|
||||
( looted::id, looted::name, looted::base_price, );
|
||||
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>;
|
||||
|
||||
/// Represents a unique item in inventory
|
||||
@@ -25,8 +23,7 @@ pub struct Item {
|
||||
impl Item {
|
||||
/// Public proxy for Loot::owned_by that selects only Item fields
|
||||
pub fn owned_by(player: i32) -> OwnedBy {
|
||||
Loot::owned_by(player)
|
||||
.select(ITEM_COLUMNS)
|
||||
Loot::owned_by(player).select(ITEM_COLUMNS)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +32,7 @@ type OwnedLoot = Filter<looted::table, WithOwner>;
|
||||
|
||||
/// Represents an item that has been looted
|
||||
#[derive(Identifiable, Debug, Queryable, Serialize)]
|
||||
#[table_name="looted"]
|
||||
#[table_name = "looted"]
|
||||
pub(crate) struct Loot {
|
||||
id: i32,
|
||||
name: String,
|
||||
@@ -46,8 +43,7 @@ pub(crate) struct Loot {
|
||||
impl Loot {
|
||||
/// A filter on Loot that is owned by given player
|
||||
pub(crate) fn owned_by(id: i32) -> OwnedLoot {
|
||||
looted::table
|
||||
.filter(looted::owner_id.eq(id))
|
||||
looted::table.filter(looted::owner_id.eq(id))
|
||||
}
|
||||
|
||||
pub(crate) fn exists(id: i32) -> Exists<Find<looted::table, i32>> {
|
||||
@@ -55,7 +51,9 @@ impl Loot {
|
||||
}
|
||||
}
|
||||
|
||||
/// Description of an item : (name, value in gold)
|
||||
type ItemDesc<'a> = (&'a str, i32);
|
||||
|
||||
/// An item being looted or bought.
|
||||
///
|
||||
/// The owner is set to 0 in case of looting,
|
||||
@@ -69,6 +67,7 @@ struct NewLoot<'a> {
|
||||
}
|
||||
|
||||
impl<'a> NewLoot<'a> {
|
||||
/// A new loot going to the group (loot procedure)
|
||||
fn to_group(desc: ItemDesc<'a>) -> Self {
|
||||
Self {
|
||||
name: desc.0,
|
||||
@@ -77,6 +76,7 @@ impl<'a> NewLoot<'a> {
|
||||
}
|
||||
}
|
||||
|
||||
/// A new loot going to a specific player (buy procedure)
|
||||
fn to_player(player: i32, desc: ItemDesc<'a>) -> Self {
|
||||
Self {
|
||||
name: desc.0,
|
||||
|
||||
Reference in New Issue
Block a user