404 when key doesn't exist during deletion, 204 still when does exist

Author: auravoid

cmd/short-it/main.go

@@ -401,7 +401,7 @@ func handleListURLs(w http.ResponseWriter, r *http.Request) {
 	cursor := r.Header.Get("Cursor")
 	limitStr := r.Header.Get("Limit")
 	limit := maxPageSize
-	
+
 	if limitStr != "" {
 		if l, err := strconv.Atoi(limitStr); err == nil {
 			if l == 0 {
@@ -481,6 +481,11 @@ func handlePutCustomURL(w http.ResponseWriter, r *http.Request, path string) {
 }
 
 func handleDeleteURL(w http.ResponseWriter, r *http.Request, path string) {
+	if _, err := getURL(path); err != nil {
+		writeJSONError(w, http.StatusNotFound, fmt.Sprintf("Not Found: The short link key '%s' does not exist.", path))
+		return
+	}
+
 	if err := deleteURL(path); err != nil {
 		writeJSONError(w, http.StatusInternalServerError, fmt.Sprintf("Internal Server Error: Failed to delete URL '%s' from the database (%v).", path, err))
 		return
@@ -687,7 +692,7 @@ func handleRequest(w http.ResponseWriter, r *http.Request) {
 
 			url, err := getURL(rootRedirectKey)
 			if err == nil {
-				r.URL.Path = "/" 
+				r.URL.Path = "/"
 				handlePageView(r)
 				http.Redirect(w, r, url, http.StatusFound)
 				return
@@ -722,4 +727,4 @@ func handleRequest(w http.ResponseWriter, r *http.Request) {
 	default:
 		writeJSONError(w, http.StatusMethodNotAllowed, fmt.Sprintf("Method not allowed: Unsupported HTTP method '%s' for custom path endpoint. Use GET, PUT, or DELETE.", r.Method))
 	}
-}
+}

cmd/short-it/main_test.go

@@ -301,6 +301,14 @@ func TestDeleteURL(t *testing.T) {
 	if err == nil {
 		t.Error("URL should not exist after deletion")
 	}
+
+	// Test DELETE non-existent key
+	req2 := httptest.NewRequest("DELETE", "/nonexistent", nil)
+	w2 := httptest.NewRecorder()
+	handleDeleteURL(w2, req2, "nonexistent")
+	if w2.Code != http.StatusNotFound {
+		t.Errorf("Expected 404 for deleting non-existent key, got %d", w2.Code)
+	}
 }
 
 func TestHandleWebUICreateUsesAPIURL(t *testing.T) {