performed cargo fix on db

Author: hgzimmerman

backend/db/Cargo.toml

@@ -3,7 +3,7 @@ name = "db"
 version = "0.1.0"
 authors = ["Henry Zimmerman <zimhen7@gmail.com>"]
 autotests = false
-#edition = "2018"
+edition = "2018"
 
 [[bench]]
 name = "bench"

backend/db/src/calls/answer.rs

@@ -1,6 +1,6 @@
-use schema::answers;
-use user::User;
-use question::Question;
+use crate::schema::answers;
+use crate::user::User;
+use crate::question::Question;
 //use error::JoeResult;
 use uuid::Uuid;
 

backend/db/src/calls/article.rs

@@ -1,10 +1,10 @@
-use schema::articles;
+use crate::schema::articles;
 use diesel;
 use diesel::RunQueryDsl;
 use diesel::QueryDsl;
 use diesel::ExpressionMethods;
 use chrono::{NaiveDateTime, Utc};
-use user::User;
+use crate::user::User;
 use diesel::BelongingToDsl;
 use error::JoeResult;
 use diesel::PgConnection;
@@ -89,9 +89,9 @@ impl Article {
  }
 
  pub fn get_paginated(page_index: i32, page_size: i32, conn: &PgConnection) -> JoeResult<Vec<ArticleData>> {
- use schema::articles::dsl::*;
- use diesel_extensions::pagination::*;
- use schema::users;
+ use crate::schema::articles::dsl::*;
+ use crate::diesel_extensions::pagination::*;
+ use crate::schema::users;
 
  let (articles_and_users, _count) = articles
  .inner_join(users::table)
@@ -120,8 +120,8 @@ impl Article {
 
  /// Gets the unpublished articles for a given user
  pub fn get_unpublished_articles_for_user(user_uuid: UserUuid, conn: &PgConnection) -> JoeResult<Vec<Article>> {
- use schema::articles::dsl::*;
- use schema::users::dsl::*;
+ use crate::schema::articles::dsl::*;
+ use crate::schema::users::dsl::*;
  // use schema::users;
 
  let user: User = users
@@ -142,8 +142,8 @@ impl Article {
  /// If true, it will set the publish datetime to the current time, indicating it is published.
  /// If false, it will set the publish column to Null, indicating that it has not been published.
  pub fn set_publish_status(article_uuid: ArticleUuid, publish: bool, conn: &PgConnection) -> JoeResult<Article> {
- use schema::articles::dsl::*;
- use schema::articles;
+ use crate::schema::articles::dsl::*;
+ use crate::schema::articles;
 
  let publish_value: Option<NaiveDateTime> = if publish {
  Some(Utc::now().naive_utc())
@@ -161,7 +161,7 @@ impl Article {
 
  /// Applies the changeset to its corresponding article.
  pub fn update_article(changeset: ArticleChangeset, conn: &PgConnection) -> JoeResult<Article> {
- use schema::articles;
+ use crate::schema::articles;
  diesel::update(articles::table)
  .set(&changeset)
  .get_result(conn)

backend/db/src/calls/auth.rs

@@ -1,11 +1,11 @@
 use chrono::{NaiveDateTime, Utc};
 use chrono::Duration;
-use auth_lib::ServerJwt;
-use auth_lib::Secret;
+use crate::auth_lib::ServerJwt;
+use crate::auth_lib::Secret;
 use identifiers::user::UserUuid;
 use wire::user::Jwt;
-use auth_lib::verify_hash;
-use user::User;
+use crate::auth_lib::verify_hash;
+use crate::user::User;
 use wire::login::LoginRequest;
 use error::LoginError;
 use diesel::PgConnection;

backend/db/src/calls/bucket.rs

@@ -1,6 +1,6 @@
-use schema::buckets;
-use schema::junction_bucket_users;
-use user::User;
+use crate::schema::buckets;
+use crate::schema::junction_bucket_users;
+use crate::user::User;
 use error::JoeResult;
 use diesel::prelude::*;
 use diesel;
@@ -72,10 +72,10 @@ pub struct UsersInBucketData {
 impl Bucket {
  /// Get buckets that are public, but the user is not a member of
  pub fn get_public_buckets(user_uuid: UserUuid, conn: &PgConnection) -> JoeResult<Vec<Bucket>> {
- use schema::buckets::dsl::*;
- use schema::buckets;
- use schema::junction_bucket_users as junctions;
- use schema::junction_bucket_users::dsl::junction_bucket_users;
+ use crate::schema::buckets::dsl::*;
+ use crate::schema::buckets;
+ use crate::schema::junction_bucket_users as junctions;
+ use crate::schema::junction_bucket_users::dsl::junction_bucket_users;
 
  // Don't return any buckets with these ids
  let bucket_uuids_in_which_the_user_is_already_a_member_or_has_requested_to_join: Vec<Uuid> = junction_bucket_users
@@ -94,7 +94,7 @@ impl Bucket {
  }
 
  pub fn add_user_to_bucket(new_bucket_user: NewBucketUser, conn: &PgConnection) -> JoeResult<()> {
- use schema::junction_bucket_users;
+ use crate::schema::junction_bucket_users;
 
  diesel::insert_into(junction_bucket_users::table)
  .values(&new_bucket_user)
@@ -104,8 +104,8 @@ impl Bucket {
  }
 
  pub fn get_buckets_user_belongs_to(user_uuid: UserUuid, conn: &PgConnection) -> JoeResult<Vec<Bucket>> {
- use schema::junction_bucket_users::dsl::junction_bucket_users;
- use schema::junction_bucket_users as junctions;
+ use crate::schema::junction_bucket_users::dsl::junction_bucket_users;
+ use crate::schema::junction_bucket_users as junctions;
 
  junction_bucket_users
  .filter(junctions::user_uuid.eq(user_uuid.0))
@@ -120,9 +120,9 @@ impl Bucket {
  /// Gets users depending on the approval column.
  /// It will exclude the user making the request.
  fn get_users_approval(bucket_uuid: BucketUuid, user_uuid: UserUuid, approval: bool, conn: &PgConnection) -> JoeResult<Vec<User>> {
- use schema::junction_bucket_users::dsl::junction_bucket_users;
- use schema::junction_bucket_users as junctions;
- use schema::users;
+ use crate::schema::junction_bucket_users::dsl::junction_bucket_users;
+ use crate::schema::junction_bucket_users as junctions;
+ use crate::schema::users;
 
  junction_bucket_users
  .filter(junctions::bucket_uuid.eq(bucket_uuid.0))
@@ -145,9 +145,9 @@ impl Bucket {
  }
 
  pub fn get_users_requiring_approval_for_owned_buckets(bucket_owner_uuid: UserUuid, conn: &PgConnection) -> JoeResult<Vec<UsersInBucketData>> {
- use schema::junction_bucket_users::dsl::*;
- use schema::junction_bucket_users as junctions;
- use schema::buckets;
+ use crate::schema::junction_bucket_users::dsl::*;
+ use crate::schema::junction_bucket_users as junctions;
+ use crate::schema::buckets;
 
  let buckets: Vec<Bucket> = junction_bucket_users
  .filter(junctions::user_uuid.eq(
@@ -174,8 +174,8 @@ impl Bucket {
 
  /// Is the user the owner of the bucket
  pub fn is_user_owner(user_uuid: UserUuid, bucket_uuid: BucketUuid, conn: &PgConnection) -> bool {
- use schema::junction_bucket_users::dsl::junction_bucket_users;
- use schema::junction_bucket_users as junctions;
+ use crate::schema::junction_bucket_users::dsl::junction_bucket_users;
+ use crate::schema::junction_bucket_users as junctions;
 
 
  junction_bucket_users
@@ -189,8 +189,8 @@ impl Bucket {
 
  /// Is the user in the bucket, and approved by a bucket owner?
  pub fn is_user_approved(user_uuid: UserUuid, bucket_uuid: BucketUuid, conn: &PgConnection) -> bool {
- use schema::junction_bucket_users::dsl::junction_bucket_users;
- use schema::junction_bucket_users as junctions;
+ use crate::schema::junction_bucket_users::dsl::junction_bucket_users;
+ use crate::schema::junction_bucket_users as junctions;
 
 
  junction_bucket_users
@@ -202,7 +202,7 @@ impl Bucket {
  }
 
  pub fn apply_changeset(changeset: BucketUserChangeset, conn: &PgConnection) -> JoeResult<BucketUser> {
- use schema::junction_bucket_users;
+ use crate::schema::junction_bucket_users;
 
  diesel::update(junction_bucket_users::table)
  .set(&changeset)
@@ -211,8 +211,8 @@ impl Bucket {
  }
 
  pub fn set_bucket_publicity(bucket_uuid: BucketUuid, publicity: bool, conn: &PgConnection) -> JoeResult<()> {
- use schema::buckets::dsl::*;
- use schema::buckets;
+ use crate::schema::buckets::dsl::*;
+ use crate::schema::buckets;
 
 
  let target = buckets.filter(
@@ -234,8 +234,8 @@ impl Bucket {
  }
 
  pub fn set_user_approval(user_uuid: UserUuid, bucket_uuid: BucketUuid, approval: bool, conn: &PgConnection) -> JoeResult<()> {
- use schema::junction_bucket_users::dsl::junction_bucket_users;
- use schema::junction_bucket_users as junctions;
+ use crate::schema::junction_bucket_users::dsl::junction_bucket_users;
+ use crate::schema::junction_bucket_users as junctions;
 
 
  let target = junction_bucket_users
@@ -253,7 +253,7 @@ impl Bucket {
  /// Removes the user from the junction table for the given bucket.
  /// This has the effect of denying any request to join the bucket, as well as kicking a user out of the bucket.
  pub fn remove_user_from_bucket(user_uuid: UserUuid, bucket_uuid: BucketUuid, conn: &PgConnection) -> JoeResult<()> {
- use schema::junction_bucket_users as junctions;
+ use crate::schema::junction_bucket_users as junctions;
 
 
  diesel::delete(junctions::table)

backend/db/src/calls/chat.rs

@@ -1,7 +1,7 @@
-use schema::chats;
-use schema::junction_chat_users;
+use crate::schema::chats;
+use crate::schema::junction_chat_users;
 // use diesel::RunQueryDsl;
-use user::User;
+use crate::user::User;
 // use diesel::associations::HasTable;
 use diesel;
 use diesel::RunQueryDsl;
@@ -64,7 +64,7 @@ pub struct ChatData {
 
 impl Chat {
  pub fn add_user_to_chat(association: ChatUserAssociation, conn: &PgConnection) -> JoeResult<()> {
- use schema::junction_chat_users;
+ use crate::schema::junction_chat_users;
 
  diesel::insert_into(junction_chat_users::table)
  .values(&association)
@@ -75,8 +75,8 @@ impl Chat {
  }
 
  pub fn remove_user_from_chat(association: ChatUserAssociation, conn: &PgConnection) -> JoeResult<()> {
- use schema::junction_chat_users::dsl::*;
- use schema::junction_chat_users;
+ use crate::schema::junction_chat_users::dsl::*;
+ use crate::schema::junction_chat_users;
 
  diesel::delete(junction_chat_users::table)
  .filter(chat_uuid.eq(association.chat_uuid))
@@ -87,10 +87,10 @@ impl Chat {
  }
 
  fn get_users_in_chat(chat_uuid: ChatUuid, conn: &PgConnection) -> JoeResult<Vec<User>> {
- use schema::junction_chat_users::dsl::junction_chat_users;
+ use crate::schema::junction_chat_users::dsl::junction_chat_users;
  // use schema::users::dsl::*;
- use schema::users;
- use schema::junction_chat_users as junctions;
+ use crate::schema::users;
+ use crate::schema::junction_chat_users as junctions;
 
  junction_chat_users
  .filter(junctions::chat_uuid.eq(chat_uuid.0))
@@ -101,8 +101,8 @@ impl Chat {
  }
 
  pub fn is_user_in_chat(chat_uuid: &ChatUuid, user_uuid: UserUuid, conn: &PgConnection) -> JoeResult<bool> {
- use schema::junction_chat_users::dsl::junction_chat_users;
- use schema::junction_chat_users as junctions;
+ use crate::schema::junction_chat_users::dsl::junction_chat_users;
+ use crate::schema::junction_chat_users as junctions;
 
 
  let junction = junction_chat_users
@@ -128,10 +128,10 @@ impl Chat {
  }
 
  pub fn get_chats_user_is_in(user_uuid: UserUuid, conn: &PgConnection) -> JoeResult<Vec<Chat>> {
- use schema::junction_chat_users::dsl::junction_chat_users;
- use schema::junction_chat_users as junction;
+ use crate::schema::junction_chat_users::dsl::junction_chat_users;
+ use crate::schema::junction_chat_users as junction;
  // use schema::chats::dsl::*;
- use schema::chats;
+ use crate::schema::chats;
 
  junction_chat_users
  .filter(junction::user_uuid.eq(user_uuid.0))

backend/db/src/calls/forum.rs

@@ -1,4 +1,4 @@
-use schema::forums;
+use crate::schema::forums;
 use uuid::Uuid;
 
 #[derive(Debug, Clone, Identifiable, Queryable, CrdUuid, ErrorHandler)]

backend/db/src/calls/message.rs

@@ -1,13 +1,13 @@
-use schema::messages;
+use crate::schema::messages;
 use chrono::NaiveDateTime;
 // use diesel::RunQueryDsl;
 // use diesel::ExpressionMethods;
 // use diesel::QueryDsl;
-use user::User;
+use crate::user::User;
 // use diesel::BelongingToDsl;
-use chat::Chat;
+use crate::chat::Chat;
 // use diesel::GroupedBy;
-use diesel_extensions::pagination::*;
+use crate::diesel_extensions::pagination::*;
 use error::JoeResult;
 use diesel::PgConnection;
 use uuid::Uuid;
@@ -133,8 +133,8 @@ impl Message {
 
  pub fn get_messages_for_chat(chat_uuid: ChatUuid, page_index: i32, page_size: i32, conn: &PgConnection) -> JoeResult<Vec<MessageData>> {
  // use schema::messages::dsl::*;
- use schema::messages;
- use schema::users;
+ use crate::schema::messages;
+ use crate::schema::users;
  use diesel::prelude::*;
 
  // let m_chat_id: Uuid = m_chat_id.0;

backend/db/src/calls/mod.rs

@@ -30,8 +30,8 @@ use diesel::associations::HasTable;
 use diesel::query_source::Table;
 use diesel::query_builder::QueryId;
 use diesel::query_builder::QueryFragment;
-use schema;
-use User;
+use crate::schema;
+use crate::User;
 use identifiers::user::UserUuid;
 use diesel::Expression;