From 7fccb7ce8d7513feb8bf1aa5476e0683b9e0c32c Mon Sep 17 00:00:00 2001
From: Ronan <ronan.le_meillat@highcanfly.club>
Date: Mon, 16 Sep 2024 20:40:39 +0200
Subject: [PATCH] do not add testuser permanently

---
 Cargo.toml                 |   4 +++-
 build.rs                   |  24 +++++++++++++++++++++++-
 db_v2.sqlite3              | Bin 348160 -> 352256 bytes
 db_v2/create/db.sql        |   3 ---
 libs/state/src/database.rs |   5 ++++-
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b2caa34..716c170 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,4 +33,6 @@ clap = { version = "4.5", features = ["derive"] }
 
 [build-dependencies]
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
\ No newline at end of file
+serde_json = "1.0"
+tokio = { version = "1", features = ["full"] }
+sqlx = { version = "0.8", features = ["sqlite", "runtime-tokio-rustls", "macros", "chrono", "json"] }
\ No newline at end of file
diff --git a/build.rs b/build.rs
index e68aa32..a06fb6d 100644
--- a/build.rs
+++ b/build.rs
@@ -13,6 +13,7 @@
 //
 // You should have received a copy of the Affero General Public License
 // along with SCTGDesk. If not, see <https://www.gnu.org/licenses/agpl-3.0.html>.
+use sqlx::{Connection, Executor, SqliteConnection};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::env;
@@ -50,7 +51,21 @@ impl PackageJson {
         self.version = version.to_string();
     }
 }
-fn main() {
+#[tokio::main]
+async fn main() {
+    let db_path = env::var("DATABASE_URL").unwrap_or("sqlite://db_v2.sqlite3".to_string());
+    let mut conn = SqliteConnection::connect(&format!("sqlite://{}", db_path))
+        .await
+        .expect("Failed to open database");
+    conn.execute(
+        r#"
+        INSERT OR IGNORE INTO peer (guid, id, uuid, pk, created_at, "user", status, note, region, strategy, info, last_online) VALUES
+        (x'95CC7775BA37481DAD7214A4F6CE5A94', 'TESTUSER', randomblob(16), randomblob(16), '1901-01-01 12:00:00', randomblob(16), 0, '', NULL, randomblob(16), '{}', '1901-01-01 12:00:00');
+        "#
+    )
+    .await
+    .expect("Failed to insert test data");
+    println!("cargo:rerun-if-changed=build.rs");
     println!("cargo:rerun-if-changed=webconsole");
 
     let data = fs::read_to_string("./webconsole/package.json").unwrap();
@@ -103,4 +118,11 @@ fn main() {
         str::from_utf8(&output.stdout).unwrap_or(""),
         str::from_utf8(&output.stderr).unwrap_or("")
     );
+    conn.execute(
+        r#"
+        DELETE FROM peer WHERE guid = x'95CC7775BA37481DAD7214A4F6CE5A94';
+        "#
+    )
+    .await
+    .expect("Failed to delete test data");
 }
diff --git a/db_v2.sqlite3 b/db_v2.sqlite3
index 0b1fb563bb368b56aec9fb99a2a0a17d3b897583..076cd026578ce1537c7579bdd9da08e331ec3ea8 100644
GIT binary patch
delta 2677
zcmb_edrT8|9KYXPuh;h#p#cho<5gr9Y$?cavWXL-ykCOCCatt!3AET=0hz3*6HUu9
zT-|OH=NN82mMv3J$z)Mt-2RvgKB6&9R}J%zWttebjD$JEe#eat8Zpz^-nac+`}@8=
z-$&ckujm?4Xv#|qEVP-bx7nMGG^I!62#O-hDGEUlF_cOuIZyzUlHD3TE=E#1T8^3e
z$w-NK7$FalMY0DnMwTVLBkhrDBv&PNNrZTKFi74fcCD8Xc${9?ge}<kKCS$`$>^Xd
zo3+VeHK%G*(~`BB$+{(!?!~40jHRjRX~bk@qa@LAV1QBMUo>8E=MC$BIbWmbX#7f6
zjtlz^B)wBjJaiw@7p64oK5Fge9bUIaOyEJB{ocO4yNw&>nsq&sT`a+B5D|DHXV-Hi
z8>@3VXj?N?*JLqU>A5bR=)pB#=$K}*Qb^#zoC|k;=N`J=_!NfcwY%>4dV!zv9j^16
zMxbHJZmzSnn(fcSf%dmb!XNls-jKK_1@8Lq#l*6%R`Cg3G0jN5L!4`MI{tUWF1AfD
z@Az7rz(YC9_A_Y*8|*e`%kv;(TiIHk-?HImZ<5hzvdn4_*E9DvwxhQOBXAWL^tx-k
z2@cwBq|FVRpC)eCe3Nqlt3v%`SBy`nTg;CoyZz<6Z9}(T(Ve6}K5TioOdO-{_+7T;
zqBL)Hu(J8hbluQrt@QYr)gLM*viIc~CStToLly8FPH%p2KgD95&B!woLOimG;0BVA
zod`KW-X(97*U0b5v*Zc#2)Up1lDo)GxN=@6T_Owz+_sT$kX;O74zjZ>;vhS7LJsbL
zQzGCX+t9=`oNhrr2icy%Imi~7$3eCz7zbGfQ6Yv47u568Va@|`>Uar{;=^5vkau8Q
zKa!CVm`YQTQ(m#AJg4lvAKIL!Gghg-w1<2;F<QOnco)!y!|VjSTtwz2&q}Lh263v;
z#1G-+@^ZaF^2sILT7n2wsX&jOHg0G#v-PUAHJN7K1+SLnWLM-+71=8aa;VsukG(-y
z)8GZZ7afcMk@(<iU+?2@8#y%scr9FPH(_j7$doutqv_vkIz9388=4wr-Tt0c=^FxL
zWZ9q2XAJ6GB$=^VG*mh7p?mPqI2jd;2{iMb;he{_&O2f*hn0SVtoB_`SgFihi3RGM
zYC(Ahz7ixM<Oj@xOK2(|B(cw-6_-%85S0}&jbo@Wu{w?)x>yC;ELM}befp(#nh6JO
zq@9i#QWBX>9uUUda05}KpQ%`CA$KZCR)}uNP=T!k^QRj`;VjE)PQ&LzWiQRvsI!~l
zOqyzqG^-W7NCg~$uGuX%<CtmjfS4t-4aBlv$3kT=oTviMKxK=+zVXax4^VQd78Cpp
z{kO(2a*K&IVOp#JZOmae$a;KQK$4;OC#{_5*-^|%139!v0UXR)56Fy|eaIgwQl6*)
zPUfHoEDN4}00yysAwQI98be=T3|$~~2>S`m13dWGA)hJrp+yiOlgxx0RI{j$0k_aR
z78UL+zJ(4I-@=X=BH``KBM|~Mlmsa8Pz120M#u!VU8bZmuW46n_g2qT&fU^`X@Tt`
z8U*sG=mAO&uT#A|a8yeCfrMe(5x6MSvQb999FLOlJOYudi<gYuz_vrv`50QchG{Rt
zW0`Yq5W$=*!o$&$3Z~eHQp~qLG@NaiFi_5X;zQ%vN`^DAAELv$8%l^!g#x^-^A9Fl
z@5;eq{$|u$_MO^$UqE@^Mb%!pFw2__V$?}gn}yzJbJCRE)@CuuS`md_1zdBApI^%K
zdq5-*OxK;c?g1e~Rjcr5z63HM(!&Z_tOaGvln;#p@oaY{4~-V#sX*i((@ij^2GX@v
zD%Geo8ofp!MKnSBK&ECklJ?i5k2LowV|`7$S9)UmqssQobAL%MN1iKCSqB<++I5*)
bUGnrr=~9<!weSjD7=bhVMkiE~2WtHdlJZwk

delta 641
zcmZoTAlk4%R3|vlC$l6~AuYcsH?c&)m_dMnk&(ecL4kpRff<NHffxonCh8coGBfB|
zf83a|fPXWK!5{fW9~3qPuqd!G@)t7j7j70bNawF_<mJ_o)zLB5;oxP^5j1A(R}EA8
zUS6?)tw3k#A#>3X*Wi%QVAmicA)gc0)nP?fovh9?O85LfWpF|MivEeI3hH0a7G;O>
z8Cn_`>VlDip^=q=0TB6zHM^{iR`;$fv}wMgUvm4*{Cfv)@j6cBQ@r@C(|-BI>RO;C
z0d!rP8W;_v`F}8QGD<S=b@OlM4dRR7*5Zs|GiQ3vD9Qh0vZBD>&613l`9$J#Gt-L_
zOEUBGia~zo0C~LWz_tU7ECoOxK4IX00`%c6ei><ISsj=+(7m^90@DM21$38UsM^4E
zmw)<Qe<oo845<T5@A!o{bTGsVm{=0{<QO#>_-F8Y^Zn(U&*wXx>jIO}c9#oGDx6FV
z4AZl2G9^ye_hRLk9_PtAX?v;{s~r<doCcft^qiYaTGJC67>%|w-(~V*+`gcTaWiAv
z1EysUm=nM*Rzwd=bnCe`Ga4`}EM_rK*v>M6<?niaVAu$Agfs9@=2zo8$5%F;&w*8L
yv!Z||$M$d!R(UqoFb6hq<LQidn1rX#c4p;abe&$<%_uSbfHSM~_H%x$MvMTd*~$d~

diff --git a/db_v2/create/db.sql b/db_v2/create/db.sql
index d1d38b8..6f11566 100644
--- a/db_v2/create/db.sql
+++ b/db_v2/create/db.sql
@@ -56,9 +56,6 @@ CREATE TABLE IF NOT EXISTS peer (
                                     region text null,
                                     strategy blob, 
                                     info JSON not null DEFAULT '{}', "last_online" datetime not null default('2011-11-16 11:55:19')) without rowid;
--- Needed for compile time (sqlx)
-INSERT OR IGNORE INTO peer (guid, id, uuid, pk, created_at, "user", status, note, region, strategy, info, last_online) VALUES
-  (x'018f255622f77778a006702ca5c23715', 'TESTUSER', randomblob(16), randomblob(16), '1901-01-01 12:00:00', randomblob(16), 0, '', NULL, randomblob(16), '{}', '1901-01-01 12:00:00');
 CREATE TABLE IF NOT EXISTS "user" (
                                     guid blob primary key not null,
                                     name varchar(100) not null,
diff --git a/libs/state/src/database.rs b/libs/state/src/database.rs
index ae05be8..008e110 100644
--- a/libs/state/src/database.rs
+++ b/libs/state/src/database.rs
@@ -1560,11 +1560,14 @@ impl Database {
 
     pub async fn get_cpus_count(&self) -> Vec<CpuCount> {
         let mut conn = self.pool.acquire().await.unwrap();
+        // for avoiding compiltion error you can use the following query
+        // INSERT OR IGNORE INTO peer (guid, id, uuid, pk, created_at, "user", status, note, region, strategy, info, last_online) VALUES
+        //     (x'95CC7775BA37481DAD7214A4F6CE5A94', 'TESTUSER', randomblob(16), randomblob(16), '1901-01-01 12:00:00', randomblob(16), 0, '', NULL, randomblob(16), '{}', '1901-01-01 12:00:00');
         let res = sqlx::query!(
             r#"
             SELECT 
                 COALESCE(trim(json_extract(info,'$.cpu')),"unknown") as cpu, 
-                COUNT(*) AS machine_count 
+                COUNT(*) AS machine_count
             FROM 
                 peer 
             GROUP BY