add template package, add events, update dependencies

Author: MaxW1337

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
           fetch-depth: 2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.19'
+          go-version: '1.21'
       - name: Run coverage
         run: go test -race -coverpkg=./... -coverprofile=coverage.txt -covermode=atomic ./...
       - name: Upload coverage to Codecov

go.mod

@@ -8,16 +8,16 @@ require (
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/json-iterator/go v1.1.12
 	github.com/parkervcp/crocgodyl v0.1.1-0.20221213180216-7db80a34cb87
-	github.com/rs/zerolog v1.31.0
+	github.com/rs/zerolog v1.32.0
 	github.com/stretchr/testify v1.8.4
-	go.mongodb.org/mongo-driver v1.13.1
+	go.mongodb.org/mongo-driver v1.14.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
-	github.com/klauspost/compress v1.17.4 // indirect
+	github.com/klauspost/compress v1.17.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -28,9 +28,9 @@ require (
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
-	golang.org/x/crypto v0.18.0 // indirect
+	golang.org/x/crypto v0.19.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -24,6 +24,8 @@ github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCy
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
 github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
+github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
@@ -50,6 +52,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
 github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
+github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
@@ -66,12 +70,16 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk=
 go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo=
+go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80=
+go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
 golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
+golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -94,6 +102,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

src/go/messagebroker/match.go

@@ -20,6 +20,8 @@ const (
 	UNWINDIA_MATCH_READY_B
 	UNWINDIA_MATCH_READY_ALL
 	UNWINDIA_MATCH_SERVER_READY
+	UNWINDIA_MATCH_RESULT_UPDATED
+	UNWINDIA_MATCH_RESULT_FINISHED
 	UNWINDIA_MATCH_FINISHED
 	_maxEventid
 )
@@ -30,16 +32,20 @@ var EventsName = map[int]string{
 	2: "UNWINDIA_MATCH_READY_B",
 	3: "UNWINDIA_MATCH_READY_ALL",
 	4: "UNWINDIA_MATCH_SERVER_READY",
-	5: "UNWINDIA_MATCH_FINISHED",
+	5: "UNWINDIA_MATCH_RESULT_UPDATED",
+	6: "UNWINDIA_MATCH_RESULT_FINISHED",
+	7: "UNWINDIA_MATCH_FINISHED",
 }
 
 var EventsValue = map[string]MatchEvent{
-	"UNWINDIA_MATCH_NEW":          UNWINDIA_MATCH_NEW,
-	"UNWINDIA_MATCH_READY_A":      UNWINDIA_MATCH_READY_A,
-	"UNWINDIA_MATCH_READY_B":      UNWINDIA_MATCH_READY_B,
-	"UNWINDIA_MATCH_SERVER_READY": UNWINDIA_MATCH_SERVER_READY,
-	"UNWINDIA_MATCH_READY_ALL":    UNWINDIA_MATCH_READY_ALL,
-	"UNWINDIA_MATCH_FINISHED":     UNWINDIA_MATCH_FINISHED,
+	EventsName[0]: UNWINDIA_MATCH_NEW,
+	EventsName[1]: UNWINDIA_MATCH_READY_A,
+	EventsName[2]: UNWINDIA_MATCH_READY_B,
+	EventsName[3]: UNWINDIA_MATCH_READY_ALL,
+	EventsName[4]: UNWINDIA_MATCH_SERVER_READY,
+	EventsName[4]: UNWINDIA_MATCH_RESULT_UPDATED,
+	EventsName[4]: UNWINDIA_MATCH_RESULT_FINISHED,
+	EventsName[5]: UNWINDIA_MATCH_FINISHED,
 }
 
 func (e MatchEvent) String() string {
@@ -50,12 +56,6 @@ func (e MatchEvent) String() string {
 	return strconv.Itoa(int(e))
 }
 
-type NewContest struct {
-}
-type Response struct {
-	value interface{}
-}
-
 // UnmarshalJSON unmarshals b into MatchEvent.
 func (e *MatchEvent) UnmarshalJSON(b []byte) error {
 	// From json.Unmarshaler: By convention, to approximate the behavior of

src/go/template/template.go

@@ -1 +1,36 @@
 package template
+
+import (
+	"errors"
+	"github.com/GSH-LAN/Unwindia_common/src/go/matchservice"
+	"github.com/rs/zerolog/log"
+	"strings"
+	"text/template"
+)
+
+func ParseTemplateForMatch(tpl string, matchinfo *matchservice.MatchInfo) (string, error) {
+	if matchinfo == nil {
+		return "", errors.New("empty matchinfo")
+	}
+
+	funcs := map[string]any{
+		"contains":  strings.Contains,
+		"hasPrefix": strings.HasPrefix,
+		"hasSuffix": strings.HasSuffix,
+	}
+
+	tmpl, err := template.New("match").Option("missingkey=error").Funcs(funcs).Parse(tpl)
+	if err != nil {
+		log.Err(err).Msg("Error parsing template")
+		return "", err
+	}
+
+	parsedTemplate := strings.Builder{}
+	err = tmpl.Execute(&parsedTemplate, matchinfo)
+	if err != nil {
+		log.Err(err).Msg("Error parsing matchinfo into template")
+		return "", err
+	}
+
+	return parsedTemplate.String(), nil
+}

src/go/template/template_test.go

@@ -1 +1,185 @@
 package template
+
+import (
+	"github.com/GSH-LAN/Unwindia_common/src/go/matchservice"
+	"testing"
+)
+
+const (
+	templateText1 = `This match is managed by UNWINDIA
+{{if not (and .Team1.Ready .Team2.Ready) -}}
+As soon both teams are ready your gameserver will be genereated.
+{{ else -}} 
+{{ if ne .ServerAddress "" -}}
+Your server is ready, find the connection details below:
+IP-Address: {{ .ServerAddress }}
+Password: {{ .ServerPassword }}
+RCON-Password: {{ .ServerPasswordMgmt }}
+<a href="steam://connect/{{ .ServerAddress -}}/{{ .ServerPassword -}}">connect {{ .ServerAddress -}};password {{ .ServerPassword -}}</a>
+{{ else -}} 
+Since both Teams are ready now your server is getting prepared. This process will take a few minutes.
+{{ end -}}
+{{ end -}}
+`
+
+	expectedTemplateText1NewMatch = `This match is managed by UNWINDIA
+As soon both teams are ready your gameserver will be genereated.
+`
+
+	expectedTemplateText1TeamsReady = `This match is managed by UNWINDIA
+Since both Teams are ready now your server is getting prepared. This process will take a few minutes.
+`
+
+	expectedTemplateText1TeamsAndServerReady = `This match is managed by UNWINDIA
+Your server is ready, find the connection details below:
+IP-Address: 127.0.0.1:27015
+Password: password
+RCON-Password: secret
+<a href="steam://connect/127.0.0.1:27015/password">connect 127.0.0.1:27015;password password</a>
+`
+
+	templateTextBroken = ` This is a broken template {{ .UnKnownAttribute}} `
+)
+
+var matchNew = matchservice.MatchInfo{
+	Id:   "123",
+	MsID: "456",
+	Team1: matchservice.Team{
+		Id:      "team1id",
+		Name:    "cool-team",
+		Players: nil,
+		Picture: nil,
+		Ready:   false,
+	},
+	Team2: matchservice.Team{
+		Id:      "team2id",
+		Name:    "nice-teams",
+		Players: nil,
+		Picture: nil,
+		Ready:   false,
+	},
+	PlayerAmount:       10,
+	Game:               "csgo",
+	Map:                "",
+	ServerAddress:      "",
+	ServerPassword:     "",
+	ServerPasswordMgmt: "",
+	ServerTvAddress:    "",
+	ServerTvPassword:   "",
+}
+
+var matchTeamsReady = matchservice.MatchInfo{
+	Id:   "123",
+	MsID: "456",
+	Team1: matchservice.Team{
+		Id:      "team1id",
+		Name:    "cool-team",
+		Players: nil,
+		Picture: nil,
+		Ready:   true,
+	},
+	Team2: matchservice.Team{
+		Id:      "team2id",
+		Name:    "nice-teams",
+		Players: nil,
+		Picture: nil,
+		Ready:   true,
+	},
+	PlayerAmount:       10,
+	Game:               "csgo",
+	Map:                "",
+	ServerAddress:      "",
+	ServerPassword:     "",
+	ServerPasswordMgmt: "",
+	ServerTvAddress:    "",
+	ServerTvPassword:   "",
+}
+
+var matchTeamsAndServerReady = matchservice.MatchInfo{
+	Id:   "123",
+	MsID: "456",
+	Team1: matchservice.Team{
+		Id:      "team1id",
+		Name:    "cool-team",
+		Players: nil,
+		Picture: nil,
+		Ready:   true,
+	},
+	Team2: matchservice.Team{
+		Id:      "team2id",
+		Name:    "nice-teams",
+		Players: nil,
+		Picture: nil,
+		Ready:   true,
+	},
+	PlayerAmount:       10,
+	Game:               "csgo",
+	Map:                "",
+	ServerAddress:      "127.0.0.1:27015",
+	ServerPassword:     "password",
+	ServerPasswordMgmt: "secret",
+	ServerTvAddress:    "127.0.0.1:27115",
+	ServerTvPassword:   "tvpassword",
+}
+
+func TestParseTemplateForMatch(t *testing.T) {
+	type args struct {
+		tpl       string
+		matchinfo *matchservice.MatchInfo
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    string
+		wantErr bool
+	}{
+		{
+			name: "ok-template_new_match",
+			args: args{
+				tpl:       templateText1,
+				matchinfo: &matchNew,
+			},
+			want:    expectedTemplateText1NewMatch,
+			wantErr: false,
+		},
+		{
+			name: "ok-template_teams_ready",
+			args: args{
+				tpl:       templateText1,
+				matchinfo: &matchTeamsReady,
+			},
+			want:    expectedTemplateText1TeamsReady,
+			wantErr: false,
+		},
+		{
+			name: "ok-template_teams_and_server_ready",
+			args: args{
+				tpl:       templateText1,
+				matchinfo: &matchTeamsAndServerReady,
+			},
+			want:    expectedTemplateText1TeamsAndServerReady,
+			wantErr: false,
+		},
+		{
+			name: "err-template_text_broken",
+			args: args{
+				tpl:       templateTextBroken,
+				matchinfo: &matchNew,
+			},
+			want:    "",
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := ParseTemplateForMatch(tt.args.tpl, tt.args.matchinfo)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("ParseTemplateForMatch() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("ParseTemplateForMatch() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}