Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions migrations/20251011162144_add_github_user.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- Add migration script here
ALTER TABLE Member
ADD COLUMN github_user varchar(255);
6 changes: 4 additions & 2 deletions src/database_seeder/seed.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Member
INSERT INTO member (
roll_no, name, email, sex, year, hostel, mac_address, discord_id, group_id
roll_no, name, email, sex, year, hostel, mac_address, discord_id, group_id, track, github_user
)
SELECT
'R' || LPAD(i::TEXT, 4, '0'),
Expand All @@ -26,7 +26,9 @@ SELECT
'Hostel ' || ((i % 5) + 1),
'00:14:22:01:' || LPAD(TO_HEX(i), 2, '0') || ':' || LPAD(TO_HEX(i + 60), 2, '0'),
'discord_user_' || i,
(i % 8) + 1
(i % 8) + 1,
'track ' || ((i%4)+1),
'github_user_' || i
FROM generate_series(1, 60) AS i
ON CONFLICT (roll_no) DO NOTHING;

Expand Down
11 changes: 7 additions & 4 deletions src/graphql/mutations/member_mutations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ impl MemberMutations {
let now = Local::now().with_timezone(&Kolkata).date_naive();

let member = sqlx::query_as::<_, Member>(
"INSERT INTO Member (roll_no, name, email, sex, year, hostel, mac_address, discord_id, group_id, track, created_at)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) RETURNING *"
"INSERT INTO Member (roll_no, name, email, sex, year, hostel, mac_address, discord_id, group_id, track, github_user, created_at)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) RETURNING *"
)
.bind(&input.roll_no)
.bind(&input.name)
Expand All @@ -29,6 +29,7 @@ impl MemberMutations {
.bind(&input.discord_id)
.bind(input.group_id)
.bind(&input.track)
.bind(&input.github_user)
.bind(now)
.fetch_one(pool.as_ref())
.await?;
Expand All @@ -51,8 +52,9 @@ impl MemberMutations {
mac_address = COALESCE($7, mac_address),
discord_id = COALESCE($8, discord_id),
group_id = COALESCE($9, group_id),
track = COALESCE($10, track)
WHERE member_id = $11
track = COALESCE($10, track),
github_user = COALESCE($11, github_user)
WHERE member_id = $12
RETURNING *",
)
.bind(&input.roll_no)
Expand All @@ -65,6 +67,7 @@ impl MemberMutations {
.bind(&input.discord_id)
.bind(input.group_id)
.bind(&input.track)
.bind(&input.github_user)
.bind(input.member_id)
.fetch_one(pool.as_ref())
.await?;
Expand Down
3 changes: 3 additions & 0 deletions src/models/member.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ pub struct Member {
pub discord_id: String,
pub group_id: i32,
pub track: Option<String>,
pub github_user: String,
#[graphql(skip)] // Don't expose internal fields/meta-data
pub created_at: NaiveDateTime,
}
Expand All @@ -40,6 +41,7 @@ pub struct CreateMemberInput {
pub discord_id: String,
pub group_id: i32,
pub track: Option<String>,
pub github_user: String,
}

#[derive(InputObject)]
Expand All @@ -55,4 +57,5 @@ pub struct UpdateMemberInput {
pub discord_id: Option<String>,
pub group_id: Option<i32>,
pub track: Option<String>,
pub github_user: Option<String>,
}