fix(app) backported some things agent broke in lab2 and bugfixed other autocheck issues manually

This commit is contained in:
imadev
2026-10-24 00:39:07 +03:00
parent c1b25c507d
commit d14fed291e
6 changed files with 26 additions and 24 deletions
+1 -1
View File
@@ -13,5 +13,5 @@ func (t RFCFormTime) MarshalJSON() ([]byte, error) {
}
func NowUTC() RFCFormTime {
return RFCFormTime(time.Now().UTC().Truncate(time.Second))
return RFCFormTime(time.Now().UTC())
}
+4 -3
View File
@@ -74,10 +74,11 @@ func ValidateCreateUser(username, displayName string) string {
return ""
}
// ValidatePassword enforces the contract range in Unicode code points. The
// upper bound matters: bcrypt would silently truncate, which is why this
// project uses Argon2id instead.
func ValidatePassword(password string) string {
if blank(password) {
return "password must not be empty or only whitespace"
}
if !strLenBetween(password, 12, 128) {
return "password must be between 12 and 128 Unicode code points"
}
+17 -17
View File
@@ -8,40 +8,40 @@ import (
)
type User struct {
ID uuid.UUID `json:"id"`
Username string `json:"username"`
DisplayName string `json:"display_name"`
ID uuid.UUID `json:"id" validate:"required"`
Username string `json:"username" validate:"required"`
DisplayName string `json:"display_name" validate:"required"`
PasswordHash string `json:"-"`
CreatedAt common.RFCFormTime `json:"created_at"`
CreatedAt common.RFCFormTime `json:"created_at" validate:"required"`
}
func (u User) GetID() uuid.UUID { return u.ID }
func (u User) GetCreatedAt() time.Time { return time.Time(u.CreatedAt) }
type Chat struct {
ID uuid.UUID `json:"id"`
Title string `json:"title"`
MemberIDs []uuid.UUID `json:"member_ids"`
CreatedAt common.RFCFormTime `json:"created_at"`
ID uuid.UUID `json:"id" validate:"required"`
Title string `json:"title" validate:"required"`
MemberIDs []uuid.UUID `json:"member_ids" validate:"required"`
CreatedAt common.RFCFormTime `json:"created_at" validate:"required"`
}
func (c Chat) GetID() uuid.UUID { return c.ID }
func (c Chat) GetCreatedAt() time.Time { return time.Time(c.CreatedAt) }
type Message struct {
ID uuid.UUID `json:"id"`
ChatID uuid.UUID `json:"chat_id"`
SenderID uuid.UUID `json:"sender_id"`
Text string `json:"text"`
CreatedAt common.RFCFormTime `json:"created_at"`
ID uuid.UUID `json:"id" validate:"required"`
ChatID uuid.UUID `json:"chat_id" validate:"required"`
SenderID uuid.UUID `json:"sender_id" validate:"required"`
Text string `json:"text" validate:"required"`
CreatedAt common.RFCFormTime `json:"created_at" validate:"required"`
}
func (m Message) GetID() uuid.UUID { return m.ID }
func (m Message) GetCreatedAt() time.Time { return time.Time(m.CreatedAt) }
type Session struct {
Token string `json:"token"`
TokenType string `json:"token_type"`
ExpiresAt common.RFCFormTime `json:"expires_at"`
User User `json:"user"`
Token string `json:"token" validate:"required"`
TokenType string `json:"token_type" validate:"required"`
ExpiresAt common.RFCFormTime `json:"expires_at" validate:"required"`
User User `json:"user" validate:"required"`
}
+1 -1
View File
@@ -64,7 +64,7 @@ func (s *Store) Create(ctx context.Context, userID uuid.UUID) (string, time.Time
return "", time.Time{}, fmt.Errorf("generate token: %w", err)
}
token := base64.RawURLEncoding.EncodeToString(raw)
expiresAt := time.Now().UTC().Truncate(time.Second).Add(s.ttl)
expiresAt := time.Now().UTC().Add(s.ttl)
opCtx, cancel := context.WithTimeout(ctx, s.timeout)
defer cancel()
+3 -1
View File
@@ -6,6 +6,7 @@ package store
import (
"context"
"errors"
"net"
"time"
"gitflic.ru/project/bulla-max/mtusi2026lab2/internal/common"
@@ -346,7 +347,8 @@ func dbError(err error) error {
}
}
if errors.Is(err, context.DeadlineExceeded) ||
var netErr net.Error
if errors.As(err, &netErr) || errors.Is(err, context.DeadlineExceeded) ||
errors.Is(err, context.Canceled) ||
pgconn.SafeToRetry(err) ||
errors.Is(err, pgx.ErrTxClosed) {