chore: minor code style improvements

xBlaz3kx · xBlaz3kx · commit 3b6b7801406c · 2025-08-17T10:03:34.000+02:00
diff --git a/gen/mocks/users/service_mock.go b/gen/mocks/users/service_mock.go
diff --git a/internal/api/grpc/configuration.go b/internal/api/grpc/configuration.go
@@ -3,6 +3,8 @@ package grpc
 import (
 	"context"
 
+	"github.com/samber/lo"
+
 	"github.com/ChargePi/ocpp-manager/ocpp_v16"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
@@ -146,7 +148,7 @@ func (s *ConfigurationHandler) SetVariables(ctx context.Context, request *config
 	for _, variable := range request.GetVariables() {
 		status := "Failed"
 
-		err := s.settingsManager.UpdateKey(ocpp_v16.Key(variable.Key), variable.Value)
+		err := s.settingsManager.UpdateKey(ocpp_v16.Key(variable.GetKey()), lo.ToPtr(variable.GetValue()))
 		if err == nil {
 			status = "Success"
 		}
@@ -185,8 +187,8 @@ func toConfiguration(key core.ConfigurationKey) *configurationv1.OcppVariable {
 func toDisplay(d *configurationv1.Display) display.Settings {
 	return display.Settings{
 		IsEnabled: false,
-		Driver:    d.Type,
-		Language:  *d.Language,
+		Driver:    d.GetType(),
+		Language:  d.GetLanguage(),
 		// I2C:       nil,
 	}
 }
diff --git a/internal/api/grpc/evse.go b/internal/api/grpc/evse.go
@@ -32,8 +32,8 @@ func (s *EvseHandler) GetEVSEs(ctx context.Context, empty *empty.Empty) (*grpc.G
 	}
 
 	for _, e := range s.evseManager.GetEVSEs() {
-		evSe := toEvse(e)
-		response.Evses = append(response.Evses, evSe)
+		evseDto := toEvse(e)
+		response.Evses = append(response.Evses, evseDto)
 	}
 
 	return response, nil
@@ -68,7 +68,7 @@ func (s *EvseHandler) GetEVSE(ctx context.Context, request *grpc.GetEVSERequest)
 func (s *EvseHandler) SetEVCC(ctx context.Context, request *grpc.SetEVCCRequest) (*grpc.SetEVCCResponse, error) {
 	// todo
 
-	evse, err := s.evseManager.GetEVSE(int(request.EvseId))
+	evse, err := s.evseManager.GetEVSE(int(request.GetEvseId()))
 	if err != nil {
 		return nil, err
 	}
@@ -84,7 +84,7 @@ func (s *EvseHandler) SetPowerMeter(ctx context.Context, request *grpc.SetPowerM
 }
 
 func (s *EvseHandler) GetUsageForEVSE(request *grpc.GetUsageForEVSERequest, server grpc.EvseService_GetUsageForEVSEServer) error {
-	evseWithId, err := s.evseManager.GetEVSE(int(request.EvseId))
+	evseWithId, err := s.evseManager.GetEVSE(int(request.GetEvseId()))
 	if err != nil {
 		return err
 	}
diff --git a/internal/api/grpc/server.go b/internal/api/grpc/server.go
@@ -141,7 +141,7 @@ func authMiddleware(logger *zap.Logger, userService users.Service) func(context.
 			return nil, status.Errorf(codes.Unauthenticated, "no basic header found: %v", err)
 		}
 
-		if userService.CheckPassword(token, token) {
+		if userService.CheckPassword(ctx, token, token) {
 			return nil, status.Errorf(codes.Unauthenticated, "invalid auth credentials: %v", err)
 		}
 
diff --git a/internal/api/grpc/tag_auth.go b/internal/api/grpc/tag_auth.go
@@ -55,7 +55,7 @@ func (s *AuthService) AddAuthorizedCards(ctx context.Context, request *tagsv1.Ad
 	response := &tagsv1.AddAuthorizedCardsResponse{Status: []string{}}
 
 	for _, tag := range request.GetAuthorizedCards() {
-		err := s.tagManager.CacheTag(tag.TagId, types.NewIdTagInfo(types.AuthorizationStatus(tag.Status)))
+		err := s.tagManager.CacheTag(tag.GetTagId(), types.NewIdTagInfo(types.AuthorizationStatus(tag.GetStatus())))
 		if err != nil {
 			response.Status = append(response.Status, "Failed")
 			continue
diff --git a/internal/api/grpc/user.go b/internal/api/grpc/user.go
@@ -26,7 +26,7 @@ func (s *UserHandler) AddUser(ctx context.Context, user *grpc.AddUserRequest) (*
 
 	u := user.GetUser()
 
-	err := s.userService.AddUser(u.GetUsername(), u.GetPassword(), u.GetRole())
+	err := s.userService.AddUser(ctx, u.GetUsername(), u.GetPassword(), u.GetRole())
 	if err == nil {
 		response.Status = "Success"
 	}
@@ -35,7 +35,7 @@ func (s *UserHandler) AddUser(ctx context.Context, user *grpc.AddUserRequest) (*
 }
 
 func (s *UserHandler) GetUser(ctx context.Context, request *grpc.GetUserRequest) (*grpc.GetUserResponse, error) {
-	user, err := s.userService.GetUser(request.GetUsername())
+	user, err := s.userService.GetUser(ctx, request.GetUsername())
 	if err != nil {
 		return nil, err
 	}
@@ -48,7 +48,7 @@ func (s *UserHandler) GetUser(ctx context.Context, request *grpc.GetUserRequest)
 func (s *UserHandler) GetUsers(ctx context.Context, req *grpc.GetUsersRequest) (*grpc.GetUsersResponse, error) {
 	response := &grpc.GetUsersResponse{}
 
-	getUsers, err := s.userService.GetUsers()
+	getUsers, err := s.userService.GetUsers(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -65,7 +65,7 @@ func (s *UserHandler) RemoveUser(ctx context.Context, request *grpc.RemoveUserRe
 		Status: "Failed",
 	}
 
-	err := s.userService.DeleteUser(request.Username)
+	err := s.userService.DeleteUser(ctx, request.GetUsername())
 	if err == nil {
 		response.Status = "Success"
 	}
diff --git a/internal/api/http/server.go b/internal/api/http/server.go
@@ -48,8 +48,10 @@ func NewServer(configuration Configuration) *Server {
 	return &Server{
 		router: ginRouter,
 		server: &http.Server{
-			Addr:    configuration.Address,
-			Handler: ginRouter.Handler(),
+			Addr:              configuration.Address,
+			Handler:           ginRouter.Handler(),
+			ReadHeaderTimeout: time.Second * 20,
+			ReadTimeout:       time.Second * 20,
 		},
 		logger: logger,
 	}
diff --git a/internal/diagnostics/service_test.go b/internal/diagnostics/service_test.go
@@ -7,6 +7,8 @@ import (
 	"testing"
 	"time"
 
+	"go.uber.org/zap/zaptest"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
@@ -19,7 +21,7 @@ type serviceTestSuite struct {
 }
 
 func (s *serviceTestSuite) SetupTest() {
-	service, err := NewService()
+	service, err := NewService(zaptest.NewLogger(s.T()))
 	s.Require().NoError(err)
 
 	s.service = service
diff --git a/internal/display/i18n/translator_test.go b/internal/display/i18n/translator_test.go
@@ -3,6 +3,8 @@ package i18n
 import (
 	"testing"
 
+	"go.uber.org/zap/zaptest"
+
 	"github.com/stretchr/testify/suite"
 )
 
@@ -16,7 +18,7 @@ func (s *translatorTestSuite) SetupSuite() {
 		SupportedLanguages: []string{"en", "sl"},
 	}
 
-	translator, err := NewTranslator(settings)
+	translator, err := NewTranslator(zaptest.NewLogger(s.T()), settings)
 	s.Require().NoError(err)
 
 	s.translator = translator
diff --git a/internal/display/manager_test.go b/internal/display/manager_test.go
@@ -6,6 +6,8 @@ import (
 	"testing"
 	"time"
 
+	"go.uber.org/zap/zaptest"
+
 	mock_display "github.com/ChargePi/ChargePi-go/gen/mocks/pkg/hardware/display"
 
 	"github.com/ChargePi/ChargePi-go/internal/display/i18n"
@@ -21,7 +23,7 @@ type displayManagerTestSuite struct {
 }
 
 func (s *displayManagerTestSuite) SetupSuite() {
-	manager, err := NewDisplayManager()
+	manager, err := NewDisplayManager(zaptest.NewLogger(s.T()))
 	s.Require().NoError(err)
 	s.manager = manager
 	s.displayMocks = make(map[string]*mock_display.MockDisplay)
@@ -69,7 +71,7 @@ func (s *displayManagerTestSuite) TestDisplayMessage() {
 }
 
 func (s *displayManagerTestSuite) TestStrategy() {
-	translator, err := i18n.NewTranslator(i18n.Settings{})
+	translator, err := i18n.NewTranslator(zaptest.NewLogger(s.T()), i18n.Settings{})
 	s.Require().NoError(err)
 
 	tests := []struct {
diff --git a/internal/users/service.go b/internal/users/service.go
@@ -1,6 +1,7 @@
 package users
 
 import (
+	"context"
 	"errors"
 
 	"go.uber.org/zap"
@@ -17,12 +18,12 @@ var (
 
 type (
 	Service interface {
-		GetUser(username string) (*models.User, error)
-		GetUsers() ([]models.User, error)
-		AddUser(username, password, role string) error
-		UpdateUser(username string, password, role *string) (*models.User, error)
-		DeleteUser(username string) error
-		CheckPassword(username, password string) bool
+		GetUser(ctx context.Context, username string) (*models.User, error)
+		GetUsers(ctx context.Context) ([]models.User, error)
+		AddUser(ctx context.Context, username, password, role string) error
+		UpdateUser(ctx context.Context, username string, password, role *string) (*models.User, error)
+		DeleteUser(ctx context.Context, username string) error
+		CheckPassword(ctx context.Context, username, password string) bool
 	}
 
 	UserService struct {
@@ -61,7 +62,7 @@ func NewUserService(logger *zap.Logger, db UserRepository) *UserService {
 	}
 }
 
-func (u *UserService) GetUser(username string) (*models.User, error) {
+func (u *UserService) GetUser(ctx context.Context, username string) (*models.User, error) {
 	u.logger.With(zap.String("user", username)).Info("Getting user")
 	// todo check for access
 
@@ -78,7 +79,7 @@ func (u *UserService) GetUser(username string) (*models.User, error) {
 	return user, nil
 }
 
-func (u *UserService) GetUsers() ([]models.User, error) {
+func (u *UserService) GetUsers(context.Context) ([]models.User, error) {
 	u.logger.Info("Getting users")
 	// todo check for access
 
@@ -90,7 +91,7 @@ func (u *UserService) GetUsers() ([]models.User, error) {
 	return u.database.GetUsers()
 }
 
-func (u *UserService) AddUser(username, password, role string) error {
+func (u *UserService) AddUser(ctx context.Context, username, password, role string) error {
 	u.logger.With(zap.String("user", username)).Info("Adding a user")
 
 	user := models.User{
@@ -121,7 +122,7 @@ func (u *UserService) AddUser(username, password, role string) error {
 	return u.database.AddUser(user)
 }
 
-func (u *UserService) UpdateUser(username string, password, role *string) (*models.User, error) {
+func (u *UserService) UpdateUser(ctx context.Context, username string, password, role *string) (*models.User, error) {
 	u.logger.With(zap.String("user", username)).Info("Updating a user")
 	// todo check for access
 
@@ -157,7 +158,7 @@ func (u *UserService) UpdateUser(username string, password, role *string) (*mode
 	return user, nil
 }
 
-func (u *UserService) DeleteUser(username string) error {
+func (u *UserService) DeleteUser(ctx context.Context, username string) error {
 	u.logger.With(zap.String("user", username)).Info("Deleting a user")
 	// todo check for access
 
@@ -169,7 +170,7 @@ func (u *UserService) DeleteUser(username string) error {
 	return u.database.DeleteUser(username)
 }
 
-func (u *UserService) CheckPassword(username, password string) bool {
+func (u *UserService) CheckPassword(ctx context.Context, username, password string) bool {
 	u.logger.With(zap.String("user", username)).Info("Checking user password")
 	user, err := u.database.GetUser(username)
 	if err != nil {
diff --git a/internal/users/service_test.go b/internal/users/service_test.go
@@ -52,7 +52,7 @@ func (s *serviceTestSuite) TestGetUsers() {
 	for _, tt := range tests {
 		s.T().Run(tt.name, func(t *testing.T) {
 
-			user, err := s.service.GetUsers()
+			user, err := s.service.GetUsers(nil)
 			s.Assert().NoError(err)
 			s.Assert().Equal(0, len(user))
 		})
@@ -92,7 +92,7 @@ func (s *serviceTestSuite) TestAddUser() {
 
 	for _, tt := range tests {
 		s.T().Run(tt.name, func(t *testing.T) {
-			err := s.service.AddUser(tt.username, tt.password, string(tt.role))
+			err := s.service.AddUser(nil, tt.username, tt.password, string(tt.role))
 			s.Assert().NoError(err)
 		})
 	}
@@ -127,7 +127,7 @@ func (s *serviceTestSuite) TestGetUser() {
 
 	for _, tt := range tests {
 		s.T().Run(tt.name, func(t *testing.T) {
-			user, err := s.service.GetUser("exampleUser")
+			user, err := s.service.GetUser(nil, "exampleUser")
 			if tt.err != nil {
 				s.Assert().Error(err)
 				s.Assert().ErrorIs(tt.err, err)
@@ -172,7 +172,7 @@ func (s *serviceTestSuite) TestUpdateUser() {
 	for _, tt := range tests {
 		s.T().Run(tt.name, func(t *testing.T) {
 			// User exists
-			user, err := s.service.UpdateUser("", lo.ToPtr(""), lo.ToPtr(""))
+			user, err := s.service.UpdateUser(nil, "", lo.ToPtr(""), lo.ToPtr(""))
 			if tt.err != nil {
 				s.Assert().Error(err)
 				s.Assert().ErrorIs(tt.err, err)
diff --git a/pkg/hardware/power-meter/cs5460a.go b/pkg/hardware/power-meter/cs5460a.go
@@ -198,7 +198,7 @@ func (receiver *C5460A) readFromRegister(register int32) int32 {
 	_ = receiver.chipSelect.SetValue(0)
 
 	received := make([]byte, 32)
-	p := []spi.Packet{
+	packets := []spi.Packet{
 		{
 			W:      []byte{byte((ReadRegister) | register)},
 			KeepCS: true,
@@ -208,7 +208,7 @@ func (receiver *C5460A) readFromRegister(register int32) int32 {
 		},
 	}
 
-	err := receiver.spiConnection.TxPackets(p)
+	err := receiver.spiConnection.TxPackets(packets)
 	if err != nil {
 		receiver.logger.With(zap.Error(err)).Error("Cannot transmit to the power meter")
 	}
diff --git a/pkg/util/common_test.go b/pkg/util/common_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// nolint:all
+//nolint:all
 type exampleInterface interface {
 	ExampleMethod()
 }

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ func (s EvseHandler) GetEVSEs(ctx context.Context, empty empty.Empty) (*grpc.G`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`for _, e := range s.evseManager.GetEVSEs() {`
`35`		`- evSe := toEvse(e)`
`36`		`- response.Evses = append(response.Evses, evSe)`
	`35`	`+ evseDto := toEvse(e)`
	`36`	`+ response.Evses = append(response.Evses, evseDto)`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`return response, nil`
`@@ -68,7 +68,7 @@ func (s EvseHandler) GetEVSE(ctx context.Context, request grpc.GetEVSERequest)`
`68`	`68`	`func (s EvseHandler) SetEVCC(ctx context.Context, request grpc.SetEVCCRequest) (*grpc.SetEVCCResponse, error) {`
`69`	`69`	`// todo`
`70`	`70`
`71`		`- evse, err := s.evseManager.GetEVSE(int(request.EvseId))`
	`71`	`+ evse, err := s.evseManager.GetEVSE(int(request.GetEvseId()))`
`72`	`72`	`if err != nil {`
`73`	`73`	`return nil, err`
`74`	`74`	`}`
`@@ -84,7 +84,7 @@ func (s EvseHandler) SetPowerMeter(ctx context.Context, request grpc.SetPowerM`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`func (s EvseHandler) GetUsageForEVSE(request grpc.GetUsageForEVSERequest, server grpc.EvseService_GetUsageForEVSEServer) error {`
`87`		`- evseWithId, err := s.evseManager.GetEVSE(int(request.EvseId))`
	`87`	`+ evseWithId, err := s.evseManager.GetEVSE(int(request.GetEvseId()))`
`88`	`88`	`if err != nil {`
`89`	`89`	`return err`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ func authMiddleware(logger *zap.Logger, userService users.Service) func(context.`
`141`	`141`	`return nil, status.Errorf(codes.Unauthenticated, "no basic header found: %v", err)`
`142`	`142`	`}`
`143`	`143`
`144`		`- if userService.CheckPassword(token, token) {`
	`144`	`+ if userService.CheckPassword(ctx, token, token) {`
`145`	`145`	`return nil, status.Errorf(codes.Unauthenticated, "invalid auth credentials: %v", err)`
`146`	`146`	`}`
`147`	`147`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func (s UserHandler) AddUser(ctx context.Context, user grpc.AddUserRequest) (*`
`26`	`26`
`27`	`27`	`u := user.GetUser()`
`28`	`28`
`29`		`- err := s.userService.AddUser(u.GetUsername(), u.GetPassword(), u.GetRole())`
	`29`	`+ err := s.userService.AddUser(ctx, u.GetUsername(), u.GetPassword(), u.GetRole())`
`30`	`30`	`if err == nil {`
`31`	`31`	`response.Status = "Success"`
`32`	`32`	`}`
`@@ -35,7 +35,7 @@ func (s UserHandler) AddUser(ctx context.Context, user grpc.AddUserRequest) (*`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`func (s UserHandler) GetUser(ctx context.Context, request grpc.GetUserRequest) (*grpc.GetUserResponse, error) {`
`38`		`- user, err := s.userService.GetUser(request.GetUsername())`
	`38`	`+ user, err := s.userService.GetUser(ctx, request.GetUsername())`
`39`	`39`	`if err != nil {`
`40`	`40`	`return nil, err`
`41`	`41`	`}`
`@@ -48,7 +48,7 @@ func (s UserHandler) GetUser(ctx context.Context, request grpc.GetUserRequest)`
`48`	`48`	`func (s UserHandler) GetUsers(ctx context.Context, req grpc.GetUsersRequest) (*grpc.GetUsersResponse, error) {`
`49`	`49`	`response := &grpc.GetUsersResponse{}`
`50`	`50`
`51`		`- getUsers, err := s.userService.GetUsers()`
	`51`	`+ getUsers, err := s.userService.GetUsers(ctx)`
`52`	`52`	`if err != nil {`
`53`	`53`	`return nil, err`
`54`	`54`	`}`
`@@ -65,7 +65,7 @@ func (s UserHandler) RemoveUser(ctx context.Context, request grpc.RemoveUserRe`
`65`	`65`	`Status: "Failed",`
`66`	`66`	`}`
`67`	`67`
`68`		`- err := s.userService.DeleteUser(request.Username)`
	`68`	`+ err := s.userService.DeleteUser(ctx, request.GetUsername())`
`69`	`69`	`if err == nil {`
`70`	`70`	`response.Status = "Success"`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ package i18n`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
	`6`	`+ "go.uber.org/zap/zaptest"`
	`7`	`+`
`6`	`8`	`"github.com/stretchr/testify/suite"`
`7`	`9`	`)`
`8`	`10`
`@@ -16,7 +18,7 @@ func (s *translatorTestSuite) SetupSuite() {`
`16`	`18`	`SupportedLanguages: []string{"en", "sl"},`
`17`	`19`	`}`
`18`	`20`
`19`		`- translator, err := NewTranslator(settings)`
	`21`	`+ translator, err := NewTranslator(zaptest.NewLogger(s.T()), settings)`
`20`	`22`	`s.Require().NoError(err)`
`21`	`23`
`22`	`24`	`s.translator = translator`