Maksim Totmin
5120bf5de5
likePattern padded every token containing a digit, including ordinals like "3-я". When the ordinal starts the address, " 3-я " never matches, so "3-я Механическая улица 24а" returned no outages. Pad only pure-numeric house tokens; precision is enforced by the local house filter regardless.
111 lines
3.7 KiB
Go
111 lines
3.7 KiB
Go
package arcgis
|
||
|
||
import (
|
||
"context"
|
||
"net/http"
|
||
"net/http/httptest"
|
||
"strings"
|
||
"testing"
|
||
"time"
|
||
)
|
||
|
||
const envelope = `{
|
||
"features": [
|
||
{"value": "Станционная улица 1/1", "attributes": {
|
||
"address": "Станционная улица 1/1",
|
||
"type_id": 1, "system_id": 5, "time_category": 2,
|
||
"start_date": "2026-10-01T00:00:00", "end_date": "2026-10-31T00:00:00"
|
||
}}
|
||
],
|
||
"fields": [
|
||
{"name": "type_id", "domain": {"codedValues": [{"code": 1, "name": "Плановое"}]}},
|
||
{"name": "system_id", "domain": {"codedValues": [{"code": 5, "name": "Теплоснабжение"}]}},
|
||
{"name": "time_category", "domain": {"codedValues": [{"code": 2, "name": "Текущие"}]}}
|
||
]
|
||
}`
|
||
|
||
func TestQueryParsesEnvelope(t *testing.T) {
|
||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||
if got := r.URL.Query().Get("f"); got != "json" {
|
||
t.Errorf("missing f=json, got %q", got)
|
||
}
|
||
w.Header().Set("Content-Type", "application/json")
|
||
_, _ = w.Write([]byte(envelope))
|
||
}))
|
||
defer ts.Close()
|
||
|
||
c := New(ts.URL, time.Second, 0)
|
||
rows, err := c.Query(context.Background(), "Станционная улица 1/1")
|
||
if err != nil {
|
||
t.Fatalf("Query: %v", err)
|
||
}
|
||
if len(rows) != 1 {
|
||
t.Fatalf("rows = %d, want 1", len(rows))
|
||
}
|
||
got := rows[0]
|
||
if got.Type != "Плановое" || got.System != "Теплоснабжение" || got.Time != "Текущие" {
|
||
t.Errorf("coded values not resolved: %+v", got)
|
||
}
|
||
if got.Action != "heating" {
|
||
t.Errorf("Action = %q, want heating", got.Action)
|
||
}
|
||
}
|
||
|
||
func TestQueryRetriesThenFails(t *testing.T) {
|
||
var calls int
|
||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||
calls++
|
||
http.Error(w, "boom", http.StatusInternalServerError)
|
||
}))
|
||
defer ts.Close()
|
||
|
||
c := New(ts.URL, time.Second, 2)
|
||
if _, err := c.Query(context.Background(), "Станционная улица 1/1"); err == nil {
|
||
t.Fatal("expected error")
|
||
}
|
||
if calls != 3 {
|
||
t.Errorf("calls = %d, want 3 (1 + 2 retries)", calls)
|
||
}
|
||
}
|
||
|
||
// TestQueryStripsDistrictSuffix is a regression test: the portal appends the
|
||
// district in parentheses, which used to hide the house number from the parser.
|
||
func TestQueryStripsDistrictSuffix(t *testing.T) {
|
||
const env = `{"features":[{"value":"Медкадры улица, 1 (Заельцовский район)","attributes":{"address":"Медкадры улица, 1 (Заельцовский район)"}}]}`
|
||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||
w.Header().Set("Content-Type", "application/json")
|
||
_, _ = w.Write([]byte(env))
|
||
}))
|
||
defer ts.Close()
|
||
|
||
c := New(ts.URL, time.Second, 0)
|
||
rows, err := c.Query(context.Background(), "Медкадры улица 1")
|
||
if err != nil {
|
||
t.Fatalf("Query: %v", err)
|
||
}
|
||
if len(rows) != 1 {
|
||
t.Fatalf("rows = %d, want 1", len(rows))
|
||
}
|
||
if rows[0].Address != "Медкадры улица, 1" {
|
||
t.Errorf("district suffix not stripped: %q", rows[0].Address)
|
||
}
|
||
if rows[0].Unit.House != "1" {
|
||
t.Errorf("house not parsed at the boundary: %+v", rows[0].Unit)
|
||
}
|
||
}
|
||
|
||
// TestLikePattern guards the ordinal/house padding rule: padding an ordinal
|
||
// that starts the string breaks the portal match.
|
||
func TestLikePattern(t *testing.T) {
|
||
got := likePattern("3-я Механическая улица 24а")
|
||
if strings.Contains(got, " 3-я ") {
|
||
t.Errorf("ordinal must not be space-padded: %q", got)
|
||
}
|
||
if strings.Contains(got, " 24а ") {
|
||
t.Errorf("house with a letter must not be space-padded: %q", got)
|
||
}
|
||
if !strings.Contains(likePattern("Ленина улица 1"), "% 1 %") {
|
||
t.Errorf("pure numeric house must be space-padded: %q", likePattern("Ленина улица 1"))
|
||
}
|
||
}
|