From f40cb802b193e16cb8e2010485abc8632f887086 Mon Sep 17 00:00:00 2001
From: Ronan <ronan.le_meillat@highcanfly.club>
Date: Wed, 25 Sep 2024 08:09:54 +0200
Subject: [PATCH] refactor build.rs for creeating TESTUSER and deleting it
 after build

---
 .github/workflows/build.yaml  |   2 +-
 .github/workflows/windows.yml |   3 ++-
 build.rs                      |  19 +++++++-----------
 db_v2.sqlite3                 | Bin 352256 -> 348160 bytes
 libs/state/Cargo.toml         |   4 ++++
 libs/state/build.rs           |  35 ++++++++++++++++++++++++++++++++++
 libs/state/src/database.rs    |   5 ++++-
 7 files changed, 53 insertions(+), 15 deletions(-)
 create mode 100644 libs/state/build.rs

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b094388..fd26b53 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -156,7 +156,7 @@ jobs:
         EOF
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.target }}
         path: target/${{ matrix.target }}/release/
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index f258a72..ba72fcf 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -84,6 +84,7 @@ jobs:
           export TAG_NAME=${{ github.event.release.tag_name }}
           export TAG_NAME=${TAG_NAME:-"nightly"}
           echo $TAG_NAME
-          mv /tmp/windows_${{ matrix.job.arch }}_${{ github.event.release.tag_name }}.zip /tmp/windows_${{ matrix.job.arch }}_${TAG_NAME}.zip
+          ls -l /tmp
+          mv /tmp/windows_*.zip /tmp/windows_${{ matrix.job.arch }}_${TAG_NAME}.zip
           gh release create $TAG_NAME -t "$TAG_NAME" -n "$TAG_NAME" || true
           gh release upload $TAG_NAME /tmp/windows_${{ matrix.job.arch }}_${TAG_NAME}.zip --clobber
\ No newline at end of file
diff --git a/build.rs b/build.rs
index 295c4bb..f60a98b 100644
--- a/build.rs
+++ b/build.rs
@@ -54,18 +54,7 @@ impl PackageJson {
 #[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!("{}", 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();
@@ -118,9 +107,15 @@ async fn main() {
         str::from_utf8(&output.stdout).unwrap_or(""),
         str::from_utf8(&output.stderr).unwrap_or("")
     );
+
+    // Delete test data if it exists
+    let mut conn = SqliteConnection::connect(&format!("{}", db_path))
+    .await
+    .expect("Failed to open database");
     conn.execute(
         r#"
         DELETE FROM peer WHERE guid = x'95CC7775BA37481DAD7214A4F6CE5A94';
+        PRAGMA journal_mode=DELETE;
         "#
     )
     .await
diff --git a/db_v2.sqlite3 b/db_v2.sqlite3
index 076cd026578ce1537c7579bdd9da08e331ec3ea8..671d35090023e1b236950ef06f85fda7da696bb7 100644
GIT binary patch
delta 518
zcmZoTAlk4%R3|vlC$l6~AuYcsH?c&)m_dMnk&(ecL4kpRff<NHffxonCh8b7GH*;+
z!oQit;E(*G4+@(CI2E>Y2C(+?XI!fOc)dDh{^dP-{O?>#l#fK5<H)f+ay!STU7&RF
zypnr{mIj8pV5DGZWMyCgL~SRhU!R&kuhn|TmJYA`>sv0Rdj#F!&%ABk`#D~H-2}nv
zS}dA2H82`T^Z#JrWRzs!>*n9i8^jmEt;HF`X3q4SQIh}1WJQ6$n<W`9^NGagW~LV<
zmSpDV6@z@j0rE!Efo%sEzuI#fnJO5Vfm~r?v4x4#U^8dIZ~pBp226MO1<+l!{ewM|
zh{AG~0;U8$IYvze{u%t<e1G}o^Z8Eay1-<#-Q@z43MUf-!}P41Oo`L=y;wP>$9b|&
z+MepgYRAM9r@<yZJ?AEq*7Sr1Mx*V_cbU8xw=d{o+|1bafN9wS=7ebtOe|2F(fz;u
zgFnmH_u5EqW$afCQx>fIHCNT0YhuE&o4i0T33G%q@K5Gf<2%P!Hl5FbRc^DQfF{TG
sa1T~_Hr6l)HgV(WjCYuXr_Xj~<zaN4Uf9hjG5vrutMvABeym1}0G!~Z>;M1&

delta 2483
zcmb_ddrT8|9KYXPuh;h#q2XCQUaicceE<$76Pz&R{jw-*+DZ$Slos17-~)>~(X=e$
zy6l{&bGrFhmTZcy*;teq=N~h1x@e5iRpa)@GMAuRBtb{q@3_$wqGmeV`?jBJf8WpV
z^L_oU=YXPTSfQz{F0;{As@dskGt-m-ks~OI6i^g`AYy1nXhqNfw5nYi0}vlKeL^Nl
z#6t*qgshO=moc(@=`YegsYY@|;*unahX$kM17hz=34x~?gm!Gknh)rN&+KM5O*tKQ
zo5QNt>a#MnxtY2gO807>VSb)IJBt`Iwo25dLkAfZ{(0+<zLFusujd*S>s!B&)#Ac|
zLm4|8h)2F7hVr?sx_uqJyrV0Yi3vQ4<L@8Xv&+1CDy{d0c(HVcNkrgkj@N&z5Nq<d
zX=fYNWVcxz^wce$xr6s<(lO1LQAps?+!nsl?)T|t^K%eCm3PI7m4a}}w|UR49frh|
z%i84Zu)1Ex2HHQ2L|FJcftb{13HSc@Vq*DM>iGn&n8--8TU_k$xc|3eFWV+q;LdWK
zz+*XP*XgXoEiR|0{beL$OU-g#nAvo*Kf~;?*diLl`@+4AZR>Bu2wcgDUU9WQ-A%j9
zw6$g3^XT?IZE`MP^=LTRb$3Qp?batIyX*D4ox$4+b*Jc$j@lkA5GNbf|0&z}gS2F6
zbVA#vY+dlv4*JgNr5`Fr3-^|oMw7J(rg{)2&ThLuGS}va%*YETgcx^<;OQeFyAg7f
zyi49Duae)BXULP}F>*f{Aa{`6@W^?a^olSXaHoxggY3Z|<{&%EA`Y@MC*<HZI3)rO
zvJFj4z=;;*bCB&BoP%tUc^qVmf^m?|AS%Rg;f!WpHjMe8oH|h@q=G^%`iLCl^^DJp
zhuQ_aVnh}o&qy0&Cb3><;m7cbdBuS!`B+Y`mLOu4O3-JZ&8zKJwi>IPcFW|q;EkH1
z!nz`=u5eLV5tTCeb07+{4_@F0(7{BIgb%*;^<Ms#;jf0lgN0)DSk1}H%E>ciokWG&
zps)bFM#>NDv3xW7^9D_0Leu`fCE2Tk_bSmCD#$B9Z<6x$$(Q4*zeSdYuB9(d$X$#D
z?>W&J6F&iDAmnal#wAqG2N~=;xabn95~8wlru8~%RyU;bW9KPBr_Eupc1?V&nh@xw
z&9uiosa4Ia^@BL(h7X96!U3dEv$<6nvT}6ed?naSFb{oTCe8-0;ygkjRQ6h=N0ZA6
z2f?z+OtW6mbCke6eQWmUnB16Y_k-k|NP-mh?-b|^hSW;nneJ>0r#+3i*as3gSDOVs
zxc*H&RBp4d6qb1k(8(P2f&3?j1tjwo|AbXED^kUjFpwj26u`|a_k-NT$VFkPNUd4{
zJj`J~SP&h#0E$>Sn;*;AucNOprXHXVVn3lJfCrz|rA&1Qt$+v_V@7?TfkguhxP_Lm
zsC;|nEi_np3p;K~g13_|H3TYX>Cn=k3E)r-lQF57M)O!I3s`n^^ltV)F1lO&dlqaS
z-h+{hh)x4L(~YT7n;z~<e^a!}bpE=Oc!0!VTM;;(D%nLwUVzV(@caUitcRD0-N3d&
z?otdjE@QeX@D%2(4<s_DD)4x;s*b4)p%n972#seuCJxjxABWI1wv_P<Y=~KLy)9Kl
ztU>|a)rAL!Ex2*8lD`fO)SOoZMg&ygJyaEt3-beoAX$|`b=v4PP7h7FoSim{tOHRP
zl)yWs`lZ#(0Y69rf{DU2*Zd$RSic0H#h1WThzzhqHb+?v^Eiag1Zix0W(F@-;CgVP
zeK)yA``ee}ni0y}+?W=Sp4>Wa?8-g+m-KSd*)pZ$V9R!wE?29|oVX~RK2NKK*YtUu
LK7t#%pWyU2nsXSM

diff --git a/libs/state/Cargo.toml b/libs/state/Cargo.toml
index 1b8f100..9f1acd5 100644
--- a/libs/state/Cargo.toml
+++ b/libs/state/Cargo.toml
@@ -19,3 +19,7 @@ tracing-subscriber = "0.3"
 sqlx = { version = "0.8", features = ["sqlite", "runtime-tokio-rustls", "macros", "chrono", "json"] }
 bcrypt = "0.15"
 uuid = { version = "1.0", features = ["v4"] }
+
+[build-dependencies]
+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/libs/state/build.rs b/libs/state/build.rs
new file mode 100644
index 0000000..0e6702c
--- /dev/null
+++ b/libs/state/build.rs
@@ -0,0 +1,35 @@
+// Copyright (c) 2024 Ronan LE MEILLAT for SCTG Development
+//
+// This file is part of the SCTGDesk project.
+//
+// SCTGDesk is free software: you can redistribute it and/or modify
+// it under the terms of the Affero General Public License version 3 as
+// published by the Free Software Foundation.
+//
+// SCTGDesk is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// Affero General Public License for more details.
+//
+// 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 std::env;
+
+
+#[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!("{}", 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");
+
+}
diff --git a/libs/state/src/database.rs b/libs/state/src/database.rs
index 008e110..4743bd5 100644
--- a/libs/state/src/database.rs
+++ b/libs/state/src/database.rs
@@ -1560,9 +1560,12 @@ 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
+        // for avoiding compiltion error you can use the following query it is included in the build.rs
         // 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');
+        // Note: that the build.rs will not remove the peer from the database
+        // for removing the peer from the database you can use the following query
+        // DELETE FROM peer WHERE guid = x'95CC7775BA37481DAD7214A4F6CE5A94';
         let res = sqlx::query!(
             r#"
             SELECT