Fix test, format code
This commit is contained in:
parent
8c3e639668
commit
d1b3dd4814
|
@ -12,9 +12,8 @@ func TestViewsRequest_buildDateTimeFilter(t *testing.T) {
|
||||||
to: "",
|
to: "",
|
||||||
}
|
}
|
||||||
namedArgs := &[]sql.NamedArg{}
|
namedArgs := &[]sql.NamedArg{}
|
||||||
if gotDateTimeFilter := request.buildDateTimeFilter(namedArgs);
|
if gotDateTimeFilter := request.buildDateTimeFilter(namedArgs); gotDateTimeFilter != "" ||
|
||||||
gotDateTimeFilter != "" ||
|
len(*namedArgs) != 0 {
|
||||||
len(*namedArgs) != 0 {
|
|
||||||
t.Errorf("ViewsRequest.buildDateTimeFilter(): Wrong return string or length of namedArgs, should be empty")
|
t.Errorf("ViewsRequest.buildDateTimeFilter(): Wrong return string or length of namedArgs, should be empty")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -24,11 +23,10 @@ func TestViewsRequest_buildDateTimeFilter(t *testing.T) {
|
||||||
to: "",
|
to: "",
|
||||||
}
|
}
|
||||||
namedArgs := &[]sql.NamedArg{}
|
namedArgs := &[]sql.NamedArg{}
|
||||||
if gotDateTimeFilter := request.buildDateTimeFilter(namedArgs);
|
if gotDateTimeFilter := request.buildDateTimeFilter(namedArgs); gotDateTimeFilter != "datetime(time, 'localtime') >= :from" ||
|
||||||
gotDateTimeFilter != "datetime(time, 'localtime') >= :from" ||
|
len(*namedArgs) != 1 ||
|
||||||
len(*namedArgs) != 1 ||
|
(*namedArgs)[0].Name != "from" ||
|
||||||
(*namedArgs)[0].Name != "from" ||
|
(*namedArgs)[0].Value != "2019-01-01" {
|
||||||
(*namedArgs)[0].Value != "2019-01-01" {
|
|
||||||
t.Errorf("ViewsRequest.buildDateTimeFilter(): Wrong return string or namedArgs")
|
t.Errorf("ViewsRequest.buildDateTimeFilter(): Wrong return string or namedArgs")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -38,11 +36,10 @@ func TestViewsRequest_buildDateTimeFilter(t *testing.T) {
|
||||||
to: "2019-01-01",
|
to: "2019-01-01",
|
||||||
}
|
}
|
||||||
namedArgs := &[]sql.NamedArg{}
|
namedArgs := &[]sql.NamedArg{}
|
||||||
if gotDateTimeFilter := request.buildDateTimeFilter(namedArgs);
|
if gotDateTimeFilter := request.buildDateTimeFilter(namedArgs); gotDateTimeFilter != "datetime(time, 'localtime') <= :to" ||
|
||||||
gotDateTimeFilter != "datetime(time, 'localtime') <= :to" ||
|
len(*namedArgs) != 1 ||
|
||||||
len(*namedArgs) != 1 ||
|
(*namedArgs)[0].Name != "to" ||
|
||||||
(*namedArgs)[0].Name != "to" ||
|
(*namedArgs)[0].Value != "2019-01-01" {
|
||||||
(*namedArgs)[0].Value != "2019-01-01" {
|
|
||||||
t.Errorf("ViewsRequest.buildDateTimeFilter(): Wrong return string or namedArgs")
|
t.Errorf("ViewsRequest.buildDateTimeFilter(): Wrong return string or namedArgs")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -52,13 +49,12 @@ func TestViewsRequest_buildDateTimeFilter(t *testing.T) {
|
||||||
to: "2019-01-01",
|
to: "2019-01-01",
|
||||||
}
|
}
|
||||||
namedArgs := &[]sql.NamedArg{}
|
namedArgs := &[]sql.NamedArg{}
|
||||||
if gotDateTimeFilter := request.buildDateTimeFilter(namedArgs);
|
if gotDateTimeFilter := request.buildDateTimeFilter(namedArgs); gotDateTimeFilter != "datetime(time, 'localtime') between :from and :to" ||
|
||||||
gotDateTimeFilter != "datetime(time, 'localtime') between :from and :to" ||
|
len(*namedArgs) != 2 ||
|
||||||
len(*namedArgs) != 2 ||
|
(*namedArgs)[0].Name != "from" ||
|
||||||
(*namedArgs)[0].Name != "from" ||
|
(*namedArgs)[0].Value != "2018-01-01" ||
|
||||||
(*namedArgs)[0].Value != "2018-01-01" ||
|
(*namedArgs)[1].Name != "to" ||
|
||||||
(*namedArgs)[1].Name != "to" ||
|
(*namedArgs)[1].Value != "2019-01-01" {
|
||||||
(*namedArgs)[1].Value != "2019-01-01" {
|
|
||||||
t.Errorf("ViewsRequest.buildDateTimeFilter(): Wrong return string or namedArgs")
|
t.Errorf("ViewsRequest.buildDateTimeFilter(): Wrong return string or namedArgs")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -70,9 +66,8 @@ func TestViewsRequest_buildUrlFilter(t *testing.T) {
|
||||||
url: "",
|
url: "",
|
||||||
}
|
}
|
||||||
namedArgs := &[]sql.NamedArg{}
|
namedArgs := &[]sql.NamedArg{}
|
||||||
if gotUrlFilter := request.buildUrlFilter(namedArgs);
|
if gotUrlFilter := request.buildUrlFilter(namedArgs); gotUrlFilter != "" ||
|
||||||
gotUrlFilter != "" ||
|
len(*namedArgs) != 0 {
|
||||||
len(*namedArgs) != 0 {
|
|
||||||
t.Errorf("ViewsRequest.buildUrlFilter(): Wrong return string or length of namedArgs, should be empty")
|
t.Errorf("ViewsRequest.buildUrlFilter(): Wrong return string or length of namedArgs, should be empty")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -81,11 +76,10 @@ func TestViewsRequest_buildUrlFilter(t *testing.T) {
|
||||||
url: "google",
|
url: "google",
|
||||||
}
|
}
|
||||||
namedArgs := &[]sql.NamedArg{}
|
namedArgs := &[]sql.NamedArg{}
|
||||||
if gotUrlFilter := request.buildUrlFilter(namedArgs);
|
if gotUrlFilter := request.buildUrlFilter(namedArgs); gotUrlFilter != "url like :url" ||
|
||||||
gotUrlFilter != "url like :url" ||
|
len(*namedArgs) != 1 ||
|
||||||
len(*namedArgs) != 1 ||
|
(*namedArgs)[0].Name != "url" ||
|
||||||
(*namedArgs)[0].Name != "url" ||
|
(*namedArgs)[0].Value != "%google%" {
|
||||||
(*namedArgs)[0].Value != "%google%" {
|
|
||||||
t.Errorf("ViewsRequest.buildUrlFilter(): Wrong return string or namedArgs")
|
t.Errorf("ViewsRequest.buildUrlFilter(): Wrong return string or namedArgs")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -97,9 +91,8 @@ func TestViewsRequest_buildRefFilter(t *testing.T) {
|
||||||
ref: "",
|
ref: "",
|
||||||
}
|
}
|
||||||
namedArgs := &[]sql.NamedArg{}
|
namedArgs := &[]sql.NamedArg{}
|
||||||
if gotRefFilter := request.buildRefFilter(namedArgs);
|
if gotRefFilter := request.buildRefFilter(namedArgs); gotRefFilter != "" ||
|
||||||
gotRefFilter != "" ||
|
len(*namedArgs) != 0 {
|
||||||
len(*namedArgs) != 0 {
|
|
||||||
t.Errorf("ViewsRequest.buildRefFilter(): Wrong return string or length of namedArgs, should be empty")
|
t.Errorf("ViewsRequest.buildRefFilter(): Wrong return string or length of namedArgs, should be empty")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -108,11 +101,10 @@ func TestViewsRequest_buildRefFilter(t *testing.T) {
|
||||||
ref: "google",
|
ref: "google",
|
||||||
}
|
}
|
||||||
namedArgs := &[]sql.NamedArg{}
|
namedArgs := &[]sql.NamedArg{}
|
||||||
if gotRefFilter := request.buildRefFilter(namedArgs);
|
if gotRefFilter := request.buildRefFilter(namedArgs); gotRefFilter != "ref like :ref" ||
|
||||||
gotRefFilter != "ref like :ref" ||
|
len(*namedArgs) != 1 ||
|
||||||
len(*namedArgs) != 1 ||
|
(*namedArgs)[0].Name != "ref" ||
|
||||||
(*namedArgs)[0].Name != "ref" ||
|
(*namedArgs)[0].Value != "%google%" {
|
||||||
(*namedArgs)[0].Value != "%google%" {
|
|
||||||
t.Errorf("ViewsRequest.buildRefFilter(): Wrong return string or namedArgs")
|
t.Errorf("ViewsRequest.buildRefFilter(): Wrong return string or namedArgs")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -124,9 +116,8 @@ func TestViewsRequest_buildUseragentFilter(t *testing.T) {
|
||||||
ua: "",
|
ua: "",
|
||||||
}
|
}
|
||||||
namedArgs := &[]sql.NamedArg{}
|
namedArgs := &[]sql.NamedArg{}
|
||||||
if gotUseragentFilter := request.buildUseragentFilter(namedArgs);
|
if gotUseragentFilter := request.buildUseragentFilter(namedArgs); gotUseragentFilter != "" ||
|
||||||
gotUseragentFilter != "" ||
|
len(*namedArgs) != 0 {
|
||||||
len(*namedArgs) != 0 {
|
|
||||||
t.Errorf("ViewsRequest.buildUseragentFilter(): Wrong return string or length of namedArgs, should be empty")
|
t.Errorf("ViewsRequest.buildUseragentFilter(): Wrong return string or length of namedArgs, should be empty")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -135,11 +126,10 @@ func TestViewsRequest_buildUseragentFilter(t *testing.T) {
|
||||||
ua: "Firefox",
|
ua: "Firefox",
|
||||||
}
|
}
|
||||||
namedArgs := &[]sql.NamedArg{}
|
namedArgs := &[]sql.NamedArg{}
|
||||||
if gotUseragentFilter := request.buildUseragentFilter(namedArgs);
|
if gotUseragentFilter := request.buildUseragentFilter(namedArgs); gotUseragentFilter != "useragent like :ua" ||
|
||||||
gotUseragentFilter != "useragent like :ua" ||
|
len(*namedArgs) != 1 ||
|
||||||
len(*namedArgs) != 1 ||
|
(*namedArgs)[0].Name != "ua" ||
|
||||||
(*namedArgs)[0].Name != "ua" ||
|
(*namedArgs)[0].Value != "%Firefox%" {
|
||||||
(*namedArgs)[0].Value != "%Firefox%" {
|
|
||||||
t.Errorf("ViewsRequest.buildUseragentFilter(): Wrong return string or namedArgs")
|
t.Errorf("ViewsRequest.buildUseragentFilter(): Wrong return string or namedArgs")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
14
main.go
14
main.go
|
@ -2,14 +2,15 @@ package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api"
|
|
||||||
"github.com/gobuffalo/packr/v2"
|
|
||||||
"github.com/gorilla/mux"
|
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
|
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api"
|
||||||
|
"github.com/gobuffalo/packr/v2"
|
||||||
|
"github.com/gorilla/mux"
|
||||||
)
|
)
|
||||||
|
|
||||||
type kis3 struct {
|
type kis3 struct {
|
||||||
|
@ -24,7 +25,8 @@ var (
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func main() {
|
||||||
|
// Init
|
||||||
initConfig()
|
initConfig()
|
||||||
e := initDatabase()
|
e := initDatabase()
|
||||||
if e != nil {
|
if e != nil {
|
||||||
|
@ -32,9 +34,7 @@ func init() {
|
||||||
}
|
}
|
||||||
initRouter()
|
initRouter()
|
||||||
initTelegramBot()
|
initTelegramBot()
|
||||||
}
|
// Start
|
||||||
|
|
||||||
func main() {
|
|
||||||
go startListeningToWeb()
|
go startListeningToWeb()
|
||||||
go startReports()
|
go startReports()
|
||||||
go startStatsTelegram()
|
go startStatsTelegram()
|
||||||
|
|
7
stats.go
7
stats.go
|
@ -3,14 +3,15 @@ package main
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api"
|
|
||||||
"github.com/kis3/kis3/helpers"
|
|
||||||
"github.com/whiteshtef/clockwork"
|
|
||||||
"html/template"
|
"html/template"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api"
|
||||||
|
"github.com/kis3/kis3/helpers"
|
||||||
|
"github.com/whiteshtef/clockwork"
|
||||||
)
|
)
|
||||||
|
|
||||||
func initStatsRouter() {
|
func initStatsRouter() {
|
||||||
|
|
Reference in New Issue