Skip to content

Commit 5e56b3d

Browse files
committed
[lint] minor fixes
1 parent f0de0ec commit 5e56b3d

File tree

7 files changed

+16
-12
lines changed

7 files changed

+16
-12
lines changed

.github/workflows/pr.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ jobs:
1212
e2e:
1313
name: E2E
1414
runs-on: ubuntu-latest
15+
permissions:
16+
contents: read
1517
steps:
1618
# step 1: checkout repository code
1719
- name: Checkout code into workspace directory
@@ -72,6 +74,7 @@ jobs:
7274
with:
7375
go-version: stable
7476

77+
# RELEASE_ID: Days since project inception (2022-06-15)
7578
- name: Set RELEASE_ID env
7679
run: echo RELEASE_ID=$(( ($(date +%s) - $(date -d "2022-06-15" +%s)) / 86400 )) >> ${GITHUB_ENV}
7780

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (p *thirdPartyGetQueryParams) Validate() error {
3030
}
3131

3232
func (p *thirdPartyGetQueryParams) ToFilter() messages.SelectFilter {
33-
filter := messages.SelectFilter{}
33+
var filter messages.SelectFilter
3434

3535
if p.StartDate != "" {
3636
if t, err := time.Parse(time.RFC3339, p.StartDate); err == nil {
@@ -56,13 +56,14 @@ func (p *thirdPartyGetQueryParams) ToFilter() messages.SelectFilter {
5656
}
5757

5858
func (p *thirdPartyGetQueryParams) ToOptions() messages.SelectOptions {
59-
options := messages.SelectOptions{
60-
WithRecipients: true,
61-
WithStates: true,
62-
}
59+
const maxLimit = 100
60+
61+
var options messages.SelectOptions
62+
options.WithRecipients = true
63+
options.WithStates = true
6364

6465
if p.Limit > 0 {
65-
options.Limit = min(p.Limit, 100)
66+
options.Limit = min(p.Limit, maxLimit)
6667
} else {
6768
options.Limit = 50
6869
}

internal/sms-gateway/handlers/middlewares/userauth/userauth.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ func HasUser(c *fiber.Ctx) bool {
9292

9393
// GetUser returns the user stored in the Locals under the key LocalsUser.
9494
func GetUser(c *fiber.Ctx) *models.User {
95-
if user, ok := c.Locals(localsUser).(models.User); ok {
96-
return &user
95+
if user, ok := c.Locals(localsUser).(*models.User); ok {
96+
return user
9797
}
9898

9999
return nil

internal/sms-gateway/handlers/mobile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ func (h *mobileHandler) changePassword(device models.Device, c *fiber.Ctx) error
207207
req := new(smsgateway.MobileChangePasswordRequest)
208208

209209
if err := h.BodyParserValidator(c, req); err != nil {
210-
return fiber.NewError(fiber.StatusBadGateway, err.Error())
210+
return fiber.NewError(fiber.StatusBadRequest, err.Error())
211211
}
212212

213213
if err := h.authSvc.ChangePassword(device.UserID, req.CurrentPassword, req.NewPassword); err != nil {

internal/sms-gateway/handlers/upstream.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (h *upstreamHandler) postPush(c *fiber.Ctx) error {
6565

6666
for _, v := range req {
6767
if err := h.ValidateStruct(v); err != nil {
68-
return fiber.NewError(fiber.StatusBadGateway, err.Error())
68+
return fiber.NewError(fiber.StatusBadRequest, err.Error())
6969
}
7070

7171
event := push.Event{

internal/sms-gateway/modules/messages/cache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (c *cache) Get(ctx context.Context, userID, id string) (*MessageStateOut, e
6060
}
6161

6262
if len(data) == 0 {
63-
return nil, nil //nolint:nilnil //special meaning
63+
return nil, nil //nolint:nilnil //empty cached value is used for caching "Not Found"
6464
}
6565

6666
message := new(MessageStateOut)

internal/sms-gateway/modules/settings/repository.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (r *repository) UpdateSettings(settings *DeviceSettings) (*DeviceSettings,
3030
var updatedSettings *DeviceSettings
3131
err := r.db.Transaction(func(tx *gorm.DB) error {
3232
source := new(DeviceSettings)
33-
if err := tx.Clauses(clause.Locking{Strength: clause.LockingStrengthUpdate}).Where("user_id", settings.UserID).Limit(1).Find(source).Error; err != nil {
33+
if err := tx.Clauses(clause.Locking{Strength: clause.LockingStrengthUpdate}).Where("user_id = ?", settings.UserID).Limit(1).Find(source).Error; err != nil {
3434
return err
3535
}
3636

0 commit comments

Comments
 (0)