add requested changes

Author: mugoh

migrations/2019-11-11-162609_drop_email_from_user/up.sql

@@ -1,2 +1 @@
--- Your SQL goes here
-ALTER TABLE  users DROP COLUMN email CASCADE;
+ALTER TABLE users DROP COLUMN email CASCADE;

src/controllers/user/me.rs

@@ -38,10 +38,9 @@ pub fn me(req: &mut dyn Request) -> CargoResult<Response> {
 
     let verified = verified.unwrap_or(false);
     let verification_sent = verified || verification_sent;
-    let user = User { ..user };
 
     Ok(req.json(&EncodableMe {
-        user: user.encodable_private(email, verified, verification_sent)?,
+        user: user.encodable_private(email, verified, verification_sent),
     }))
 }
 

src/models/user.rs

@@ -20,7 +20,7 @@ pub struct User {
     pub gh_id: i32,
 }
 
-/// Represents a new user record insertible to the `users` table
+/// Represents a new user record insertable to the `users` table
 #[derive(Insertable, Debug, Default)]
 #[table_name = "users"]
 pub struct NewUser<'a> {
@@ -186,10 +186,9 @@ impl User {
     pub fn encodable_private(
         self,
         email: Option<String>,
-
         email_verified: bool,
         email_verification_sent: bool,
-    ) -> CargoResult<EncodablePrivateUser> {
+    ) -> EncodablePrivateUser {
         let User {
             id,
             name,
@@ -199,7 +198,7 @@ impl User {
         } = self;
         let url = format!("https://github.com/{}", gh_login);
 
-        Ok(EncodablePrivateUser {
+        EncodablePrivateUser {
             id,
             email,
             email_verified,
@@ -208,7 +207,7 @@ impl User {
             login: gh_login,
             name,
             url: Some(url),
-        })
+        }
     }
 
     /// Queries for the email belonging to a particular user

src/tests/util.rs

@@ -136,8 +136,9 @@ impl TestApp {
 
         let user = self.db(|conn| {
             let email = "[email protected]";
+
             let user = crate::new_user(username)
-                .create_or_update(Some(email), conn)
+                .create_or_update(None, conn)
                 .unwrap();
             diesel::insert_into(emails::table)
                 .values((