From d3f777cdcb6a3a4010bef71d104373a5e40043d6 Mon Sep 17 00:00:00 2001 From: asoeb Date: Wed, 27 May 2026 11:55:12 +0200 Subject: [PATCH] Register now returns correct status code when violating unique constraint; Removed api.go as its not used --- go_app/backend/api.go | 112 ---------------------------- go_app/backend/handlers/register.go | 10 ++- 2 files changed, 9 insertions(+), 113 deletions(-) delete mode 100644 go_app/backend/api.go diff --git a/go_app/backend/api.go b/go_app/backend/api.go deleted file mode 100644 index 810d37d..0000000 --- a/go_app/backend/api.go +++ /dev/null @@ -1,112 +0,0 @@ -package main - -import ( - "database/sql" - "encoding/json" - _ "github.com/jackc/pgx/v5/stdlib" - "net/http" - "strings" - "time" - "whoknows_backend/metrics" - "whoknows_backend/structs" -) - -// GET /api/search -type apiSearchHandler struct { - DB *sql.DB -} - -func (h *apiSearchHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { - start := time.Now() - - defer func() { - - metrics.SearchRequestDuration. - WithLabelValues("/api/search", r.Method). - Observe(time.Since(start).Seconds()) - - }() - - if r.Method != http.MethodGet { - w.WriteHeader(http.StatusMethodNotAllowed) - return - } - - metrics.SearchRequestsTotal.Inc() - - q := r.URL.Query().Get("q") - lang := r.URL.Query().Get("language") - if lang == "" { - lang = "en" - } - - // q er required -> 422 hvis den mangler - if strings.TrimSpace(q) == "" { - status := 422 - msg := "q is required" - writeJSON(w, 422, structs.StandardResponse{ - StatusCode: &status, - Message: &msg, - }) - return - } - - normalized := strings.ToLower(strings.TrimSpace(q)) - if len(normalized) > 50 { - normalized = normalized[:50] - } - - metrics.SearchQueriesTotal.WithLabelValues(normalized).Inc() - - if h.DB == nil { - metrics.SearchErrorsTotal.Inc() - w.WriteHeader(http.StatusInternalServerError) - return - } - - rows, err := h.DB.Query( - `SELECT title, url, language, last_updated, content - FROM pages - WHERE to_tsvector('english', title || ' ' || content) @@ plainto_tsquery($1) - AND language = $2`, - q, lang, - ) - if err != nil { - metrics.SearchErrorsTotal.Inc() - w.WriteHeader(http.StatusInternalServerError) - return - } - defer func() { - _ = rows.Close() - }() - - data := make([]map[string]any, 0) - for rows.Next() { - var title, url, language, content string - var lastUpdated any - if err := rows.Scan(&title, &url, &language, &lastUpdated, &content); err != nil { - continue - } - data = append(data, map[string]any{ - "title": title, - "url": url, - "language": language, - "last_updated": lastUpdated, - "content": content, - }) - } - - metrics.SearchResultsTotal.Add(float64(len(data))) - if len(data) == 0 { - metrics.SearchNoResultsTotal.Inc() - } - - writeJSON(w, 200, structs.SearchResponse{Data: data}) -} - -// Hjælper -func writeJSON(w http.ResponseWriter, status int, payload any) { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(status) - _ = json.NewEncoder(w).Encode(payload) -} diff --git a/go_app/backend/handlers/register.go b/go_app/backend/handlers/register.go index 39a7bb4..24d39e2 100644 --- a/go_app/backend/handlers/register.go +++ b/go_app/backend/handlers/register.go @@ -87,8 +87,16 @@ func (h *RegisterHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { ) if err != nil { log.Printf("DB insert error: %v", err) - msg := "user creation failed" + if strings.Contains(err.Error(), "unique") || strings.Contains(err.Error(), "duplicate") { + msg := "username or email already exists" + writeRegisterJSON(w, http.StatusConflict, structs.AuthResponse{ + StatusCode: intPtr(409), + Message: &msg, + }) + return + } + msg := "user creation failed" writeRegisterJSON(w, http.StatusInternalServerError, structs.AuthResponse{ StatusCode: intPtr(500), Message: &msg,