Add new /api/dictionary/entries/:guid public API.

Author: knadh

cmd/dictpress/admin.go

@@ -128,7 +128,7 @@ func handleGetEntry(c echo.Context) error {
 		id, _ = strconv.Atoi(c.Param("id"))
 	)
 
-	e, err := app.data.GetEntry(id)
+	e, err := app.data.GetEntry(id, "")
 	if err != nil {
 		if err == sql.ErrNoRows {
 			return echo.NewHTTPError(http.StatusBadRequest, "entry not found")

cmd/dictpress/handlers.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"database/sql"
 	"errors"
 	"fmt"
 	"net/http"
@@ -73,6 +74,42 @@ func handleSearch(c echo.Context) error {
 	return c.JSON(http.StatusOK, okResp{out})
 }
 
+// handleGetEntryPublic returns an entry by its guid.
+func handleGetEntryPublic(c echo.Context) error {
+	var (
+		app  = c.Get("app").(*App)
+		guid = c.Param("guid")
+	)
+
+	e, err := app.data.GetEntry(0, guid)
+	if err != nil {
+		if err == sql.ErrNoRows {
+			return echo.NewHTTPError(http.StatusBadRequest, "entry not found")
+		}
+
+		return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
+	}
+
+	e.Relations = make([]data.Entry, 0)
+
+	out := []data.Entry{e}
+	if err := app.data.SearchAndLoadRelations(out, data.Query{}); err != nil {
+		app.lo.Printf("error loading relations: %v", err)
+		return echo.NewHTTPError(http.StatusInternalServerError, "error loading relations")
+	}
+
+	for i := range out {
+		out[i].ID = 0
+
+		for j := range out[i].Relations {
+			out[i].Relations[j].ID = 0
+			out[i].Relations[j].Relation.ID = 0
+		}
+	}
+
+	return c.JSON(http.StatusOK, okResp{out[0]})
+}
+
 // handleServeBundle serves concatenated JS or CSS files based on query parameters
 func handleServeBundle(c echo.Context, bundleType string, staticDir string) error {
 	files := c.QueryParams()["f"]

cmd/dictpress/init.go

@@ -190,6 +190,7 @@ func initHTTPServer(app *App, ko *koanf.Koanf) *echo.Echo {
 	// Public APIs.
 	p.GET("/api/config", handleGetConfig)
 	p.GET("/api/dictionary/:fromLang/:toLang/:q", handleSearch)
+	p.GET("/api/dictionary/entries/:guid", handleGetEntryPublic)
 
 	// Public user submission APIs.
 	if ko.Bool("app.enable_submissions") {

internal/data/data.go

@@ -244,9 +244,9 @@ func (d *Data) GetGlossaryWords(lang, initial string, offset, limit int) ([]Glos
 }
 
 // GetEntry returns an entry by its id.
-func (d *Data) GetEntry(id int) (Entry, error) {
+func (d *Data) GetEntry(id int, guid string) (Entry, error) {
 	var out Entry
-	if err := d.queries.GetEntry.Get(&out, id); err != nil {
+	if err := d.queries.GetEntry.Get(&out, id, guid); err != nil {
 		return out, err
 	}
 

queries.sql

@@ -107,7 +107,12 @@ r AS (
 UPDATE relations WHERE from_id = $1;
 
 -- name: get-entry
-SELECT * FROM entries WHERE id=$1;
+SELECT * FROM entries WHERE
+    CASE
+        WHEN $1 > 0 THEN id = $1
+        WHEN $2 != '' THEN guid = $2::UUID
+        ELSE FALSE
+    END;
 
 -- name: get-parent-relations
 SELECT entries.*, relations.id as relation_id FROM entries