Moving settings to Database. (#2492)

[lemmy.git] / crates / db_views / src / private_message_report_view.rs

diff --git a/crates/db_views/src/private_message_report_view.rs b/crates/db_views/src/private_message_report_view.rs
index 9a5976847bbe6c9183cf3f744b529f3b6a779cd9..2b19819693291a627b0e654fd49de140a1aee22e 100644 (file)
--- a/crates/db_views/src/private_message_report_view.rs
+++ b/crates/db_views/src/private_message_report_view.rs
@@ -148,8 +148,9 @@ mod tests {
   use crate::private_message_report_view::PrivateMessageReportQuery;
   use lemmy_db_schema::{
     source::{
-      person::{Person, PersonForm},
-      private_message::{PrivateMessage, PrivateMessageForm},
+      instance::Instance,
+      person::{Person, PersonInsertForm},
+      private_message::{PrivateMessage, PrivateMessageInsertForm},
       private_message_report::{PrivateMessageReport, PrivateMessageReportForm},
     },
     traits::{Crud, Reportable},
@@ -162,27 +163,28 @@ mod tests {
   fn test_crud() {
     let conn = &mut establish_unpooled_connection();
 
-    let new_person_1 = PersonForm {
-      name: "timmy_mrv".into(),
-      public_key: Some("pubkey".to_string()),
-      ..PersonForm::default()
-    };
+    let inserted_instance = Instance::create(conn, "my_domain.tld").unwrap();
+
+    let new_person_1 = PersonInsertForm::builder()
+      .name("timmy_mrv".into())
+      .public_key("pubkey".to_string())
+      .instance_id(inserted_instance.id)
+      .build();
     let inserted_timmy = Person::create(conn, &new_person_1).unwrap();
 
-    let new_person_2 = PersonForm {
-      name: "jessica_mrv".into(),
-      public_key: Some("pubkey".to_string()),
-      ..PersonForm::default()
-    };
+    let new_person_2 = PersonInsertForm::builder()
+      .name("jessica_mrv".into())
+      .public_key("pubkey".to_string())
+      .instance_id(inserted_instance.id)
+      .build();
     let inserted_jessica = Person::create(conn, &new_person_2).unwrap();
 
     // timmy sends private message to jessica
-    let pm_form = PrivateMessageForm {
-      creator_id: inserted_timmy.id,
-      recipient_id: inserted_jessica.id,
-      content: "something offensive".to_string(),
-      ..Default::default()
-    };
+    let pm_form = PrivateMessageInsertForm::builder()
+      .creator_id(inserted_timmy.id)
+      .recipient_id(inserted_jessica.id)
+      .content("something offensive".to_string())
+      .build();
     let pm = PrivateMessage::create(conn, &pm_form).unwrap();
 
     // jessica reports private message
@@ -206,11 +208,11 @@ mod tests {
     assert_eq!(pm_report.reason, reports[0].private_message_report.reason);
     assert_eq!(pm.content, reports[0].private_message.content);
 
-    let new_person_3 = PersonForm {
-      name: "admin_mrv".into(),
-      public_key: Some("pubkey".to_string()),
-      ..PersonForm::default()
-    };
+    let new_person_3 = PersonInsertForm::builder()
+      .name("admin_mrv".into())
+      .public_key("pubkey".to_string())
+      .instance_id(inserted_instance.id)
+      .build();
     let inserted_admin = Person::create(conn, &new_person_3).unwrap();
 
     // admin resolves the report (after taking appropriate action)
@@ -229,5 +231,7 @@ mod tests {
       inserted_admin.name,
       reports[0].resolver.as_ref().unwrap().name
     );
+
+    Instance::delete(conn, inserted_instance.id).unwrap();
   }
 }