refactor check if device is registered

src/api/core/accounts.rs

@@ -958,8 +958,8 @@ async fn put_device_token(uuid: &str, data: JsonUpcase<PushToken>, headers: Head
     };
 
     // if the device already has been registered
-    if device.push_uuid.is_some() {
-        // check if the provided token is the same token, that already has been registered
+    if device.is_registered() {
+        // check if the new token is the same as the registered token
         if device.push_token.is_some() && device.push_token.unwrap() == token.clone() {
             debug!("Device {} is already registered and token is the same", uuid);
             return Ok(());

src/api/push.rs

@@ -77,7 +77,7 @@ async fn get_auth_push_token() -> ApiResult<String> {
 }
 
 pub async fn register_push_device(device: &mut Device, conn: &mut crate::db::DbConn) -> EmptyResult {
-    if !CONFIG.push_enabled() || !device.is_push_device() || device.push_uuid.is_some() {
+    if !CONFIG.push_enabled() || !device.is_push_device() || device.is_registered() {
         return Ok(());
     }
 

src/db/models/device.rs

@@ -117,6 +117,10 @@ impl Device {
     pub fn is_push_device(&self) -> bool {
         matches!(DeviceType::from_i32(self.atype), DeviceType::Android | DeviceType::Ios)
     }
+
+    pub fn is_registered(&self) -> bool {
+        self.push_uuid.is_some()
+    }
 }
 
 use crate::db::DbConn;