fixes and added tests

kronos-et-al · Jun 19, 2024 · 43112b3 · 43112b3
1 parent def9335
commit 43112b3
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 22 deletions.
diff --git a/...5d25524fac35d52f6b2c899a3a80e13b3c3a.json → ...f506d5a54a0ae181c1c6a6fde00836a71a95.json b/...5d25524fac35d52f6b2c899a3a80e13b3c3a.json → ...f506d5a54a0ae181c1c6a6fde00836a71a95.json
diff --git a/...cf97744c1d7000d9b7020c4a08b1e16f882a.json → ...acd3482b7b28b801f7cdc2da76929f1f95b7.json b/...cf97744c1d7000d9b7020c4a08b1e16f882a.json → ...acd3482b7b28b801f7cdc2da76929f1f95b7.json
diff --git a/backend/.sqlx/query-e5dfd2fa2a3bd373c5bfc5a8c8e960593a414ee58c6cb089ccd27e522260f9e4.json b/backend/.sqlx/query-e5dfd2fa2a3bd373c5bfc5a8c8e960593a414ee58c6cb089ccd27e522260f9e4.json
diff --git a/backend/src/layer/data/database/command.rs b/backend/src/layer/data/database/command.rs
@@ -213,10 +213,14 @@ mod test {
                 approved: false,
                 upload_date: Local::now().date_naive(),
                 report_count: 0,
-                meal_id: Uuid::default(),
+                meal_id: Uuid::parse_str("f7337122-b018-48ad-b420-6202dc3cb4ff").unwrap(),
             },
-            meal_name: "Happy Meal".into(),
-            other_image_urls: vec!["https://picsum.photos/500/300".into()],
+            meal_name: "Geflügel - Cevapcici, Ajvar, Djuvec Reis".into(),
+            other_image_urls: vec![
+                "http://localhost/image/ea8cce48-a3c7-4f8e-a222-5f3891c13804.jpg".into(),
+                "http://localhost/image/1aa73d5d-1701-4975-aa3c-1422a8bc10e8.jpg".into(),
+                "http://localhost/image/76b904fe-d0f1-4122-8832-d0e21acab86d.jpg".into(),
+            ],
         }
     }
 

diff --git a/backend/src/layer/data/database/request.rs b/backend/src/layer/data/database/request.rs
@@ -569,7 +569,7 @@ mod tests {
             upvotes: 0,
             upload_date: Local::now().date_naive(),
             report_count: 0,
-            meal_id: Uuid::default(),
+            meal_id: Uuid::parse_str("f7337122-b018-48ad-b420-6202dc3cb4ff").unwrap(),
         };
         let image2 = Image {
             id: Uuid::parse_str("76b904fe-d0f1-4122-8832-d0e21acab86d").unwrap(),

diff --git a/backend/src/layer/data/mail/mail_sender.rs b/backend/src/layer/data/mail/mail_sender.rs
@@ -182,10 +182,10 @@ mod test {
             report.contains(info.report_count.to_string().as_str()),
             "the template must contain all of the information from the report info"
         );
-        // assert!(
-        //     report.contains(info.image_got_hidden.to_string().as_str()),
-        //     "the template must contain all of the information from the report info"
-        // );
+        assert!(
+            report.contains(info.image_got_hidden.to_string().as_str()),
+            "the template must contain all of the information from the report info"
+        );
         assert!(
             report.contains(info.positive_rating_count.to_string().as_str()),
             "the template must contain all of the information from the report info"
@@ -210,6 +210,22 @@ mod test {
             report.contains(info.image_age.to_string().as_str()),
             "the template must contain all of the information from the report info"
         );
+        assert!(
+            report.contains(info.meal_id.to_string().as_str()),
+            "the template must contain all of the information from the report info"
+        );
+        assert!(
+            report.contains(info.meal_name.as_str()),
+            "the template must contain all of the information from the report info"
+        );
+        assert!(
+            report.contains(info.other_image_urls[0].as_str()),
+            "the template must contain all of the information from the report info"
+        );
+        assert!(
+            report.contains(info.report_date.to_string().as_str()),
+            "the template must contain all of the information from the report info"
+        );
         assert!(
             report.contains(REPORT_CSS), "Report css must be included. maybe auto-formatting destroyed the braces in template.html?"
         );
@@ -247,16 +263,16 @@ mod test {
         ImageReportInfo {
             reason: crate::util::ReportReason::Advert,
             image_got_hidden: true,
-            image_id: Uuid::default(),
+            image_id: Uuid::from_u128(9_789_789),
             image_url: String::from("https://picsum.photos/500/330"),
             report_count: 1,
             positive_rating_count: 10,
             negative_rating_count: 20,
             image_rank: 1.0,
             report_barrier: 1,
-            client_id: Uuid::default(),
+            client_id: Uuid::from_u128(123),
             image_age: 1,
-            meal_id: Uuid::default(),
+            meal_id: Uuid::from_u128(567),
             meal_name: "Happy Meal".into(),
             report_date: Local::now().date_naive(),
             other_image_urls: vec![