Can get data conservation policy

src/helpers/account_helper.rs

@@ -358,11 +358,13 @@ pub fn delete(user_id: &UserID) -> ResultBoxError {
 
 /// Automatically delete the account, if it have been inactive for a too long time
 pub fn remove_if_inactive_for_too_long_time(user: &User) -> Res {
-    if user.delete_account_after < 1 {
+    let timeout = user.delete_account_after.unwrap_or(0);
+
+    if timeout < 1 {
         return Ok(());
     }
 
-    if user.last_activity < time() - user.delete_account_after {
+    if user.last_activity < time() - timeout {
         delete(&user.id)?;
     }
 

src/helpers/comments_helper.rs

@@ -123,14 +123,15 @@ pub fn delete_all_user(user_id: &UserID) -> ResultBoxError {
 
 /// Clean old user comments
 pub fn clean_old_comments(user: &User) -> Res {
-    if user.delete_comments_after < 1 {
+    let lifetime = user.delete_comments_after.unwrap_or(0);
+    if lifetime < 1 {
         return Ok(());
     }
 
     let comments = database::QueryInfo::new(COMMENTS_TABLE)
         .cond_user_id("ID_personne", &user.id)
         .set_custom_where("time_insert < ?")
-        .add_custom_where_argument_u64(time() - user.delete_comments_after)
+        .add_custom_where_argument_u64(time() - lifetime)
         .exec(db_to_comment)?;
 
     for comment in comments {

src/helpers/conversations_helper.rs

@@ -263,14 +263,15 @@ pub fn export_all_user_messages(user_id: &UserID) -> ResultBoxError<Vec<Conversa
 
 /// Clean old user conversation messages
 pub fn clean_old_messages(user: &User) -> Res {
-    if user.delete_conversation_messages_after < 1 {
+    let lifetime = user.delete_conversation_messages_after.unwrap_or(0);
+    if lifetime < 1 {
         return Ok(());
     }
 
     let messages = database::QueryInfo::new(CONV_MESSAGES_TABLE)
         .cond_user_id("user_id", &user.id)
         .set_custom_where("time_insert < ?")
-        .add_custom_where_argument_u64(time() - user.delete_conversation_messages_after)
+        .add_custom_where_argument_u64(time() - lifetime)
         .exec(db_to_conversation_message)?;
 
     for message in messages {

src/helpers/database.rs

@@ -319,6 +319,14 @@ impl<'a> RowResult<'a> {
         }
     }
 
+    /// Get an optional unsigned number  => Set to None if value is null / empty / 0
+    pub fn get_optional_positive_u64(&self, name: &str) -> ResultBoxError<Option<u64>> {
+        Ok(match self.get_optional_u64(name)? {
+            None | Some(0) => None,
+            Some(val) => Some(val)
+        })
+    }
+
     pub fn get_u32(&self, name: &str) -> ResultBoxError<u32> {
         let value = self.row.get_opt(self.find_col(name)?);
 

src/helpers/likes_helper.rs

@@ -98,15 +98,16 @@ pub fn delete_all_user(user_id: &UserID) -> ResultBoxError {
 
 /// Delete old user likes
 pub fn clean_old_user_likes(user: &User) -> Res {
-    if user.delete_likes_after < 1 {
-        return Ok(());
+    if let Some(lifetime) = user.delete_likes_after
+    {
+        database::DeleteQuery::new(LIKES_TABLE)
+            .cond_user_id("ID_personne", &user.id)
+            .set_custom_where("Date_envoi < ?")
+            .add_custom_where_arg_str(&time_to_mysql_date(time() - lifetime))
+            .exec()?;
     }
 
-    database::DeleteQuery::new(LIKES_TABLE)
-        .cond_user_id("ID_personne", &user.id)
-        .set_custom_where("Date_envoi < ?")
-        .add_custom_where_arg_str(&time_to_mysql_date(time() - user.delete_likes_after))
-        .exec()
+    Ok(())
 }
 
 /// Turn a database entry into a like entry

src/helpers/notifications_helper.rs

@@ -275,14 +275,15 @@ pub fn delete_all_related_with_user(user_id: &UserID) -> ResultBoxError {
 
 /// Delete all the old notifications of a user
 pub fn clean_old_user_notifications(user: &User) -> Res {
-    if user.delete_notifications_after < 1 {
+    let lifetime = user.delete_notifications_after.unwrap_or(0);
+    if lifetime < 1 {
         return Ok(());
     }
 
     database::DeleteQuery::new(NOTIFICATIONS_TABLE)
         .cond_user_id("dest_user_id", &user.id)
         .set_custom_where("time_create < ?")
-        .add_custom_where_arg_u64(time() - user.delete_notifications_after)
+        .add_custom_where_arg_u64(time() - lifetime)
         .exec()
 }
 

src/helpers/posts_helper.rs

@@ -471,7 +471,8 @@ pub fn delete_all_user(user_id: &UserID) -> ResultBoxError {
 
 /// Clean the old posts of a user
 pub fn clean_old_posts(user: &User) -> Res {
-    if user.delete_posts_after < 1 {
+    let lifetime = user.delete_posts_after.unwrap_or(0);
+    if lifetime < 1 {
         return Ok(());
     }
 
@@ -479,7 +480,7 @@ pub fn clean_old_posts(user: &User) -> Res {
         .set_custom_where("(ID_personne = ? OR ID_amis = ?) AND time_insert < ?")
         .add_custom_where_argument_user_id(&user.id)
         .add_custom_where_argument_user_id(&user.id)
-        .add_custom_where_argument_u64(time() - user.delete_posts_after)
+        .add_custom_where_argument_u64(time() - lifetime)
         .exec(db_to_post)?;
 
     for post in posts {

src/helpers/user_helper.rs

@@ -79,12 +79,12 @@ fn db_to_user(res: &database::RowResult) -> ResultBoxError<User> {
         security_answer_1: res.get_optional_str("reponse1")?,
         security_question_2: res.get_optional_str("question2")?,
         security_answer_2: res.get_optional_str("reponse2")?,
-        delete_account_after: res.get_u64("delete_account_after")?,
-        delete_notifications_after: res.get_u64("delete_notifications_after")?,
-        delete_comments_after: res.get_u64("delete_comments_after")?,
-        delete_posts_after: res.get_u64("delete_posts_after")?,
-        delete_conversation_messages_after: res.get_u64("delete_conversation_messages_after")?,
-        delete_likes_after: res.get_u64("delete_likes_after")?,
+        delete_account_after: res.get_optional_positive_u64("delete_account_after")?,
+        delete_notifications_after: res.get_optional_positive_u64("delete_notifications_after")?,
+        delete_comments_after: res.get_optional_positive_u64("delete_comments_after")?,
+        delete_posts_after: res.get_optional_positive_u64("delete_posts_after")?,
+        delete_conversation_messages_after: res.get_optional_positive_u64("delete_conversation_messages_after")?,
+        delete_likes_after: res.get_optional_positive_u64("delete_likes_after")?,
     })
 }