[lint] fix more issues

Author: capcom6

.golangci.yml

@@ -445,6 +445,7 @@ linters:
     wrapcheck:
       extra-ignore-sigs:
         - .JSON(
+        - .SendStatus(
 
   exclusions:
     generated: lax
@@ -473,6 +474,7 @@ linters:
           - dupl
           - err113
           - errcheck
+          - exhaustruct
           - funlen
           - goconst
           - gosec

internal/sms-gateway/app.go

@@ -43,12 +43,12 @@ func Module() fx.Option {
 		validator.Module,
 		openapi.Module(),
 		handlers.Module,
-		auth.Module,
+		auth.Module(),
 		push.Module(),
 		db.Module,
 		cache.Module(),
 		pubsub.Module(),
-		events.Module,
+		events.Module(),
 		messages.Module(),
 		health.Module(),
 		webhooks.Module,

internal/sms-gateway/handlers/base/handler_test.go

@@ -3,7 +3,7 @@ package base_test
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
+	"errors"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -36,21 +36,21 @@ type testRequestParams struct {
 
 func (t *testRequestBody) Validate() error {
 	if t.Age < 18 {
-		return fmt.Errorf("must be at least 18 years old")
+		return errors.New("must be at least 18 years old")
 	}
 	return nil
 }
 
 func (t *testRequestQuery) Validate() error {
 	if t.Age < 18 {
-		return fmt.Errorf("must be at least 18 years old")
+		return errors.New("must be at least 18 years old")
 	}
 	return nil
 }
 
 func (t *testRequestParams) Validate() error {
 	if t.ID == "invalid" {
-		return fmt.Errorf("invalid ID")
+		return errors.New("invalid ID")
 	}
 	return nil
 }
@@ -117,10 +117,10 @@ func TestHandler_BodyParserValidator(t *testing.T) {
 			var req *http.Request
 			if test.payload != nil {
 				bodyBytes, _ := json.Marshal(test.payload)
-				req = httptest.NewRequest("POST", test.path, bytes.NewReader(bodyBytes))
+				req = httptest.NewRequest(http.MethodPost, test.path, bytes.NewReader(bodyBytes))
 				req.Header.Set("Content-Type", "application/json")
 			} else {
-				req = httptest.NewRequest("POST", test.path, nil)
+				req = httptest.NewRequest(http.MethodPost, test.path, nil)
 			}
 
 			resp, err := app.Test(req)
@@ -183,7 +183,7 @@ func TestHandler_QueryParserValidator(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
-			req := httptest.NewRequest("GET", test.path, nil)
+			req := httptest.NewRequest(http.MethodGet, test.path, nil)
 
 			resp, err := app.Test(req)
 			if err != nil {
@@ -240,7 +240,7 @@ func TestHandler_ParamsParserValidator(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
-			req := httptest.NewRequest("GET", test.path, nil)
+			req := httptest.NewRequest(http.MethodGet, test.path, nil)
 
 			resp, err := app.Test(req)
 			if err != nil {

internal/sms-gateway/handlers/converters/messages.go

@@ -24,7 +24,8 @@ func MessageToMobileDTO(m messages.MessageOut) smsgateway.MobileMessage {
 
 	return smsgateway.MobileMessage{
 		Message: smsgateway.Message{
-			ID: m.ID,
+			ID:       m.ID,
+			DeviceID: "",
 
 			Message:     message,
 			TextMessage: textMessage,

internal/sms-gateway/handlers/devices/3rdparty.go

@@ -10,25 +10,31 @@ import (
 	"github.com/android-sms-gateway/server/internal/sms-gateway/models"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices"
 	"github.com/capcom6/go-helpers/slices"
+	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
-	"go.uber.org/fx"
 	"go.uber.org/zap"
 )
 
-type thirdPartyControllerParams struct {
-	fx.In
-
-	DevicesSvc *devices.Service
-
-	Logger *zap.Logger
-}
-
 type ThirdPartyController struct {
 	base.Handler
 
 	devicesSvc *devices.Service
 }
 
+func NewThirdPartyController(
+	devicesSvc *devices.Service,
+	logger *zap.Logger,
+	validator *validator.Validate,
+) *ThirdPartyController {
+	return &ThirdPartyController{
+		Handler: base.Handler{
+			Logger:    logger,
+			Validator: validator,
+		},
+		devicesSvc: devicesSvc,
+	}
+}
+
 //	@Summary		List devices
 //	@Description	Returns list of registered devices
 //	@Security		ApiAuth
@@ -40,7 +46,7 @@ type ThirdPartyController struct {
 //	@Failure		500	{object}	smsgateway.ErrorResponse	"Internal server error"
 //	@Router			/3rdparty/v1/devices [get]
 //
-// List devices
+// List devices.
 func (h *ThirdPartyController) get(user models.User, c *fiber.Ctx) error {
 	devices, err := h.devicesSvc.Select(user.ID)
 	if err != nil {
@@ -65,7 +71,7 @@ func (h *ThirdPartyController) get(user models.User, c *fiber.Ctx) error {
 //	@Failure		500	{object}	smsgateway.ErrorResponse	"Internal server error"
 //	@Router			/3rdparty/v1/devices/{id} [delete]
 //
-// Remove device
+// Remove device.
 func (h *ThirdPartyController) remove(user models.User, c *fiber.Ctx) error {
 	id := c.Params("id")
 
@@ -84,12 +90,3 @@ func (h *ThirdPartyController) Register(router fiber.Router) {
 	router.Get("", userauth.WithUser(h.get))
 	router.Delete(":id", userauth.WithUser(h.remove))
 }
-
-func NewThirdPartyController(params thirdPartyControllerParams) *ThirdPartyController {
-	return &ThirdPartyController{
-		Handler: base.Handler{
-			Logger: params.Logger.Named("devices"),
-		},
-		devicesSvc: params.DevicesSvc,
-	}
-}

internal/sms-gateway/handlers/events/mobile.go

@@ -41,9 +41,9 @@ func NewMobileController(sseService *sse.Service, validator *validator.Validate,
 //	@Failure		500	{object}	smsgateway.ErrorResponse	"Internal server error"
 //	@Router			/mobile/v1/events [get]
 //
-// Get events
+// Get events.
 func (h *MobileController) get(device models.Device, c *fiber.Ctx) error {
-	return h.sseSvc.Handler(device.ID, c)
+	return h.sseSvc.Handler(device.ID, c) //nolint:wrapcheck //wrapped internally
 }
 
 func (h *MobileController) Register(router fiber.Router) {

internal/sms-gateway/handlers/health.go

@@ -39,7 +39,7 @@ func newHealthHandler(
 //	@Failure		503	{object}	smsgateway.HealthResponse	"Service is not alive"
 //	@Router			/health/live [get]
 //
-// Liveness probe
+// Liveness probe.
 func (h *healthHandler) getLiveness(c *fiber.Ctx) error {
 	return writeProbe(c, h.healthSvc.CheckLiveness(c.Context()))
 }
@@ -53,7 +53,7 @@ func (h *healthHandler) getLiveness(c *fiber.Ctx) error {
 //	@Router			/health/ready [get]
 //	@Router			/3rdparty/v1/health [get]
 //
-// Readiness probe
+// Readiness probe.
 func (h *healthHandler) getReadiness(c *fiber.Ctx) error {
 	return writeProbe(c, h.healthSvc.CheckReadiness(c.Context()))
 }
@@ -66,7 +66,7 @@ func (h *healthHandler) getReadiness(c *fiber.Ctx) error {
 //	@Failure		503	{object}	smsgateway.HealthResponse	"Service has not completed initialization"
 //	@Router			/health/startup [get]
 //
-// Startup probe
+// Startup probe.
 func (h *healthHandler) getStartup(c *fiber.Ctx) error {
 	return writeProbe(c, h.healthSvc.CheckStartup(c.Context()))
 }
@@ -86,7 +86,7 @@ func makeResponse(result health.CheckResult) smsgateway.HealthResponse {
 		ReleaseID: version.AppReleaseID(),
 		Checks: lo.MapValues(
 			result.Checks,
-			func(value health.CheckDetail, key string) smsgateway.HealthCheck {
+			func(value health.CheckDetail, _ string) smsgateway.HealthCheck {
 				return smsgateway.HealthCheck{
 					Description:   value.Description,
 					ObservedUnit:  value.ObservedUnit,

internal/sms-gateway/handlers/logs/3rdparty.go

@@ -21,6 +21,15 @@ type ThirdPartyController struct {
 	base.Handler
 }
 
+func NewThirdPartyController(params thirdPartyControllerParams) *ThirdPartyController {
+	return &ThirdPartyController{
+		Handler: base.Handler{
+			Logger:    params.Logger,
+			Validator: params.Validator,
+		},
+	}
+}
+
 //	@Summary		Get logs
 //	@Description	Retrieve a list of log entries within a specified time range.
 //	@Security		ApiAuth
@@ -34,8 +43,8 @@ type ThirdPartyController struct {
 //	@Failure		501		{object}	smsgateway.ErrorResponse	"Not implemented"
 //	@Router			/3rdparty/v1/logs [get]
 //
-// List webhooks
-func (h *ThirdPartyController) get(user models.User, c *fiber.Ctx) error {
+// Get logs.
+func (h *ThirdPartyController) get(_ models.User, _ *fiber.Ctx) error {
 	return fiber.NewError(
 		fiber.StatusNotImplemented,
 		"For privacy reasons, device's logs are not accessible through Cloud server",
@@ -45,12 +54,3 @@ func (h *ThirdPartyController) get(user models.User, c *fiber.Ctx) error {
 func (h *ThirdPartyController) Register(router fiber.Router) {
 	router.Get("", userauth.WithUser(h.get))
 }
-
-func NewThirdPartyController(params thirdPartyControllerParams) *ThirdPartyController {
-	return &ThirdPartyController{
-		Handler: base.Handler{
-			Logger:    params.Logger.Named("logs"),
-			Validator: params.Validator,
-		},
-	}
-}