Add total_relations and content_length fields to model to capture exact counts irrespective of max config.

Author: knadh

cmd/dictpress/handlers.go

@@ -303,15 +303,3 @@ func getGlossaryWords(lang, initial string, pg paginator.Set, app *App) (*glossa
 
 	return out, nil
 }
-
-// validateSearchQuery does basic validation and sanity checks
-// on data.Query (useful for params coming from the outside world).
-func validateSearchQuery(q data.Query, langs data.LangMap) error {
-	for _, t := range q.Types {
-		if _, ok := langs[q.FromLang].Types[t]; !ok {
-			return fmt.Errorf("unknown type %s", t)
-		}
-	}
-
-	return nil
-}

internal/data/data.go

@@ -479,7 +479,8 @@ func (d *Data) SearchAndLoadRelations(e []Entry, q Query) error {
 		pq.StringArray(q.Types),
 		pq.StringArray(q.Tags),
 		pq.Int64Array(IDs),
-		q.Status, q.MaxRelations)
+		q.Status,
+		q.MaxRelations)
 	if err != nil {
 		if err == sql.ErrNoRows {
 			return nil
@@ -507,6 +508,7 @@ func (d *Data) SearchAndLoadRelations(e []Entry, q Query) error {
 
 		idx := idMap[r.FromID]
 		e[idx].Relations = append(e[idx].Relations, r)
+		e[idx].TotalRelations = r.TotalRelations
 	}
 
 	return nil

internal/data/models.go

@@ -14,22 +14,25 @@ type JSON map[string]interface{}
 
 // Entry represents a dictionary entry.
 type Entry struct {
-	ID        int            `json:"id,omitempty" db:"id"`
-	GUID      string         `json:"guid" db:"guid"`
-	Weight    float64        `json:"weight" db:"weight"`
-	Initial   string         `json:"initial" db:"initial"`
-	Lang      string         `json:"lang" db:"lang"`
-	Content   pq.StringArray `json:"content" db:"content"`
-	Tokens    string         `json:"tokens" db:"tokens"`
-	Tags      pq.StringArray `json:"tags" db:"tags"`
-	Phones    pq.StringArray `json:"phones" db:"phones"`
-	Notes     string         `json:"notes" db:"notes"`
-	Meta      JSON           `json:"meta" db:"meta"`
-	Status    string         `json:"status" db:"status"`
-	Relations []Entry        `json:"relations,omitempty" db:"relations"`
-	Total     int            `json:"-" db:"total"`
-	CreatedAt null.Time      `json:"created_at" db:"created_at"`
-	UpdatedAt null.Time      `json:"updated_at" db:"updated_at"`
+	ID            int            `json:"id,omitempty" db:"id"`
+	GUID          string         `json:"guid" db:"guid"`
+	Weight        float64        `json:"weight" db:"weight"`
+	Initial       string         `json:"initial" db:"initial"`
+	Lang          string         `json:"lang" db:"lang"`
+	Content       pq.StringArray `json:"content" db:"content"`
+	ContentLength int            `json:"content_length" db:"content_length"`
+	Tokens        string         `json:"tokens" db:"tokens"`
+	Tags          pq.StringArray `json:"tags" db:"tags"`
+	Phones        pq.StringArray `json:"phones" db:"phones"`
+	Notes         string         `json:"notes" db:"notes"`
+	Meta          JSON           `json:"meta" db:"meta"`
+	Status        string         `json:"status" db:"status"`
+	Relations     []Entry        `json:"relations,omitempty" db:"relations"`
+	CreatedAt     null.Time      `json:"created_at" db:"created_at"`
+	UpdatedAt     null.Time      `json:"updated_at" db:"updated_at"`
+
+	TotalRelations int `json:"total_relations" db:"total_relations"`
+	Total          int `json:"-" db:"total"`
 
 	// Non-public fields for scanning relationship data and populating Relation.
 	FromID            int            `json:"-" db:"from_id"`

queries.sql

@@ -55,10 +55,10 @@ results AS (
         SELECT * FROM tokenMatch
     ) AS combined
 )
-SELECT COUNT(*) OVER () AS total, * FROM results ORDER BY rank OFFSET $7 LIMIT $8;
+SELECT COUNT(*) OVER () AS total, *, ARRAY_LENGTH(content, 1) AS content_length FROM results ORDER BY rank OFFSET $7 LIMIT $8;
 
 -- name: search-relations
-SELECT entries.*,
+SELECT entries.*, ARRAY_LENGTH(entries.content, 1) AS content_length,
     sub.from_id AS from_id,
     sub.types AS relation_types,
     sub.tags AS relation_tags,
@@ -67,11 +67,14 @@ SELECT entries.*,
     sub.weight as relation_weight,
     sub.status as relation_status,
     sub.created_at as relation_created_at,
-    sub.updated_at as relation_updated_at
+    sub.updated_at as relation_updated_at,
+    sub.total_relations AS total_relations
 FROM entries
 INNER JOIN (
-    SELECT *,ROW_NUMBER() OVER (PARTITION BY relations.from_id, relations.types ORDER BY relations.weight) as rn
-        FROM relations
+    SELECT *,
+        ROW_NUMBER() OVER (PARTITION BY relations.from_id, relations.types ORDER BY relations.weight) as rn,
+        COUNT(*) OVER (PARTITION BY relations.from_id) as total_relations
+    FROM relations
     WHERE from_id = ANY($4::INT[])
         AND (CASE WHEN $5 != '' THEN relations.status = $5::entry_status ELSE TRUE END)
         AND (COALESCE(CARDINALITY($2::TEXT[]), 0) = 0 OR relations.types && $2)
@@ -87,7 +90,7 @@ WITH ids AS (
     UNION
     SELECT DISTINCT from_id FROM comments
 )
-SELECT COUNT(*) OVER () AS total, e.* FROM entries e
+SELECT COUNT(*) OVER () AS total, e.*, ARRAY_LENGTH(e.content, 1) AS content_length FROM entries e
     INNER JOIN ids ON (ids.from_id = e.id)
     WHERE ($1 = '' OR lang=$1)
     AND (COALESCE(CARDINALITY($2::TEXT[]), 0) = 0 OR e.tags && $2)
@@ -109,7 +112,7 @@ r AS (
 UPDATE relations WHERE from_id = $1;
 
 -- name: get-entry
-SELECT * FROM entries WHERE
+SELECT *, ARRAY_LENGTH(content, 1) AS content_length FROM entries WHERE
     CASE
         WHEN $1 > 0 THEN id = $1
         WHEN $2 != '' THEN guid = $2::UUID