diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index ee4937d79d298dde034e75fce9263045f046c923..0000000000000000000000000000000000000000
--- a/flake.lock
+++ /dev/null
@@ -1,61 +0,0 @@
-{
- "nodes": {
- "nixpkgs": {
- "locked": {
- "lastModified": 1714253743,
- "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "root": {
- "inputs": {
- "nixpkgs": "nixpkgs",
- "utils": "utils"
- }
- },
- "systems": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "utils": {
- "inputs": {
- "systems": "systems"
- },
- "locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- }
- },
- "root": "root",
- "version": 7
-}
diff --git a/server/.sqlx/query-8f1f08cbbce0e8e66221f91873172663f6703d7355ca79c0fe00d2bcf1ed9dd4.json b/server/.sqlx/query-01bd25a5698e76cdec3ae0eb1a638059914202a09aa606af11f38d7848f37c67.json
similarity index 66%
rename from server/.sqlx/query-8f1f08cbbce0e8e66221f91873172663f6703d7355ca79c0fe00d2bcf1ed9dd4.json
rename to server/.sqlx/query-01bd25a5698e76cdec3ae0eb1a638059914202a09aa606af11f38d7848f37c67.json
index 382b5f42a9afed467897e04adf889fe3b2b8b4cd..4f74f8d77594a8f983649021ed0c37be7bdfbeb5 100644
--- a/server/.sqlx/query-8f1f08cbbce0e8e66221f91873172663f6703d7355ca79c0fe00d2bcf1ed9dd4.json
+++ b/server/.sqlx/query-01bd25a5698e76cdec3ae0eb1a638059914202a09aa606af11f38d7848f37c67.json
@@ -1,11 +1,10 @@
{
"db_name": "PostgreSQL",
- "query": "INSERT INTO participants (id, university_name, medical_conditions, allergies, pronouns, competition, phone_number, tshirt_size, study_proof, photo, cv, comments, emergency_contact, has_monthly_opus_card, reduced_mobility)\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)",
+ "query": "UPDATE participants SET (medical_conditions, allergies, supper, pronouns, competition, phone_number, tshirt_size, comments, emergency_contact, has_monthly_opus_card, reduced_mobility, study_proof, photo, cv)\n = ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14) WHERE id = $15",
"describe": {
"columns": [],
"parameters": {
"Left": [
- "Uuid",
"Text",
"Text",
"Text",
@@ -31,16 +30,17 @@
},
"Text",
"Text",
- "Bytea",
- "Bytea",
- "Bytea",
"Text",
"Text",
"Bool",
- "Text"
+ "Text",
+ "Bytea",
+ "Bytea",
+ "Bytea",
+ "Uuid"
]
},
"nullable": []
},
- "hash": "8f1f08cbbce0e8e66221f91873172663f6703d7355ca79c0fe00d2bcf1ed9dd4"
+ "hash": "01bd25a5698e76cdec3ae0eb1a638059914202a09aa606af11f38d7848f37c67"
}
diff --git a/server/.sqlx/query-19151cfac96653a9e96a7861661475e422ff0d466e35a4ef2807f61630732d83.json b/server/.sqlx/query-11746d3bbe0047f2995a6366ba00cfd84d0dbc1c83bef77cfc83af19e69d5b94.json
similarity index 84%
rename from server/.sqlx/query-19151cfac96653a9e96a7861661475e422ff0d466e35a4ef2807f61630732d83.json
rename to server/.sqlx/query-11746d3bbe0047f2995a6366ba00cfd84d0dbc1c83bef77cfc83af19e69d5b94.json
index 351e196ce5c5d398065babf07acbe5481ea96134..769fa9905f54a907d716ccb1585bf552ecd22650 100644
--- a/server/.sqlx/query-19151cfac96653a9e96a7861661475e422ff0d466e35a4ef2807f61630732d83.json
+++ b/server/.sqlx/query-11746d3bbe0047f2995a6366ba00cfd84d0dbc1c83bef77cfc83af19e69d5b94.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "INSERT INTO participants (id, role, email, password_hash, first_name, last_name, competition, university_name)\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8)",
+ "query": "INSERT INTO participants (id, role, email, password_hash, first_name, last_name, competition, university)\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8)",
"describe": {
"columns": [],
"parameters": {
@@ -47,5 +47,5 @@
},
"nullable": []
},
- "hash": "19151cfac96653a9e96a7861661475e422ff0d466e35a4ef2807f61630732d83"
+ "hash": "11746d3bbe0047f2995a6366ba00cfd84d0dbc1c83bef77cfc83af19e69d5b94"
}
diff --git a/server/.sqlx/query-3ed6ac0e0cd01481011fa2b826c3f39e45d8f2a2777378b1c74c528b2acdfa8d.json b/server/.sqlx/query-4ba558a81017dfe3d22e15a97f7e57e8a5404d9910102f7bd87eb9b887e97fcb.json
similarity index 83%
rename from server/.sqlx/query-3ed6ac0e0cd01481011fa2b826c3f39e45d8f2a2777378b1c74c528b2acdfa8d.json
rename to server/.sqlx/query-4ba558a81017dfe3d22e15a97f7e57e8a5404d9910102f7bd87eb9b887e97fcb.json
index 1b17fedb777c97f2855ecc78e3575925fa94447d..9c528615386e95f606d73bf734a1aa0963a53f9c 100644
--- a/server/.sqlx/query-3ed6ac0e0cd01481011fa2b826c3f39e45d8f2a2777378b1c74c528b2acdfa8d.json
+++ b/server/.sqlx/query-4ba558a81017dfe3d22e15a97f7e57e8a5404d9910102f7bd87eb9b887e97fcb.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "SELECT id, role AS \"role: Role\", password_hash, university_name FROM participants WHERE email = $1",
+ "query": "SELECT id, role AS \"role: Role\", password_hash, university FROM participants WHERE email = $1",
"describe": {
"columns": [
{
@@ -32,7 +32,7 @@
},
{
"ordinal": 3,
- "name": "university_name",
+ "name": "university",
"type_info": "Text"
}
],
@@ -45,8 +45,8 @@
false,
false,
false,
- true
+ false
]
},
- "hash": "3ed6ac0e0cd01481011fa2b826c3f39e45d8f2a2777378b1c74c528b2acdfa8d"
+ "hash": "4ba558a81017dfe3d22e15a97f7e57e8a5404d9910102f7bd87eb9b887e97fcb"
}
diff --git a/server/.sqlx/query-4043956ce48fb14f0409451e0291b91ad2924d0cf6aa20c56b15f960b0ede42b.json b/server/.sqlx/query-668d7e49b4dae36348dbddca35bd8292cb59f2c0f8c20f4d0ac5faf058b183ac.json
similarity index 72%
rename from server/.sqlx/query-4043956ce48fb14f0409451e0291b91ad2924d0cf6aa20c56b15f960b0ede42b.json
rename to server/.sqlx/query-668d7e49b4dae36348dbddca35bd8292cb59f2c0f8c20f4d0ac5faf058b183ac.json
index b4132b58181139ecacd8bc7bbc6a56bd2ef0d27d..e8d8cfab73ac0d12780207ac5dfe3f93188d66d0 100644
--- a/server/.sqlx/query-4043956ce48fb14f0409451e0291b91ad2924d0cf6aa20c56b15f960b0ede42b.json
+++ b/server/.sqlx/query-668d7e49b4dae36348dbddca35bd8292cb59f2c0f8c20f4d0ac5faf058b183ac.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "DELETE FROM participants WHERE id = $1 AND university_name = $2",
+ "query": "DELETE FROM participants WHERE id = $1 AND university = $2",
"describe": {
"columns": [],
"parameters": {
@@ -11,5 +11,5 @@
},
"nullable": []
},
- "hash": "4043956ce48fb14f0409451e0291b91ad2924d0cf6aa20c56b15f960b0ede42b"
+ "hash": "668d7e49b4dae36348dbddca35bd8292cb59f2c0f8c20f4d0ac5faf058b183ac"
}
diff --git a/server/.sqlx/query-e08b705c8f710fe9496a9b72c258fed4cd4c7952a9c5cb2a6f8e5564758c3fce.json b/server/.sqlx/query-e08b705c8f710fe9496a9b72c258fed4cd4c7952a9c5cb2a6f8e5564758c3fce.json
new file mode 100644
index 0000000000000000000000000000000000000000..59756034a61f8b1062a8ec64744fad4586f8cb26
--- /dev/null
+++ b/server/.sqlx/query-e08b705c8f710fe9496a9b72c258fed4cd4c7952a9c5cb2a6f8e5564758c3fce.json
@@ -0,0 +1,46 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "SELECT id, role AS \"role: Role\", university FROM participants WHERE email = $1",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "id",
+ "type_info": "Uuid"
+ },
+ {
+ "ordinal": 1,
+ "name": "role: Role",
+ "type_info": {
+ "Custom": {
+ "name": "role",
+ "kind": {
+ "Enum": [
+ "participant",
+ "organizer",
+ "volunteer",
+ "chef"
+ ]
+ }
+ }
+ }
+ },
+ {
+ "ordinal": 2,
+ "name": "university",
+ "type_info": "Text"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Text"
+ ]
+ },
+ "nullable": [
+ false,
+ false,
+ false
+ ]
+ },
+ "hash": "e08b705c8f710fe9496a9b72c258fed4cd4c7952a9c5cb2a6f8e5564758c3fce"
+}
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 1f83352eca2915f42624e1eefd2c981e07aef5d9..ec4ef87292954a5ec465ea2006aa4baea64c010b 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -16,7 +16,10 @@ chrono = { version = "0.4.38", features = ["serde", "clock"] }
dotenvy = { version = "0.15" }
jsonwebtoken = "9.3.0"
rand = "0.8.5"
-reqwest = { version = "0.12.8", features = ["json"] }
+reqwest = { version = "0.12.8", features = [
+ "json",
+ "rustls-tls",
+], default-features = false }
serde = { version = "1", features = ["derive"] }
serde_json = { version = "1" }
sqlx = { version = "0.8.2", features = [
diff --git a/server/Dockerfile b/server/Dockerfile
index 625364e4975bbc70680729af69d034cc537ff15a..72c6f3109fa956157101c137199d6b34ab98361d 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -18,6 +18,7 @@ RUN cargo build --release
FROM alpine AS runner
# Copy the server binary to the /app directory
COPY --from=builder /app/target/release/backend_cqi /app/
+COPY --from=builder /app/target/release/create_admin /app/
WORKDIR /app
# Set any required env variables and
diff --git a/server/src/bin/create_admin.rs b/server/src/bin/create_admin.rs
index 26990898ec504a61bf1e8de1965f99c10714a39a..a878bf8e48a40deac20992a31bb85ed8e5b97241 100644
--- a/server/src/bin/create_admin.rs
+++ b/server/src/bin/create_admin.rs
@@ -15,12 +15,12 @@ async fn main() -> Result<()> {
let participant = MinimalParticipant {
first_name: "Marc-Antoine".to_string(),
last_name: "Manningham".to_string(),
- email: "marc-antoine.manningham@polymtl.ca".to_string(),
+ email: "mamanningham@cqi-qec.qc.ca".to_string(),
competition: Competition::None,
role: Role::Organizer,
};
participant
- .write_to_database(&password, &db, "Polytechnique Montréal".to_string())
+ .write_to_database(&password, &db, "".to_string())
.await?;
println!("Password: {}", password);
Ok(())