summaryrefslogtreecommitdiffstats
path: root/server/src/db/user.rs
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/db/user.rs')
-rw-r--r--server/src/db/user.rs17
1 files changed, 11 insertions, 6 deletions
diff --git a/server/src/db/user.rs b/server/src/db/user.rs
index 065b2c57..8b2ff62a 100644
--- a/server/src/db/user.rs
+++ b/server/src/db/user.rs
@@ -1,9 +1,14 @@
-use super::*;
-use crate::schema::user_;
-use crate::schema::user_::dsl::*;
-use crate::{is_email_regex, naive_now, Settings};
+use crate::{
+ db::Crud,
+ is_email_regex,
+ naive_now,
+ schema::{user_, user_::dsl::*},
+ settings::Settings,
+};
use bcrypt::{hash, DEFAULT_COST};
+use diesel::{dsl::*, result::Error, *};
use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, TokenData, Validation};
+use serde::{Deserialize, Serialize};
#[derive(Queryable, Identifiable, PartialEq, Debug)]
#[table_name = "user_"]
@@ -208,8 +213,8 @@ impl User_ {
#[cfg(test)]
mod tests {
- use super::User_;
- use super::*;
+ use super::{User_, *};
+ use crate::db::{establish_unpooled_connection, ListingType, SortType};
#[test]
fn test_crud() {