user: Convert has_tokens to token_count

Author: Turbo87

src/controllers/user/me.rs

@@ -33,7 +33,8 @@ pub fn me(req: &mut dyn RequestExt) -> EndpointResult {
     let tokens: Vec<ApiToken> = ApiToken::belonging_to(&user)
         .filter(api_tokens::revoked.eq(false))
         .load(&*conn)?;
-    let has_tokens = !tokens.is_empty();
+
+    let token_count = tokens.len() as i64;
 
     let owned_crates = CrateOwner::by_owner_kind(OwnerKind::User)
         .inner_join(crates::table)
@@ -54,7 +55,7 @@ pub fn me(req: &mut dyn RequestExt) -> EndpointResult {
     Ok(req.json(&EncodableMe {
         user: user.encodable_private(email, verified, verification_sent),
         owned_crates,
-        meta: EncodableMeMeta { has_tokens },
+        meta: EncodableMeMeta { token_count },
     }))
 }
 

src/tests/user.rs

@@ -757,7 +757,7 @@ fn shows_that_user_has_tokens() {
     let (app, _, user) = TestApp::init().with_user();
 
     let json = user.show_me();
-    assert!(!json.meta.has_tokens);
+    assert_eq!(json.meta.token_count, 0);
 
     let user_id = user.as_model().id;
     app.db(|conn| {
@@ -768,5 +768,5 @@ fn shows_that_user_has_tokens() {
     });
 
     let json = user.show_me();
-    assert!(json.meta.has_tokens);
+    assert_eq!(json.meta.token_count, 2);
 }

src/views.rs

@@ -166,7 +166,7 @@ pub struct EncodableMe {
 
 #[derive(Serialize, Deserialize, Debug, Clone, Copy)]
 pub struct EncodableMeMeta {
-    pub has_tokens: bool,
+    pub token_count: i64,
 }
 
 /// The serialization format for the `User` model.