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