Repository navigation
feat(event-types): transfer ownership without changing the booking URL #68
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package handler | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "net/http" | ||
| ) | ||
|
|
||
| func (h *Handler) TransferEventType(w http.ResponseWriter, r *http.Request) { | ||
| user, ok := h.requireAdmin(w, r) | ||
| if !ok { | ||
| return | ||
| } | ||
| r.Body = http.MaxBytesReader(w, r.Body, 4096) | ||
| var body struct { | ||
| ExpectedOwnerID string `json:"expected_owner_id"` | ||
| NewOwnerID string `json:"new_owner_id"` | ||
| } | ||
| if err := json.NewDecoder(r.Body).Decode(&body); err != nil || body.ExpectedOwnerID != user.ID || body.NewOwnerID == "" || body.NewOwnerID == user.ID { | ||
| h.writeError(w, http.StatusBadRequest, "expected current owner and a different new owner are required") | ||
| return | ||
| } | ||
| tx, err := h.db.BeginTx(r.Context(), nil) | ||
| if err != nil { | ||
| h.writeError(w, http.StatusInternalServerError, "internal error") | ||
| return | ||
| } | ||
| defer tx.Rollback() | ||
| var id string | ||
| err = tx.QueryRowContext(r.Context(), `SELECT id FROM event_types WHERE slug = ? AND user_id = ? AND archived_at IS NULL`, r.PathValue("slug"), body.ExpectedOwnerID).Scan(&id) | ||
| if err != nil { | ||
| h.writeError(w, http.StatusConflict, "event ownership changed or event not found") | ||
| return | ||
| } | ||
| var eligible int | ||
| err = tx.QueryRowContext(r.Context(), `SELECT COUNT(*) FROM event_type_hosts h JOIN users u ON u.id=h.user_id WHERE h.event_type_id=? AND h.user_id=? AND h.role='required' AND u.archived_at IS NULL`, id, body.NewOwnerID).Scan(&eligible) | ||
| if err != nil { | ||
| h.writeError(w, http.StatusInternalServerError, "internal error") | ||
| return | ||
| } | ||
| if eligible != 1 { | ||
| h.writeError(w, http.StatusConflict, "new owner must be an active required host") | ||
| return | ||
| } | ||
| var active int | ||
| err = tx.QueryRowContext(r.Context(), `SELECT COUNT(*) FROM bookings WHERE event_type_id=? AND status!='cancelled' AND end_at > strftime('%Y-%m-%dT%H:%M:%SZ','now')`, id).Scan(&active) | ||
| if err != nil { | ||
| h.writeError(w, http.StatusInternalServerError, "internal error") | ||
| return | ||
| } | ||
| if active > 0 { | ||
| h.writeError(w, http.StatusConflict, "transfer requires no upcoming bookings") | ||
| return | ||
| } | ||
| _, err = tx.ExecContext(r.Context(), `UPDATE availability_rules SET user_id=? WHERE event_type_id=? AND user_id=?`, body.NewOwnerID, id, body.ExpectedOwnerID) | ||
| if err != nil { | ||
| h.writeError(w, http.StatusConflict, "event availability conflicts with new owner rules") | ||
| return | ||
|
Comment on lines
+54
to
+57
Contributor
There was a problem hiding this comment. This rewrite can violate |
||
| } | ||
| _, err = tx.ExecContext(r.Context(), `UPDATE event_types SET user_id=? WHERE id=? AND user_id=?`, body.NewOwnerID, id, body.ExpectedOwnerID) | ||
| if err != nil { | ||
| h.writeError(w, http.StatusInternalServerError, "internal error") | ||
| return | ||
| } | ||
| if err = tx.Commit(); err != nil { | ||
| h.writeError(w, http.StatusInternalServerError, "internal error") | ||
| return | ||
| } | ||
| h.logger.InfoContext(r.Context(), "event ownership transferred", "event_type_id", id, "previous_owner", user.ID, "new_owner", body.NewOwnerID) | ||
| h.writeJSON(w, http.StatusOK, map[string]any{"id": id, "slug": r.PathValue("slug"), "owner_id": body.NewOwnerID}) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| package handler_test | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestTransferEventTypePreservesIdentityAndRequiresCurrentOwner(t *testing.T) { | ||
| h, database, key, owner := setupWorkspaceWithDB(t) | ||
| slug, id := seedEventTypeHTTP(t, h, key) | ||
| _, err := database.Exec(`INSERT INTO users (id,email,name,iana_timezone,is_admin) VALUES ('new-owner','new@example.com','New','Europe/Amsterdam',0)`) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| transfer := func() *httptest.ResponseRecorder { | ||
| req := authReq(http.MethodPost, "/v1/event-types/"+slug+"/transfer", fmt.Sprintf(`{"expected_owner_id":%q,"new_owner_id":"new-owner"}`, owner), key) | ||
| req.SetPathValue("slug", slug) | ||
| rec := httptest.NewRecorder() | ||
| h.RequireAuth(h.TransferEventType)(rec, req) | ||
| return rec | ||
| } | ||
| if rec := transfer(); rec.Code != http.StatusConflict { | ||
| t.Fatalf("unassigned host transfer: %d %s", rec.Code, rec.Body) | ||
| } | ||
| if rec := putHosts(t, h, slug, key, `{"hosts":[{"user_id":"new-owner","role":"required","priority":0}]}`); rec.Code != http.StatusOK { | ||
| t.Fatalf("assign: %d", rec.Code) | ||
| } | ||
| _, err = database.Exec(`INSERT INTO availability_rules (id,user_id,event_type_id,day_of_week,start_time,end_time) VALUES ('rule',?,?,1,'09:00','20:00')`, owner, id) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| _, err = database.Exec(`INSERT INTO bookings (id,event_type_id,host_id,start_at,end_at,status) VALUES ('upcoming',?,?,'2099-01-01T09:00:00Z','2099-01-01T09:15:00Z','confirmed')`, id, owner) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if rec := transfer(); rec.Code != http.StatusConflict { | ||
| t.Fatalf("upcoming booking: %d", rec.Code) | ||
| } | ||
| if _, err = database.Exec(`UPDATE bookings SET status='cancelled' WHERE id='upcoming'`); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if rec := transfer(); rec.Code != http.StatusOK { | ||
| t.Fatalf("transfer: %d %s", rec.Code, rec.Body) | ||
| } | ||
| var gotID, gotOwner, ruleOwner string | ||
| if err := database.QueryRow(`SELECT id,user_id FROM event_types WHERE slug=?`, slug).Scan(&gotID, &gotOwner); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if gotID != id || gotOwner != "new-owner" { | ||
| t.Fatalf("identity: %s %s", gotID, gotOwner) | ||
| } | ||
| if err := database.QueryRow(`SELECT user_id FROM availability_rules WHERE id='rule'`).Scan(&ruleOwner); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if ruleOwner != "new-owner" { | ||
| t.Fatalf("rule owner: %s", ruleOwner) | ||
| } | ||
| if rec := transfer(); rec.Code != http.StatusConflict { | ||
| t.Fatalf("stale transfer: %d", rec.Code) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because this filter excludes the current user and demands
required, the dropdown is empty for the two most common configurations: afixedevent's only required host is its owner (written that way bysaveETat line 386), and around_robinevent's hosts are allrotation(line 376). The panel then renders with just the placeholder and a permanently disabled button, and the server gate atevent_type_transfer.go:35would reject those targets anyway — so transfer only works forcollectiveevents with a non-owner required co-host.Technical details