Merge branch 'main' into dudantas/feat-boosted-creature-and-event-sch…

…eduler
opentibiabr · Jun 10, 2024 · bb33e70 · bb33e70
2 parents 95074a1 + 60aea1c
commit bb33e70
Show file tree

Hide file tree

Showing 19 changed files with 49 additions and 25 deletions.
diff --git a/src/api/api_test.go b/src/api/api_test.go
@@ -2,11 +2,12 @@ package api
 
 import (
 	"database/sql"
+	"testing"
+
 	"github.com/gin-gonic/gin"
 	"github.com/opentibiabr/login-server/src/server"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
-	"testing"
 )
 
 func TestApi_GetName(t *testing.T) {

diff --git a/src/api/limiter/limiter.go b/src/api/limiter/limiter.go
@@ -1,12 +1,13 @@
 package limiter
 
 import (
-	"github.com/gin-gonic/gin"
-	"github.com/opentibiabr/login-server/src/configs"
 	"net/http"
 	"sync"
 	"time"
 
+	"github.com/gin-gonic/gin"
+	"github.com/opentibiabr/login-server/src/configs"
+
 	"golang.org/x/time/rate"
 )
 

diff --git a/src/api/login_test.go b/src/api/login_test.go
@@ -1,11 +1,12 @@
 package api
 
 import (
+	"reflect"
+	"testing"
+
 	"github.com/opentibiabr/login-server/src/api/models"
 	"github.com/opentibiabr/login-server/src/grpc/login_proto_messages"
 	"github.com/stretchr/testify/assert"
-	"reflect"
-	"testing"
 )
 
 var defaultString = "default"

diff --git a/src/api/models/character_test.go b/src/api/models/character_test.go
@@ -1,9 +1,10 @@
 package models
 
 import (
-	"github.com/opentibiabr/login-server/src/grpc/login_proto_messages"
 	"reflect"
 	"testing"
+
+	"github.com/opentibiabr/login-server/src/grpc/login_proto_messages"
 )
 
 func TestLoadCharactersFromMessage(t *testing.T) {

diff --git a/src/api/models/session_test.go b/src/api/models/session_test.go
@@ -1,9 +1,10 @@
 package models
 
 import (
+	"testing"
+
 	"github.com/opentibiabr/login-server/src/grpc/login_proto_messages"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestLoadSessionFromMessage(t *testing.T) {

diff --git a/src/api/models/world_test.go b/src/api/models/world_test.go
@@ -2,11 +2,12 @@ package models
 
 import (
 	"fmt"
-	"github.com/opentibiabr/login-server/src/configs"
-	"github.com/opentibiabr/login-server/src/grpc/login_proto_messages"
 	"log"
 	"reflect"
 	"testing"
+
+	"github.com/opentibiabr/login-server/src/configs"
+	"github.com/opentibiabr/login-server/src/grpc/login_proto_messages"
 )
 
 func TestPlayground(t *testing.T) {

diff --git a/src/configs/configs_test.go b/src/configs/configs_test.go
@@ -2,11 +2,12 @@ package configs
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
-	"golang.org/x/time/rate"
 	"log"
 	"os"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"golang.org/x/time/rate"
 )
 
 const defaultString = "default_string"

diff --git a/src/configs/database_test.go b/src/configs/database_test.go
@@ -1,8 +1,9 @@
 package configs
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDBConfigs_Format(t *testing.T) {

diff --git a/src/configs/game_server_test.go b/src/configs/game_server_test.go
@@ -1,10 +1,11 @@
 package configs
 
 import (
-	"github.com/stretchr/testify/assert"
 	"os"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGameServerConfigs_Format(t *testing.T) {

diff --git a/src/configs/login_server.go b/src/configs/login_server.go
@@ -2,6 +2,7 @@ package configs
 
 import (
 	"fmt"
+
 	"github.com/sirupsen/logrus"
 	"golang.org/x/time/rate"
 )

diff --git a/src/configs/login_server_test.go b/src/configs/login_server_test.go
@@ -1,11 +1,12 @@
 package configs
 
 import (
+	"os"
+	"testing"
+
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/time/rate"
-	"os"
-	"testing"
 )
 
 func TestGetHttpLoginConfigs(t *testing.T) {

diff --git a/src/database/account.go b/src/database/account.go
@@ -5,9 +5,11 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"log"
+	"time"
+
 	"github.com/opentibiabr/login-server/src/grpc/login_proto_messages"
 	"github.com/opentibiabr/login-server/src/logger"
-	"time"
 )
 
 type Account struct {
@@ -35,6 +37,7 @@ func (acc *Account) Authenticate(db *sql.DB) error {
 
 	err := db.QueryRow(statement).Scan(&acc.ID, &acc.PremDays, &acc.LastDay)
 	if err != nil {
+		log.Println(err.Error())
 		return err
 	}
 
@@ -52,7 +55,7 @@ func (acc *Account) GetGrpcSession() *login_proto_messages.Session {
 
 func (acc *Account) GetPremiumTime() uint64 {
 	if acc.PremDays > 0 {
-		return uint64(time.Now().Unix()) + uint64(acc.PremDays * secondsInADay)
+		return uint64(time.Now().Unix()) + uint64(acc.PremDays*secondsInADay)
 	}
 	return 0
 }

diff --git a/src/database/account_test.go b/src/database/account_test.go
@@ -1,11 +1,12 @@
 package database
 
 import (
+	"testing"
+	"time"
+
 	"bou.ke/monkey"
 	"github.com/opentibiabr/login-server/src/grpc/login_proto_messages"
 	"github.com/stretchr/testify/assert"
-	"testing"
-	"time"
 )
 
 func TestAccount_GetGrpcSession(t *testing.T) {

diff --git a/src/database/connector.go b/src/database/connector.go
@@ -2,6 +2,7 @@ package database
 
 import (
 	"database/sql"
+
 	"github.com/opentibiabr/login-server/src/configs"
 	"github.com/opentibiabr/login-server/src/logger"
 )

diff --git a/src/database/players.go b/src/database/players.go
@@ -3,6 +3,7 @@ package database
 import (
 	"database/sql"
 	"fmt"
+
 	"github.com/opentibiabr/login-server/src/configs"
 	"github.com/opentibiabr/login-server/src/grpc/login_proto_messages"
 )
@@ -23,6 +24,7 @@ func LoadPlayers(db *sql.DB, acc *Account) ([]*login_proto_messages.Character, e
 
 	defer rows.Close()
 
+	vocations := configs.GetServerVocations()
 	for rows.Next() {
 		player := login_proto_messages.Character{
 			WorldId: 0,
@@ -47,7 +49,9 @@ func LoadPlayers(db *sql.DB, acc *Account) ([]*login_proto_messages.Character, e
 			acc.LastLogin = player.Info.LastLogin
 		}
 
-		player.Info.Vocation = configs.GetServerVocations()[vocation]
+		if vocation < len(vocations) {
+			player.Info.Vocation = vocations[vocation]
+		}
 
 		players = append(players, &player)
 	}

diff --git a/src/grpc/grpc_server.go b/src/grpc/grpc_server.go
@@ -2,12 +2,13 @@ package grpc_login_server
 
 import (
 	"database/sql"
+	"net"
+
 	"github.com/opentibiabr/login-server/src/configs"
 	"github.com/opentibiabr/login-server/src/database"
 	"github.com/opentibiabr/login-server/src/grpc/login_proto_messages"
 	"github.com/opentibiabr/login-server/src/server"
 	"google.golang.org/grpc"
-	"net"
 )
 
 type GrpcServer struct {

diff --git a/src/grpc/grpc_server_test.go b/src/grpc/grpc_server_test.go
@@ -2,10 +2,11 @@ package grpc_login_server
 
 import (
 	"database/sql"
+	"testing"
+
 	"github.com/opentibiabr/login-server/src/grpc/login_proto_messages"
 	"github.com/opentibiabr/login-server/src/server"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestGrpcServer_GetName(t *testing.T) {

diff --git a/src/grpc/login.go b/src/grpc/login.go
@@ -2,6 +2,7 @@ package grpc_login_server
 
 import (
 	"context"
+
 	"github.com/opentibiabr/login-server/src/api/models"
 	"github.com/opentibiabr/login-server/src/configs"
 	"github.com/opentibiabr/login-server/src/database"

diff --git a/src/main.go b/src/main.go
@@ -2,13 +2,14 @@ package main
 
 import (
 	"fmt"
+	"sync"
+	"time"
+
 	"github.com/opentibiabr/login-server/src/api"
 	"github.com/opentibiabr/login-server/src/configs"
-	"github.com/opentibiabr/login-server/src/grpc"
+	grpc_login_server "github.com/opentibiabr/login-server/src/grpc"
 	"github.com/opentibiabr/login-server/src/logger"
 	"github.com/opentibiabr/login-server/src/server"
-	"sync"
-	"time"
 )
 
 var numberOfServers = 2