From 039d103fa23941c6c91271d75cd4bd3d09bb11ee Mon Sep 17 00:00:00 2001
From: Artemy <artegoser@gmail.com>
Date: Wed, 12 Jul 2023 09:39:37 +0300
Subject: [PATCH] fix: errors

---
 src/core.rs   | 64 +++++++++++++++++++++++++++++++++++++++------------
 src/routes.rs |  5 ++--
 2 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/src/core.rs b/src/core.rs
index 4d80f1f..53255ad 100644
--- a/src/core.rs
+++ b/src/core.rs
@@ -12,8 +12,6 @@ use serde_json::json;
 use sha3::{Digest, Sha3_256};
 use std::env;
 
-use mongodb::error::Error;
-
 use crate::types::*;
 pub struct Core {
     users: Collection<Document>,
@@ -37,7 +35,7 @@ impl Core {
             salt: env::var("SALT").expect("Hash salt not found"),
         }
     }
-    pub async fn get_apps(&self) -> Result<Vec<Document>, Error> {
+    pub async fn get_apps(&self) -> Result<Vec<Document>, serde_json::Value> {
         self.get_collection(&self.apps).await
     }
 
@@ -156,17 +154,20 @@ impl Core {
             .unwrap();
     }
 
-    pub async fn get_reviews(&self, app_id: &String) -> Result<Vec<Document>, Error> {
+    pub async fn get_reviews(&self, app_id: &String) -> Result<Vec<Document>, serde_json::Value> {
         self.get_collection_with_params(&self.reviews, doc! {"app_id":app_id})
             .await
     }
 
-    pub async fn get_apps_by_tag(&self, info: &AppTags) -> Result<Vec<Document>, Error> {
+    pub async fn get_apps_by_tag(
+        &self,
+        info: &AppTags,
+    ) -> Result<Vec<Document>, serde_json::Value> {
         self.get_collection_with_params(&self.apps, doc! {"tags":{"$in":&info.tags}})
             .await
     }
 
-    pub async fn get_versions(&self, app_id: &String) -> Result<Vec<Document>, Error> {
+    pub async fn get_versions(&self, app_id: &String) -> Result<Vec<Document>, serde_json::Value> {
         self.get_collection_with_params_and_sort(
             &self.apps_versions,
             doc! {"app_id":app_id},
@@ -561,43 +562,76 @@ impl Core {
         collection: &Collection<Document>,
         params: Document,
         sort_params: Document,
-    ) -> Result<Vec<Document>, Error> {
+    ) -> Result<Vec<Document>, serde_json::Value> {
         let options = FindOptions::builder()
             .projection(doc! {"_id" : 0})
             .sort(sort_params)
             .build();
         let cursor = match collection.find(params, options).await {
             Ok(cursor) => cursor,
-            Err(e) => return Err(e),
+            Err(_) => {
+                return Err(json! ({
+                    "code":"err",
+                    "msg":"Error connecting to the database"
+                }))
+            }
         };
 
-        Ok(cursor.try_collect().await.unwrap_or_else(|_| vec![]))
+        match cursor.try_collect().await {
+            Ok(collection) => Ok(collection),
+            Err(_) => Err(json! ({
+                "code":"err",
+                "msg":"Error connecting to the database"
+            })),
+        }
     }
 
     async fn get_collection_with_params(
         &self,
         collection: &Collection<Document>,
         params: Document,
-    ) -> Result<Vec<Document>, Error> {
+    ) -> Result<Vec<Document>, serde_json::Value> {
         let options = FindOptions::builder().projection(doc! {"_id" : 0}).build();
         let cursor = match collection.find(params, options).await {
             Ok(cursor) => cursor,
-            Err(e) => return Err(e),
+            Err(_) => {
+                return Err(json! ({
+                    "code":"err",
+                    "msg":"Error connecting to the database"
+                }))
+            }
         };
 
-        Ok(cursor.try_collect().await.unwrap_or_else(|_| vec![]))
+        match cursor.try_collect().await {
+            Ok(collection) => Ok(collection),
+            Err(_) => Err(json! ({
+                "code":"err",
+                "msg":"Error connecting to the database"
+            })),
+        }
     }
 
     async fn get_collection(
         &self,
         collection: &Collection<Document>,
-    ) -> Result<Vec<Document>, Error> {
+    ) -> Result<Vec<Document>, serde_json::Value> {
         let options = FindOptions::builder().projection(doc! {"_id" : 0}).build();
         let cursor = match collection.find(None, options).await {
             Ok(cursor) => cursor,
-            Err(e) => return Err(e),
+            Err(_) => {
+                return Err(json! ({
+                    "code":"err",
+                    "msg":"Error connecting to the database"
+                }))
+            }
         };
 
-        Ok(cursor.try_collect().await.unwrap_or_else(|_| vec![]))
+        match cursor.try_collect().await {
+            Ok(collection) => Ok(collection),
+            Err(_) => Err(json! ({
+                "code":"err",
+                "msg":"Error connecting to the database"
+            })),
+        }
     }
 }
diff --git a/src/routes.rs b/src/routes.rs
index 740697c..e860de6 100644
--- a/src/routes.rs
+++ b/src/routes.rs
@@ -2,7 +2,6 @@ use crate::types::*;
 use actix_web::{get, post, web, HttpRequest, HttpResponse, Responder};
 use actix_web_grants::proc_macro::has_any_permission;
 use bson::Document;
-use mongodb::error::Error;
 
 #[post("/signup")]
 pub async fn signup(app_data: web::Data<crate::AppState>, user: web::Json<User>) -> impl Responder {
@@ -168,10 +167,10 @@ fn username(req: HttpRequest) -> String {
         .to_string()
 }
 
-fn resolve_collection(resp: Result<Vec<Document>, Error>) -> HttpResponse {
+fn resolve_collection(resp: Result<Vec<Document>, serde_json::Value>) -> HttpResponse {
     match resp {
         Ok(resp) => HttpResponse::Ok().json(resp),
-        Err(e) => HttpResponse::InternalServerError().json(e.to_string()),
+        Err(e) => HttpResponse::InternalServerError().json(e),
     }
 }