V3 S4 : recherche FTS + facettes (serveur + mobile)
Backend : search_tsv french + GIN (000020), SearchDocumentsVisible (nom + TS + faits, rang nom > TS > fait sûr > fait douteux, jamais d'exclusion), facettes issuer/type/montant/période sur GET /files/search (400 si malformée). Tests repo + handlers + migrations. Mobile (Room v21) : FTS4 files_fts + triggers partagés (fresh-install/migration, entité déclarée pour KSP, SQL aligné 21.json), searchDocuments offline (même rang, accents préservés) + UI filtres (émetteur, types chips, montants, période ISO, compteur, effacer). Contrat docs/api-v1.md, V3.md (S4 livré, migrations renumérotées links->000021, token->000022).
This commit is contained in:
@@ -5,9 +5,11 @@ import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/kazier/backend/pkg/api"
|
||||
"github.com/kazier/backend/repository"
|
||||
"github.com/kazier/backend/service"
|
||||
)
|
||||
|
||||
@@ -408,10 +410,53 @@ func FilesSearch(c *gin.Context) {
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
files, total, err := Store.SearchFiles(userID, q, page, pageSize)
|
||||
facets, ok := parseSearchFacets(c)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
files, total, err := Store.SearchFiles(userID, q, page, pageSize, facets)
|
||||
if err != nil {
|
||||
writeError(c, err)
|
||||
return
|
||||
}
|
||||
api.OKList(c, files, page, pageSize, total)
|
||||
}
|
||||
|
||||
// parseSearchFacets lit les facettes V3 (`issuer`, `from`/`to` ISO,
|
||||
// `min_amount`/`max_amount` numériques, `doc_type`) — 400 si malformées.
|
||||
func parseSearchFacets(c *gin.Context) (repository.SearchFacets, bool) {
|
||||
var facets repository.SearchFacets
|
||||
facets.Issuer = strings.TrimSpace(c.Query("issuer"))
|
||||
facets.DocType = strings.TrimSpace(c.Query("doc_type"))
|
||||
if v := strings.TrimSpace(c.Query("from")); v != "" {
|
||||
if _, err := time.Parse("2006-01-02", v); err != nil {
|
||||
api.Error(c, http.StatusBadRequest, "INVALID_REQUEST", "query param `from` must be ISO YYYY-MM-DD")
|
||||
return facets, false
|
||||
}
|
||||
facets.From = v
|
||||
}
|
||||
if v := strings.TrimSpace(c.Query("to")); v != "" {
|
||||
if _, err := time.Parse("2006-01-02", v); err != nil {
|
||||
api.Error(c, http.StatusBadRequest, "INVALID_REQUEST", "query param `to` must be ISO YYYY-MM-DD")
|
||||
return facets, false
|
||||
}
|
||||
facets.To = v
|
||||
}
|
||||
if v := strings.TrimSpace(c.Query("min_amount")); v != "" {
|
||||
f, err := strconv.ParseFloat(strings.ReplaceAll(v, ",", "."), 64)
|
||||
if err != nil {
|
||||
api.Error(c, http.StatusBadRequest, "INVALID_REQUEST", "query param `min_amount` must be numeric")
|
||||
return facets, false
|
||||
}
|
||||
facets.MinAmount = &f
|
||||
}
|
||||
if v := strings.TrimSpace(c.Query("max_amount")); v != "" {
|
||||
f, err := strconv.ParseFloat(strings.ReplaceAll(v, ",", "."), 64)
|
||||
if err != nil {
|
||||
api.Error(c, http.StatusBadRequest, "INVALID_REQUEST", "query param `max_amount` must be numeric")
|
||||
return facets, false
|
||||
}
|
||||
facets.MaxAmount = &f
|
||||
}
|
||||
return facets, true
|
||||
}
|
||||
|
||||
@@ -360,6 +360,83 @@ func TestSearchFiles(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestSearchFacets : filtres V3 sur faits + 400 si malformés.
|
||||
func TestSearchFacets(t *testing.T) {
|
||||
r, _, repo := setup(t)
|
||||
device := repository.NewID()
|
||||
token, user := registerAndLogin(t, r, repo, testUserUsername(device, "sf"), "search-test-password", device)
|
||||
|
||||
edfID := repository.NewID()
|
||||
if err := repo.Resources.InsertFile(user, edfID, "scan_1.pdf", "", 100, nil, nil); err != nil {
|
||||
t.Fatalf("insert: %v", err)
|
||||
}
|
||||
if err := repo.Resources.UpdateOcrText(user, edfID, "Facture EDF de mars"); err != nil {
|
||||
t.Fatalf("ocr: %v", err)
|
||||
}
|
||||
num := 84.20
|
||||
if err := repo.Resources.UpsertAutoFacts(edfID, []repository.FactParam{
|
||||
{Type: "issuer", ValueText: "EDF", Confidence: 0.9},
|
||||
{Type: "amount", ValueText: "84.20 €", ValueNum: &num, Confidence: 0.9},
|
||||
{Type: "doc_type", ValueText: "facture", Confidence: 0.8},
|
||||
}); err != nil {
|
||||
t.Fatalf("facts: %v", err)
|
||||
}
|
||||
otherID := repository.NewID()
|
||||
if err := repo.Resources.InsertFile(user, otherID, "scan_2.pdf", "", 100, nil, nil); err != nil {
|
||||
t.Fatalf("insert: %v", err)
|
||||
}
|
||||
|
||||
get := func(query string) []fileDTO {
|
||||
t.Helper()
|
||||
rec, _ := doRequest(t, r, http.MethodGet, "/api/v1/files/search"+query, token, nil, "")
|
||||
env := expectOK(t, rec, "search-facets:"+query)
|
||||
var files []fileDTO
|
||||
if err := json.Unmarshal(env.Data, &files); err != nil {
|
||||
t.Fatalf("unmarshal %s: %v", query, err)
|
||||
}
|
||||
return files
|
||||
}
|
||||
|
||||
// FTS via OCR (nom opaque).
|
||||
if files := get("?q=EDF"); len(files) == 0 || files[0].ID != edfID {
|
||||
t.Errorf("q=EDF via OCR: %+v", files)
|
||||
}
|
||||
// Facette émetteur : filtre.
|
||||
if files := get("?q=facture&issuer=edf"); len(files) != 1 || files[0].ID != edfID {
|
||||
t.Errorf("issuer=edf: %+v", files)
|
||||
}
|
||||
if files := get("?q=facture&issuer=engie"); len(files) != 0 {
|
||||
t.Errorf("issuer=engie doit filtrer: %+v", files)
|
||||
}
|
||||
// Facette montant.
|
||||
if files := get("?q=facture&min_amount=100"); len(files) != 0 {
|
||||
t.Errorf("min_amount=100 doit exclure 84.20: %+v", files)
|
||||
}
|
||||
if files := get("?q=facture&max_amount=100"); len(files) != 1 {
|
||||
t.Errorf("max_amount=100: %+v", files)
|
||||
}
|
||||
// Facette doc_type.
|
||||
if files := get("?q=scan&doc_type=facture"); len(files) != 1 || files[0].ID != edfID {
|
||||
t.Errorf("doc_type=facture: %+v", files)
|
||||
}
|
||||
|
||||
// Malformées → 400.
|
||||
for _, query := range []string{
|
||||
"?q=facture&from=12/03/2026",
|
||||
"?q=facture&to=demain",
|
||||
"?q=facture&min_amount=beaucoup",
|
||||
"?q=facture&max_amount=",
|
||||
} {
|
||||
// max_amount vide = absent (pas d'erreur) — seul le cas non-vide
|
||||
// non-numérique est rejeté ; on l'exclut ici.
|
||||
if query == "?q=facture&max_amount=" {
|
||||
continue
|
||||
}
|
||||
rec, _ := doRequest(t, r, http.MethodGet, "/api/v1/files/search"+query, token, nil, "")
|
||||
expectError(t, rec, http.StatusBadRequest, "INVALID_REQUEST", "search-facets-400:"+query)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSearchFilesEscapesPercent(t *testing.T) {
|
||||
r, _, repo := setup(t)
|
||||
device := repository.NewID()
|
||||
|
||||
Reference in New Issue
Block a user