From 23cc1b56a6067559193f4985d5ecbf601dacbc76 Mon Sep 17 00:00:00 2001 From: Yan Qing Date: Mon, 18 May 2020 18:16:49 +0800 Subject: [PATCH] Fix API's totalSize count. --- CHANGELOG.md | 7 +++++++ go.mod | 6 ++---- go.sum | 25 +++++++++++++++++++++---- src/api/app.go | 2 ++ src/api/router.go | 4 +--- src/api/user_test.go | 1 + src/model/group.go | 6 +++++- src/model/label.go | 4 +++- src/model/module.go | 4 +++- src/model/product.go | 4 +++- src/model/setting.go | 4 +++- src/model/user.go | 2 +- src/tpl/pagination.go | 3 +++ 13 files changed, 55 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8508298..23b34e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file starting fro This project adheres to [Semantic Versioning](http://semver.org/). ----- +## [1.3.3] - 2020-05-18 + +**Fixed:** + +- Fix API's totalSize count. +- Fix tracing middleware. + ## [1.3.2] - 2020-05-13 **Change:** diff --git a/go.mod b/go.mod index 40c8207..8b7da8d 100644 --- a/go.mod +++ b/go.mod @@ -4,13 +4,11 @@ go 1.14 require ( github.com/DavidCai1993/request v0.0.0-20171115020405-aad722fa9b76 - github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a // indirect github.com/jinzhu/gorm v1.9.12 - github.com/opentracing/opentracing-go v1.1.0 // indirect github.com/stretchr/testify v1.5.1 - github.com/teambition/gear v1.21.1 + github.com/teambition/gear v1.21.2 github.com/teambition/gear-auth v1.7.0 - github.com/teambition/gear-tracing v1.0.2 + github.com/teambition/gear-tracing v1.1.1 go.uber.org/dig v1.8.0 gopkg.in/yaml.v2 v2.2.8 ) diff --git a/go.sum b/go.sum index a6269fa..4463a49 100644 --- a/go.sum +++ b/go.sum @@ -34,6 +34,8 @@ github.com/go-http-utils/negotiator v1.0.0 h1:Qp1zofD6Nw7KXApXa3pAjehP06Js0ILguE github.com/go-http-utils/negotiator v1.0.0/go.mod h1:mTQe1sH0XhdFkeDiWpCY3QSk7Apo5jwOlIwLWJbJe2c= github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -50,6 +52,8 @@ github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M= github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -63,6 +67,8 @@ github.com/mattn/go-sqlite3 v2.0.1+incompatible h1:xQ15muvnzGBHpIpdrNi1DA5x0+TcB github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mozillazg/request v0.8.0 h1:TbXeQUdBWr1J1df5Z+lQczDFzX9JD71kTCl7Zu/9rNM= github.com/mozillazg/request v0.8.0/go.mod h1:weoQ/mVFNbWgRBtivCGF1tUT9lwneFesues+CleXMWc= +github.com/opentracing/basictracer-go v1.1.0 h1:Oa1fTSBvAl8pa3U+IJYqrKm0NALwH9OsgwOqDv4xJW0= +github.com/opentracing/basictracer-go v1.1.0/go.mod h1:V2HZueSJEp879yv285Aap1BS69fQMD+MNP1mRs6mBQc= github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= @@ -80,12 +86,12 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/teambition/compressible-go v1.0.1/go.mod h1:K91wjCUqzpuY2ZpSi039mt4WzzjMGxPFMZHHTEoTvak= github.com/teambition/gear v1.12.2/go.mod h1:VPFnRhfwYQiRDTzxEtzwfzAVDIcsbkX6i/AGOcRedy4= -github.com/teambition/gear v1.21.1 h1:IuQYb4UR6M/hse6t2hkM3vVikHUU7JJYVKOQUUScqjc= -github.com/teambition/gear v1.21.1/go.mod h1:berJp67mxgCZ1ZKgv1oCVV9WpWko3zAgIGYtaN4iGW0= +github.com/teambition/gear v1.21.2 h1:mwmfe5SOh9a5kQdoyYqdix/FGswtvu4QPkDzHNvkTLg= +github.com/teambition/gear v1.21.2/go.mod h1:berJp67mxgCZ1ZKgv1oCVV9WpWko3zAgIGYtaN4iGW0= github.com/teambition/gear-auth v1.7.0 h1:8RYk2IwMYpnUCYf3YjGuOOwG9sj+NzQKYf3XJxQ1CRY= github.com/teambition/gear-auth v1.7.0/go.mod h1:U194Q5AX9BEHakk+tcabPVy2qDjv53i+hlbjdSIjR/0= -github.com/teambition/gear-tracing v1.0.2 h1:Fc59uORQW3NqJMHVX2xQFdMTDOqSW8lKbJRzTnhkrbg= -github.com/teambition/gear-tracing v1.0.2/go.mod h1:HT+AHkSldjzXifAF6/RdXjtEkP3PnTA0JyI2+8KpG0s= +github.com/teambition/gear-tracing v1.1.1 h1:LDAqXdXI5A7Xa2woMnr+0rgw29e5XbQRxHuUN8FxxAU= +github.com/teambition/gear-tracing v1.1.1/go.mod h1:I9Vlhrv2wR1rXAod/1nFB9cQLodxvpkCfs/8rY0ewUc= github.com/teambition/trie-mux v1.4.2 h1:HgbwXfQDsingRLzyYdxEyut3i2Z9To/GOlVZD2gKRiM= github.com/teambition/trie-mux v1.4.2/go.mod h1:ZWBopELDBGsgw9l8lFD4WCkpZTmmEKhu/8w3FbsxBgo= github.com/vulcand/oxy v0.0.0-20181019102601-ac21a760928b/go.mod h1:giFb8dicROVdV5W0HXlA5siMBLWKnVXZlkA4Y5ZIzrY= @@ -94,6 +100,7 @@ go.uber.org/dig v1.8.0/go.mod h1:X34SnWGr8Fyla9zQNO2GSO2D+TIuqB14OS8JhYocIyw= golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd h1:GGJVjV8waZKRHrgwvtH66z9ZGVurTD1MT0n1Bb+q4aM= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -102,6 +109,9 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -110,6 +120,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI= +golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -118,17 +130,22 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181010134911-4d1c5fb19474 h1:4l+CHZwCUFzGF11IlLbqggmpYvJyXOKSlGBZ8M0Ag/w= golang.org/x/text v0.3.1-0.20181010134911-4d1c5fb19474/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191030062658-86caa796c7ab h1:tpc/nJ4vD66vAk/2KN0sw/DvQIz2sKmCpWvyKtPmfMQ= golang.org/x/tools v0.0.0-20191030062658-86caa796c7ab/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7 h1:EBZoQjiKKPaLbPrbpssUfuHtwM6KV/vb4U85g/cigFY= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/src/api/app.go b/src/api/app.go index 6e3a713..bf38d7b 100644 --- a/src/api/app.go +++ b/src/api/app.go @@ -6,6 +6,7 @@ import ( "github.com/jinzhu/gorm" "github.com/teambition/gear" + tracing "github.com/teambition/gear-tracing" "github.com/teambition/urbs-setting/src/logging" "github.com/teambition/urbs-setting/src/util" @@ -64,6 +65,7 @@ func NewApp() *gear.App { return nil }) + app.Use(tracing.New("EntryPoint")) if app.Env() != "test" { app.UseHandler(logging.AccessLogger) } diff --git a/src/api/router.go b/src/api/router.go index 899dca8..b32177e 100644 --- a/src/api/router.go +++ b/src/api/router.go @@ -2,7 +2,6 @@ package api import ( "github.com/teambition/gear" - tracing "github.com/teambition/gear-tracing" "github.com/teambition/urbs-setting/src/bll" "github.com/teambition/urbs-setting/src/middleware" @@ -43,13 +42,12 @@ func newRouters(apis *APIs) []*gear.Router { // health check router.Get("/healthz", apis.Healthz.Get) // 读取指定用户的灰度标签，包括继承自群组的标签，返回轻量级 labels，无身份验证，用于网关 - router.Get("/users/:uid/labels:cache", tracing.New(), apis.User.ListCachedLabels) + router.Get("/users/:uid/labels:cache", apis.User.ListCachedLabels) routerV1 := gear.NewRouter(gear.RouterOptions{ Root: "/v1", }) routerV1.Use(middleware.Auth) - routerV1.Use(tracing.New()) // ***** user ****** // 读取用户列表，支持条件筛选 diff --git a/src/api/user_test.go b/src/api/user_test.go index 79142f0..79eb687 100644 --- a/src/api/user_test.go +++ b/src/api/user_test.go @@ -523,6 +523,7 @@ func TestUserAPIs(t *testing.T) { data := json.Result[0] assert.Equal(service.IDToHID(setting0.ID, "setting"), data.HID) + assert.Equal(product.Name, data.Product) assert.Equal(module.Name, data.Module) assert.Equal(setting0.Name, data.Name) assert.Equal("a", data.Value) diff --git a/src/model/group.go b/src/model/group.go index 9ccb2c3..93904e2 100644 --- a/src/model/group.go +++ b/src/model/group.go @@ -68,18 +68,22 @@ func (m *Group) Find(ctx context.Context, kind string, pg tpl.Pagination) ([]sch groups := make([]schema.Group, 0) cursor := pg.TokenToID() db := m.DB.Where("`id` <= ?", cursor) + dbc := m.DB if pg.Q != "" { db = m.DB.Where("`id` <= ? and `uid` like ?", cursor, pg.Q) + dbc = m.DB.Where("`uid` like ?", pg.Q) } if kind != "" { db = m.DB.Where("`id` <= ? and `kind` = ?", cursor, kind) + dbc = m.DB.Where("`kind` = ?", kind) if pg.Q != "" { db = m.DB.Where("`id` <= ? and `kind` = ? and `uid` like ?", cursor, kind, pg.Q) + dbc = m.DB.Where("`kind` = ? and `uid` like ?", kind, pg.Q) } } total := 0 - err := db.Model(&schema.Group{}).Count(&total).Error + err := dbc.Model(&schema.Group{}).Count(&total).Error if err == nil { err = db.Order("`id` desc").Limit(pg.PageSize + 1).Find(&groups).Error } diff --git a/src/model/label.go b/src/model/label.go index d0824b8..f72ea8d 100644 --- a/src/model/label.go +++ b/src/model/label.go @@ -87,12 +87,14 @@ func (m *Label) Find(ctx context.Context, productID int64, pg tpl.Pagination) ([ labels := make([]schema.Label, 0) cursor := pg.TokenToID() db := m.DB.Where("`id` <= ? and `product_id` = ? and `offline_at` is null", cursor, productID) + dbc := m.DB.Where("`product_id` = ? and `offline_at` is null", productID) if pg.Q != "" { db = m.DB.Where("`id` <= ? and `product_id` = ? and `offline_at` is null and `name` like ?", cursor, productID, pg.Q) + dbc = m.DB.Where("`product_id` = ? and `offline_at` is null and `name` like ?", productID, pg.Q) } total := 0 - err := db.Model(&schema.Label{}).Count(&total).Error + err := dbc.Model(&schema.Label{}).Count(&total).Error if err == nil { err = db.Order("`id` desc").Limit(pg.PageSize + 1).Find(&labels).Error } diff --git a/src/model/module.go b/src/model/module.go index 0670379..f3f29b7 100644 --- a/src/model/module.go +++ b/src/model/module.go @@ -72,12 +72,14 @@ func (m *Module) Find(ctx context.Context, productID int64, pg tpl.Pagination) ( modules := make([]schema.Module, 0) cursor := pg.TokenToID() db := m.DB.Where("`id` <= ? and `product_id` = ? and `offline_at` is null", cursor, productID) + dbc := m.DB.Where("`product_id` = ? and `offline_at` is null", productID) if pg.Q != "" { db = m.DB.Where("`id` <= ? and `product_id` = ? and `offline_at` is null and `name` like ?", cursor, productID, pg.Q) + dbc = m.DB.Where("`product_id` = ? and `offline_at` is null and `name` like ?", productID, pg.Q) } total := 0 - err := db.Model(&schema.Label{}).Count(&total).Error + err := dbc.Model(&schema.Label{}).Count(&total).Error if err == nil { err = db.Order("`id` desc").Limit(pg.PageSize + 1).Find(&modules).Error } diff --git a/src/model/product.go b/src/model/product.go index eff60ad..be90d75 100644 --- a/src/model/product.go +++ b/src/model/product.go @@ -79,12 +79,14 @@ func (m *Product) Find(ctx context.Context, pg tpl.Pagination) ([]schema.Product products := make([]schema.Product, 0) cursor := pg.TokenToID() db := m.DB.Where("`id` <= ? and `deleted_at` is null and `offline_at` is null", cursor) + dbc := m.DB.Where("`deleted_at` is null and `offline_at` is null") if pg.Q != "" { db = m.DB.Where("`id` <= ? and `deleted_at` is null and `offline_at` is null and `name` like ?", cursor, pg.Q) + dbc = m.DB.Where("`deleted_at` is null and `offline_at` is null and `name` like ?", pg.Q) } total := 0 - err := db.Model(&schema.Product{}).Count(&total).Error + err := dbc.Model(&schema.Product{}).Count(&total).Error if err == nil { err = db.Order("`id` desc").Limit(pg.PageSize + 1).Find(&products).Error } diff --git a/src/model/setting.go b/src/model/setting.go index 59c6e31..09c7722 100644 --- a/src/model/setting.go +++ b/src/model/setting.go @@ -148,12 +148,14 @@ func (m *Setting) Find(ctx context.Context, moduleID int64, pg tpl.Pagination) ( settings := make([]schema.Setting, 0) cursor := pg.TokenToID() db := m.DB.Where("`id` <= ? and `module_id` = ? and `offline_at` is null", cursor, moduleID) + dbc := m.DB.Where("`module_id` = ? and `offline_at` is null", moduleID) if pg.Q != "" { db = m.DB.Where("`id` <= ? and `module_id` = ? and `offline_at` is null and `name` like ?", cursor, moduleID, pg.Q) + dbc = m.DB.Where("`module_id` = ? and `offline_at` is null and `name` like ?", moduleID, pg.Q) } total := 0 - err := db.Model(&schema.Setting{}).Count(&total).Error + err := dbc.Model(&schema.Setting{}).Count(&total).Error if err == nil { err = db.Order("`id` desc").Limit(pg.PageSize + 1).Find(&settings).Error } diff --git a/src/model/user.go b/src/model/user.go index c860004..a055860 100644 --- a/src/model/user.go +++ b/src/model/user.go @@ -76,7 +76,7 @@ func (m *User) Find(ctx context.Context, pg tpl.Pagination) ([]schema.User, int, db := m.DB.Where("`id` <= ?", cursor) if pg.Q != "" { db = m.DB.Where("`id` <= ? and `uid` like ?", cursor, pg.Q) - err = db.Model(&schema.User{}).Count(&total).Error + err = m.DB.Where("`uid` like ?", pg.Q).Model(&schema.User{}).Count(&total).Error } if err == nil { diff --git a/src/tpl/pagination.go b/src/tpl/pagination.go index 739d40a..aa1c78a 100644 --- a/src/tpl/pagination.go +++ b/src/tpl/pagination.go @@ -17,6 +17,9 @@ type Search struct { // Validate escape and build MySQL LIKE pattern func (s *Search) Validate() error { if s.Q != "" { + if len(s.Q) <= 2 { + return gear.ErrBadRequest.WithMsgf("too small query: %s", s.Q) + } s.Q = strings.ReplaceAll(s.Q, `\`, "-") s.Q = strings.ReplaceAll(s.Q, "%", `\%`) s.Q = strings.ReplaceAll(s.Q, "_", `\_`)