feat: add comments column to club_member

nkss-dev · Sep 27, 2023 · 3cf48ad · 3cf48ad
1 parent 54d3941
commit 3cf48ad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/database/queries/club/member.sql b/database/queries/club/member.sql
@@ -1,12 +1,13 @@
 -- name: CreateClubMember :exec
 INSERT INTO club_member (
-    club_name, roll_number, position, extra_groups
+    club_name, roll_number, position, extra_groups, comments
 )
 VALUES (
     (SELECT c.name FROM club AS c WHERE c.name = @club_name_or_alias OR c.alias = @club_name_or_alias),
     @roll_number,
     @position,
-    @extra_groups
+    @extra_groups,
+    @comments
 );
 
 -- name: ReadClubMembers :many
@@ -17,7 +18,8 @@ SELECT
     student.batch,
     student.email,
     club_member.position,
-    club_member.extra_groups
+    club_member.extra_groups,
+    COALESCE(club_member.comments, '')
 FROM
     student
     JOIN club_member ON student.roll_number = club_member.roll_number
@@ -29,7 +31,8 @@ UPDATE
     club_member
 SET
     position = @position,
-    extra_groups = @extra_groups
+    extra_groups = @extra_groups,
+    comments = @comments
 WHERE
     roll_number = @roll_number
     AND club_name = (SELECT c.name FROM club AS c WHERE c.name = @club_name_or_alias OR c.alias = @club_name_or_alias);

diff --git a/database/schemas/club.sql b/database/schemas/club.sql
@@ -45,6 +45,7 @@ CREATE TABLE IF NOT EXISTS club_member (
     roll_number   VARCHAR(9)    REFERENCES student(roll_number),
     position      VARCHAR(32)   DEFAULT 'Member' NOT NULL,
     extra_groups  VARCHAR(32)[] NOT NULL,
+    comments      VARCHAR,
     PRIMARY KEY (club_name, roll_number)
 );
 

diff --git a/handlers/club.go b/handlers/club.go
@@ -80,6 +80,7 @@ func CreateClubMember(db *sql.DB) http.HandlerFunc {
 		RollNumber      string   `json:"roll_number"`
 		Position        string   `json:"position"`
 		ExtraGroups     []string `json:"extra_groups"`
+		Comments        string   `json:"comments"`
 	}
 
 	return func(w http.ResponseWriter, r *http.Request) {
@@ -93,6 +94,7 @@ func CreateClubMember(db *sql.DB) http.HandlerFunc {
 			RollNumber:      clubMember.RollNumber,
 			Position:        clubMember.Position,
 			ExtraGroups:     clubMember.ExtraGroups,
+			Comments:        sql.NullString{String: clubMember.Comments, Valid: true},
 		}
 		err := queries.CreateClubMember(ctx, params)
 		if err != nil {
@@ -335,6 +337,7 @@ func UpdateClubMember(db *sql.DB) http.HandlerFunc {
 		RollNumber      string   `json:"roll_number"`
 		Position        string   `json:"position"`
 		ExtraGroups     []string `json:"extra_groups"`
+		Comments        string   `json:"comments"`
 	}
 
 	return func(w http.ResponseWriter, r *http.Request) {
@@ -348,6 +351,7 @@ func UpdateClubMember(db *sql.DB) http.HandlerFunc {
 			RollNumber:      clubMember.RollNumber,
 			Position:        clubMember.Position,
 			ExtraGroups:     clubMember.ExtraGroups,
+			Comments:        sql.NullString{String: clubMember.Comments, Valid: true},
 		}
 		err := queries.UpdateClubMember(ctx, params)
 		if err != nil {