Add report + moderation messaging (#567)

* Add report + moderation messaging

* Add system messages

* address review comments

* Remove ds store

* Update messaging

* run prep

---------

Co-authored-by: Geometrically <geometrically@Jais-MacBook-Pro.local>

src/models/ids.rs

@@ -4,6 +4,8 @@ pub use super::notifications::NotificationId;
 pub use super::projects::{ProjectId, VersionId};
 pub use super::reports::ReportId;
 pub use super::teams::TeamId;
+pub use super::threads::ThreadId;
+pub use super::threads::ThreadMessageId;
 pub use super::users::UserId;
 
 /// Generates a random 64 bit integer that is exactly `n` characters
@@ -109,6 +111,8 @@ base62_id_impl!(VersionId, VersionId);
 base62_id_impl!(TeamId, TeamId);
 base62_id_impl!(ReportId, ReportId);
 base62_id_impl!(NotificationId, NotificationId);
+base62_id_impl!(ThreadId, ThreadId);
+base62_id_impl!(ThreadMessageId, ThreadMessageId);
 
 pub mod base62_impl {
     use serde::de::{self, Deserializer, Visitor};

src/models/mod.rs

@@ -5,4 +5,5 @@ pub mod pack;
 pub mod projects;
 pub mod reports;
 pub mod teams;
+pub mod threads;
 pub mod users;

src/models/projects.rs

@@ -3,6 +3,7 @@ use super::teams::TeamId;
 use super::users::UserId;
 use crate::database::models::project_item::QueryProject;
 use crate::database::models::version_item::QueryVersion;
+use crate::models::threads::ThreadId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
@@ -56,6 +57,7 @@ pub struct Project {
     /// The requested status of this projct
     pub requested_status: Option<ProjectStatus>,
 
+    /// DEPRECATED: moved to threads system
     /// The rejection data of the project
     pub moderator_message: Option<ModeratorMessage>,
 
@@ -107,6 +109,9 @@ pub struct Project {
 
     /// The color of the project (picked from icon)
     pub color: Option<u32>,
+
+    /// The thread of the moderation messages of the project
+    pub thread_id: Option<ThreadId>,
 }
 
 impl From<QueryProject> for Project {
@@ -195,6 +200,7 @@ impl From<QueryProject> for Project {
             flame_anvil_project: m.flame_anvil_project,
             flame_anvil_user: m.flame_anvil_user.map(|x| x.into()),
             color: m.color,
+            thread_id: m.thread_id.map(|x| x.into()),
         }
     }
 }

src/models/reports.rs

@@ -1,5 +1,5 @@
 use super::ids::Base62Id;
-use crate::models::ids::UserId;
+use crate::models::ids::{ThreadId, UserId};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
@@ -17,6 +17,8 @@ pub struct Report {
     pub reporter: UserId,
     pub body: String,
     pub created: DateTime<Utc>,
+    pub closed: bool,
+    pub thread_id: Option<ThreadId>,
 }
 
 #[derive(Serialize, Deserialize, Clone)]

src/models/threads.rs

@@ -0,0 +1,80 @@
+use super::ids::Base62Id;
+use crate::models::projects::ProjectStatus;
+use crate::models::users::{User, UserId};
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(from = "Base62Id")]
+#[serde(into = "Base62Id")]
+pub struct ThreadId(pub u64);
+
+#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(from = "Base62Id")]
+#[serde(into = "Base62Id")]
+pub struct ThreadMessageId(pub u64);
+
+#[derive(Serialize, Deserialize)]
+pub struct Thread {
+    pub id: ThreadId,
+    #[serde(rename = "type")]
+    pub type_: ThreadType,
+    pub messages: Vec<ThreadMessage>,
+    pub members: Vec<User>,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct ThreadMessage {
+    pub id: ThreadMessageId,
+    pub author_id: Option<UserId>,
+    pub body: MessageBody,
+    pub created: DateTime<Utc>,
+}
+
+#[derive(Serialize, Deserialize, Clone)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum MessageBody {
+    Text {
+        body: String,
+    },
+    StatusChange {
+        new_status: ProjectStatus,
+        old_status: ProjectStatus,
+    },
+    ThreadClosure,
+    Deleted,
+}
+
+#[derive(Serialize, Deserialize, Eq, PartialEq, Copy, Clone)]
+#[serde(rename_all = "snake_case")]
+pub enum ThreadType {
+    Report,
+    Project,
+    DirectMessage,
+}
+
+impl std::fmt::Display for ThreadType {
+    fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(fmt, "{}", self.as_str())
+    }
+}
+
+impl ThreadType {
+    // These are constant, so this can remove unneccessary allocations (`to_string`)
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            ThreadType::Report => "report",
+            ThreadType::Project => "project",
+            ThreadType::DirectMessage => "direct_message",
+        }
+    }
+
+    pub fn from_str(string: &str) -> ThreadType {
+        match string {
+            "report" => ThreadType::Report,
+            "project" => ThreadType::Project,
+            "direct_message" => ThreadType::DirectMessage,
+            _ => ThreadType::DirectMessage,
+        }
+    }
+}