From 9f91854c4d8900655e1fc563697d9f8980577b82 Mon Sep 17 00:00:00 2001
From: realaravinth <realaravinth@batsense.net>
Date: Wed, 11 May 2022 12:31:31 +0530
Subject: [PATCH] feat: migrate account deletion to use db_* interface

---
 sqlx-data.json               | 29 +++++++++++++++++++++++++++++
 src/api/v1/account/delete.rs |  4 +---
 src/errors.rs                |  4 ++--
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/sqlx-data.json b/sqlx-data.json
index 6baf437a..a42738ec 100644
--- a/sqlx-data.json
+++ b/sqlx-data.json
@@ -169,6 +169,21 @@
     },
     "query": "SELECT time FROM mcaptcha_pow_confirmed_stats \n            WHERE \n                config_id = (\n                    SELECT config_id FROM mcaptcha_config \n                WHERE \n                    key = $1\n                AND\n                     user_id = (\n                        SELECT \n                            ID FROM mcaptcha_users WHERE name = $2))\n                ORDER BY time DESC"
   },
+  "45d9e9fb6344fe3a18c2529d50c935d3837bfe25c96595beb6970d6067720578": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Varchar",
+          "Text",
+          "Varchar",
+          "Varchar"
+        ]
+      }
+    },
+    "query": "insert into mcaptcha_users \n        (name , password, email, secret) values ($1, $2, $3, $4)"
+  },
   "47fa50aecfb1499b0a18fa9299643017a1a8d69d4e9980032e0d8f745465d14f": {
     "describe": {
       "columns": [
@@ -372,6 +387,20 @@
     },
     "query": "DELETE FROM mcaptcha_levels \n        WHERE config_id = (\n            SELECT config_id FROM mcaptcha_config where key = ($1) \n            AND user_id = (\n            SELECT ID from mcaptcha_users WHERE name = $2\n            )\n            )"
   },
+  "81c779ed4bb59f8b94dea730cbda31f7733ef16d509a3ed607388b5ddef74638": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Varchar",
+          "Text",
+          "Varchar"
+        ]
+      }
+    },
+    "query": "INSERT INTO mcaptcha_users \n        (name , password,  secret) VALUES ($1, $2, $3)"
+  },
   "84484cb6892db29121816bc5bff5702b9e857e20aa14e79d080d78ae7593153b": {
     "describe": {
       "columns": [
diff --git a/src/api/v1/account/delete.rs b/src/api/v1/account/delete.rs
index f4873e55..fafb9480 100644
--- a/src/api/v1/account/delete.rs
+++ b/src/api/v1/account/delete.rs
@@ -64,9 +64,7 @@ pub mod runners {
     use super::*;
 
     pub async fn delete_user(name: &str, data: &AppData) -> ServiceResult<()> {
-        sqlx::query!("DELETE FROM mcaptcha_users WHERE name = ($1)", name,)
-            .execute(&data.db)
-            .await?;
+        data.dblib.delete_user(name).await?;
         Ok(())
     }
 }
diff --git a/src/errors.rs b/src/errors.rs
index c5ca2c28..108358df 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -197,11 +197,11 @@ impl From<CredsError> for ServiceError {
 impl From<DBError> for ServiceError {
     #[cfg(not(tarpaulin_include))]
     fn from(e: DBError) -> ServiceError {
-        match e{
+        match e {
             DBError::UsernameTaken => ServiceError::UsernameTaken,
             DBError::SecretTaken => ServiceError::InternalServerError,
             DBError::EmailTaken => ServiceError::EmailTaken,
-            _ => ServiceError::DBError(DBErrorWrapper(e))
+            _ => ServiceError::DBError(DBErrorWrapper(e)),
         }
     }
 }