Make yearTag editable by users

datasektionen · Nov 7, 2024 · 9f80bd0 · 9f80bd0
1 parent e2c8d42
commit 9f80bd0
Show file tree

Hide file tree

Showing 8 changed files with 201 additions and 95 deletions.
diff --git a/database/sql/user.sql b/database/sql/user.sql
@@ -35,3 +35,9 @@ where kthid = $1;
 update users
 set member_to = $2
 where kthid = $1;
+
+-- name: UpdateUser :one
+update users
+set year_tag = coalesce($2, year_tag) -- TODO: would be nice if we could make this function take year_tag as a pointer so it can actually be null here
+where kthid = $1
+returning *;
diff --git a/database/user.sql.go b/database/user.sql.go
diff --git a/handlers/routes.go b/handlers/routes.go
@@ -17,6 +17,7 @@ func MountRoutes(s *service.Service) {
 	http.Handle("GET /{$}", httputil.Route(s, index))
 	http.Handle("GET /logout", httputil.Route(s, logout))
 	http.Handle("GET /account", httputil.Route(s, account))
+	http.Handle("PATCH /account", httputil.Route(s, updateAccount))
 	http.Handle("GET /invite/{id}", httputil.Route(s, acceptInvite))
 
 	// admin.go

diff --git a/handlers/user.go b/handlers/user.go
@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"log/slog"
 	"net/http"
 	"time"
 
@@ -91,6 +92,29 @@ func account(s *service.Service, w http.ResponseWriter, r *http.Request) httputi
 	return templates.Account(*user, passkeys, isAdmin)
 }
 
+func updateAccount(s *service.Service, w http.ResponseWriter, r *http.Request) httputil.ToResponse {
+	user, err := s.GetLoggedInUser(r)
+	if err != nil {
+		return err
+	}
+	if user == nil {
+		return httputil.Unauthorized()
+	}
+	if err := r.ParseForm(); err != nil {
+		return httputil.BadRequest("Invalid form body")
+	}
+	yearTagList := r.Form["year-tag"]
+	if len(yearTagList) > 0 {
+		var err error
+		*user, err = s.UpdateUser(r.Context(), user.KTHID, yearTagList[0])
+		slog.Info("Updated user year tag", "value", user.YearTag)
+		if err != nil {
+			return err
+		}
+	}
+	return templates.AccountYearForm(user.YearTag)
+}
+
 func acceptInvite(s *service.Service, w http.ResponseWriter, r *http.Request) httputil.ToResponse {
 	idString := r.PathValue("id")
 	if idString == "-" {

diff --git a/pkg/static/public/style.dist.css b/pkg/static/public/style.dist.css
@@ -860,24 +860,14 @@ html {
   text-transform: uppercase;
 }
 
-.text-neutral-100 {
-  --tw-text-opacity: 1;
-  color: rgb(245 245 245 / var(--tw-text-opacity));
-}
-
-.text-cerise-regular {
-  --tw-text-opacity: 1;
-  color: rgb(232 61 132 / var(--tw-text-opacity));
-}
-
-.text-cerise-strong {
+.text-cerise-light {
   --tw-text-opacity: 1;
-  color: rgb(238 42 123 / var(--tw-text-opacity));
+  color: rgb(236 95 153 / var(--tw-text-opacity));
 }
 
-.text-cerise-light {
+.text-neutral-100 {
   --tw-text-opacity: 1;
-  color: rgb(236 95 153 / var(--tw-text-opacity));
+  color: rgb(245 245 245 / var(--tw-text-opacity));
 }
 
 .outline-none {

diff --git a/service/user.go b/service/user.go
@@ -17,19 +17,12 @@ import (
 	"github.com/jackc/pgx/v5"
 )
 
-func (s *Service) GetUser(ctx context.Context, kthid string) (*models.User, error) {
-	user, err := s.DB.GetUser(ctx, kthid)
-	if err == pgx.ErrNoRows {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
+func dbUserToModel(user database.User) models.User {
 	var memberTo time.Time
 	if user.MemberTo.Valid {
 		memberTo = user.MemberTo.Time
 	}
-	return &models.User{
+	return models.User{
 		KTHID:      user.Kthid,
 		UGKTHID:    user.UgKthid,
 		Email:      user.Email,
@@ -38,7 +31,30 @@ func (s *Service) GetUser(ctx context.Context, kthid string) (*models.User, erro
 		YearTag:    user.YearTag,
 		MemberTo:   memberTo,
 		WebAuthnID: user.WebauthnID,
-	}, nil
+	}
+}
+
+func (s *Service) GetUser(ctx context.Context, kthid string) (*models.User, error) {
+	user, err := s.DB.GetUser(ctx, kthid)
+	if err == pgx.ErrNoRows {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	u := dbUserToModel(user)
+	return &u, nil
+}
+
+func (s *Service) UpdateUser(ctx context.Context, kthid string, yearTag string) (models.User, error) {
+	user, err := s.DB.UpdateUser(ctx, database.UpdateUserParams{
+		Kthid:   kthid,
+		YearTag: yearTag,
+	})
+	if err != nil {
+		return models.User{}, err
+	}
+	return dbUserToModel(user), nil
 }
 
 func (s *Service) LoginUser(ctx context.Context, kthid string) httputil.ToResponse {

diff --git a/templates/user.templ b/templates/user.templ
@@ -40,12 +40,7 @@ templ Account(user models.User, passkeys []models.Passkey, isAdmin bool) {
 					<p class="text-xl text-cerise-light">Email address</p>
 					<p>{ user.Email }</p>
 				</div>
-				<form>
-					<label for="year-tag" class="text-xl text-cerise-light">Year</label>
-					<br/>
-					<input class={ input + " w-16" } name="year-tag" id="year-tag" value={ user.YearTag } _="on input show next <button/>"/>
-					<button style="display: none" class={ button }>Save</button>
-				</form>
+				@AccountYearForm(user.YearTag)
 				<div>
 					if user.MemberTo == (time.Time{}) {
 						<p>Not a chapter member</p>
@@ -61,6 +56,15 @@ templ Account(user models.User, passkeys []models.Passkey, isAdmin bool) {
 	}
 }
 
+templ AccountYearForm(yearTag string) {
+	<form hx-patch="/account" hx-swap="outerHTML">
+		<label for="year-tag" class="text-xl text-cerise-light">Year</label>
+		<br/>
+		<input class={ input + " w-16" } name="year-tag" id="year-tag" value={ yearTag } _="on input show next <button/>"/>
+		<button style="display: none" class={ button }>Save</button>
+	</form>
+}
+
 templ AcceptInvite() {
 	@modal() {
 		<div class="p-8 flex flex-col gap-4">