From 6722949feba382beadd3b47022631b6253b4ac84 Mon Sep 17 00:00:00 2001 From: Kaur Palang Date: Wed, 11 Nov 2026 15:18:34 +0200 Subject: [PATCH 1/5] Allow setting event type ID of an availability rule in the API request --- internal/handler/availability.go | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/internal/handler/availability.go b/internal/handler/availability.go index 3eb766ec..99916346 100644 --- a/internal/handler/availability.go +++ b/internal/handler/availability.go @@ -123,9 +123,10 @@ func (h *Handler) UpdateAvailabilityRule(w http.ResponseWriter, r *http.Request) r.Body = http.MaxBytesReader(w, r.Body, 32<<10) var req struct { - DayOfWeek *int `json:"day_of_week"` - StartTime *string `json:"start_time"` - EndTime *string `json:"end_time"` + EventTypeId *string `json:"event_type_id"` + DayOfWeek *int `json:"day_of_week"` + StartTime *string `json:"start_time"` + EndTime *string `json:"end_time"` } if err := json.NewDecoder(r.Body).Decode(&req); err != nil { h.writeError(w, http.StatusBadRequest, "invalid JSON") @@ -137,11 +138,10 @@ func (h *Handler) UpdateAvailabilityRule(w http.ResponseWriter, r *http.Request) } var current availRuleJSON - var etID sql.NullString err := h.db.QueryRowContext(r.Context(), `SELECT id, event_type_id, day_of_week, start_time, end_time FROM availability_rules WHERE id = ? AND user_id = ?`, id, user.ID). - Scan(¤t.ID, &etID, ¤t.DayOfWeek, ¤t.StartTime, ¤t.EndTime) + Scan(¤t.ID, ¤t.EventTypeID, ¤t.DayOfWeek, ¤t.StartTime, ¤t.EndTime) if err == sql.ErrNoRows { h.writeError(w, http.StatusNotFound, "rule not found") return @@ -151,8 +151,16 @@ func (h *Handler) UpdateAvailabilityRule(w http.ResponseWriter, r *http.Request) h.writeError(w, http.StatusInternalServerError, "internal error") return } - if etID.Valid { - current.EventTypeID = &etID.String + + // As there's no good way to distinguish between "set etId to null" and "don't set etId" we're using a string of + // `null` to represent the former. + if req.EventTypeId != nil { + etID := req.EventTypeId + if *etID == "null" { + current.EventTypeID = nil + } else { + current.EventTypeID = req.EventTypeId + } } if req.DayOfWeek != nil { @@ -174,8 +182,8 @@ func (h *Handler) UpdateAvailabilityRule(w http.ResponseWriter, r *http.Request) } _, err = h.db.ExecContext(r.Context(), - `UPDATE availability_rules SET day_of_week=?, start_time=?, end_time=? WHERE id=? AND user_id=?`, - current.DayOfWeek, current.StartTime, current.EndTime, id, user.ID) + `UPDATE availability_rules SET event_type_id=?, day_of_week=?, start_time=?, end_time=? WHERE id=? AND user_id=?`, + current.EventTypeID, current.DayOfWeek, current.StartTime, current.EndTime, id, user.ID) if err != nil { if db.IsUniqueViolation(err) { h.writeError(w, http.StatusConflict, "a rule for this day and time already exists") From d6c8f60a88e27b88f5de62cd5720cb0e4318bfbd Mon Sep 17 00:00:00 2001 From: Kaur Palang Date: Wed, 11 Nov 2026 21:21:17 +0200 Subject: [PATCH 2/5] Add UI to select event type for availability rule --- frontend/src/routes/availability/+page.svelte | 48 +++++++++++++++++-- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/frontend/src/routes/availability/+page.svelte b/frontend/src/routes/availability/+page.svelte index ff960f9c..1a1ba4bf 100644 --- a/frontend/src/routes/availability/+page.svelte +++ b/frontend/src/routes/availability/+page.svelte @@ -1,6 +1,6 @@ {block.error} {/if} + + updateBlock(block)} + disabled={block.saving || !block.id} + > + + {#if block.event_type_id === "null"} + All + {:else} + {eventName(block.event_type_id)?.name ?? block.event_type_id} + {/if} + + + All + {#each eventTypes as e}{e.name}{/each} + + + Date: Wed, 11 Nov 2026 22:46:49 +0200 Subject: [PATCH 3/5] Make eventTypes reactive and update loadEventTypes function --- frontend/src/routes/availability/+page.svelte | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/src/routes/availability/+page.svelte b/frontend/src/routes/availability/+page.svelte index 1a1ba4bf..b1359ab9 100644 --- a/frontend/src/routes/availability/+page.svelte +++ b/frontend/src/routes/availability/+page.svelte @@ -275,13 +275,14 @@ } } - let eventTypes: {id: string, name: string}[] = [] + let eventTypes = $state<{id: string; name: string}[]>([]) async function loadEventTypes() { try { const res = await api.get<{ items: EventType[] }>('/v1/event-types'); - for (const r of (res.items ?? [])) { - eventTypes.push({id: r.id, name: r.name}) - } + eventTypes = (res.items ?? []).map((et) => ({ + id: et.id, + name: et.name, + })) } catch (e: any) { } From e0bd5469a46a697c139eb483cfce5fca200ec7ac Mon Sep 17 00:00:00 2001 From: Kaur Palang Date: Fri, 13 Nov 2026 16:32:32 +0200 Subject: [PATCH 4/5] Add descriptive labels and i18n-ed strings --- frontend/src/lib/i18n/en.json | 4 ++++ frontend/src/lib/i18n/fr.json | 4 ++++ frontend/src/routes/availability/+page.svelte | 8 ++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/frontend/src/lib/i18n/en.json b/frontend/src/lib/i18n/en.json index 6572f081..d14b9130 100644 --- a/frontend/src/lib/i18n/en.json +++ b/frontend/src/lib/i18n/en.json @@ -241,6 +241,10 @@ "addHours": "+ Add hours", "addBlock": "Add block", "saving": "saving…", + "eventTypes": { + "appliesTo": "Applies to", + "allEventTypes": "All event types" + }, "blockError": { "endAfterStart": "End must be after start" }, diff --git a/frontend/src/lib/i18n/fr.json b/frontend/src/lib/i18n/fr.json index 34f34ae4..46ca13d0 100644 --- a/frontend/src/lib/i18n/fr.json +++ b/frontend/src/lib/i18n/fr.json @@ -241,6 +241,10 @@ "addHours": "+ Ajouter des horaires", "addBlock": "Ajouter un bloc", "saving": "enregistrement…", + "eventTypes": { + "appliesTo": "S'applique à", + "allEventTypes": "Tous les types d'événements" + }, "blockError": { "endAfterStart": "La fin doit être après le début" }, diff --git a/frontend/src/routes/availability/+page.svelte b/frontend/src/routes/availability/+page.svelte index b1359ab9..875fc9b6 100644 --- a/frontend/src/routes/availability/+page.svelte +++ b/frontend/src/routes/availability/+page.svelte @@ -402,6 +402,10 @@ {block.error} {/if} + | +
+ {$t('availability.eventTypes.appliesTo')}: +
{#if block.event_type_id === "null"} - All + {$t('availability.eventTypes.allEventTypes')} {:else} {eventName(block.event_type_id)?.name ?? block.event_type_id} {/if} - All + {$t('availability.eventTypes.allEventTypes')} {#each eventTypes as e}{e.name}{/each} From fe7512227339a36c7b7b6ab3d24c4e9fedfaf408 Mon Sep 17 00:00:00 2001 From: Kaur Palang Date: Fri, 13 Nov 2026 17:04:50 +0200 Subject: [PATCH 5/5] Change event type ID handling to distinguish between "leave alone" and "clear" values --- frontend/src/routes/availability/+page.svelte | 2 +- internal/handler/availability.go | 21 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/frontend/src/routes/availability/+page.svelte b/frontend/src/routes/availability/+page.svelte index 875fc9b6..52b88db1 100644 --- a/frontend/src/routes/availability/+page.svelte +++ b/frontend/src/routes/availability/+page.svelte @@ -100,7 +100,7 @@ block.saving = true; try { await api.patch(`/v1/availability-rules/${block.id}`, { - event_type_id: block.event_type_id === null ? "null" : block.event_type_id, + event_type_id: block.event_type_id === "null" ? null : block.event_type_id, start_time: block.start_time, end_time: block.end_time }); diff --git a/internal/handler/availability.go b/internal/handler/availability.go index 99916346..91c444af 100644 --- a/internal/handler/availability.go +++ b/internal/handler/availability.go @@ -123,10 +123,10 @@ func (h *Handler) UpdateAvailabilityRule(w http.ResponseWriter, r *http.Request) r.Body = http.MaxBytesReader(w, r.Body, 32<<10) var req struct { - EventTypeId *string `json:"event_type_id"` - DayOfWeek *int `json:"day_of_week"` - StartTime *string `json:"start_time"` - EndTime *string `json:"end_time"` + EventTypeId json.RawMessage `json:"event_type_id"` // `nil` = leave alone, `null` = clear + DayOfWeek *int `json:"day_of_week"` + StartTime *string `json:"start_time"` + EndTime *string `json:"end_time"` } if err := json.NewDecoder(r.Body).Decode(&req); err != nil { h.writeError(w, http.StatusBadRequest, "invalid JSON") @@ -152,15 +152,14 @@ func (h *Handler) UpdateAvailabilityRule(w http.ResponseWriter, r *http.Request) return } - // As there's no good way to distinguish between "set etId to null" and "don't set etId" we're using a string of - // `null` to represent the former. if req.EventTypeId != nil { - etID := req.EventTypeId - if *etID == "null" { - current.EventTypeID = nil - } else { - current.EventTypeID = req.EventTypeId + var etId *string + if err := json.Unmarshal(req.EventTypeId, &etId); err != nil { + h.writeError(w, http.StatusBadRequest, "event_type_id must be a string") + return } + + current.EventTypeID = etId } if req.DayOfWeek != nil {