fix: rename util
All checks were successful
Check / check (push) Successful in 1m22s
Check / update (push) Has been skipped
Check / push (push) Successful in 13s

This commit is contained in:
2025-06-16 12:50:23 -04:00
parent 534a6e2bf9
commit 99379efa15
4 changed files with 13 additions and 13 deletions

View File

@ -12,8 +12,8 @@ import (
itemv1 "github.com/spotdemo4/trevstack/server/internal/connect/item/v1" itemv1 "github.com/spotdemo4/trevstack/server/internal/connect/item/v1"
"github.com/spotdemo4/trevstack/server/internal/connect/item/v1/itemv1connect" "github.com/spotdemo4/trevstack/server/internal/connect/item/v1/itemv1connect"
"github.com/spotdemo4/trevstack/server/internal/interceptors" "github.com/spotdemo4/trevstack/server/internal/interceptors"
"github.com/spotdemo4/trevstack/server/internal/putil"
"github.com/spotdemo4/trevstack/server/internal/sqlc" "github.com/spotdemo4/trevstack/server/internal/sqlc"
"github.com/spotdemo4/trevstack/server/internal/util"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"
) )
@ -80,9 +80,9 @@ func (h *Handler) GetItems(ctx context.Context, req *connect.Request[itemv1.GetI
// Get items // Get items
items, err := h.db.GetItems(ctx, sqlc.GetItemsParams{ items, err := h.db.GetItems(ctx, sqlc.GetItemsParams{
UserID: userid, UserID: userid,
Name: util.NullLike(req.Msg.Filter), Name: putil.NullLike(req.Msg.Filter),
Start: util.NullTimestamp(req.Msg.Start), Start: putil.NullTimestamp(req.Msg.Start),
End: util.NullTimestamp(req.Msg.End), End: putil.NullTimestamp(req.Msg.End),
Offset: int64(offset), Offset: int64(offset),
Limit: int64(limit), Limit: int64(limit),
}) })
@ -97,9 +97,9 @@ func (h *Handler) GetItems(ctx context.Context, req *connect.Request[itemv1.GetI
// Get items count // Get items count
count, err := h.db.GetItemsCount(ctx, sqlc.GetItemsCountParams{ count, err := h.db.GetItemsCount(ctx, sqlc.GetItemsCountParams{
UserID: userid, UserID: userid,
Name: util.NullLike(req.Msg.Filter), Name: putil.NullLike(req.Msg.Filter),
Start: util.NullTimestamp(req.Msg.Start), Start: putil.NullTimestamp(req.Msg.Start),
End: util.NullTimestamp(req.Msg.End), End: putil.NullTimestamp(req.Msg.End),
}) })
if err != nil { if err != nil {
return nil, connect.NewError(connect.CodeInternal, err) return nil, connect.NewError(connect.CodeInternal, err)
@ -157,8 +157,8 @@ func (h *Handler) UpdateItem(ctx context.Context, req *connect.Request[itemv1.Up
// set // set
Name: req.Msg.Name, Name: req.Msg.Name,
Description: req.Msg.Description, Description: req.Msg.Description,
Price: util.NullFloat64(req.Msg.Price), Price: putil.NullFloat64(req.Msg.Price),
Quantity: util.NullInt64(req.Msg.Quantity), Quantity: putil.NullInt64(req.Msg.Quantity),
// where // where
ID: req.Msg.Id, ID: req.Msg.Id,

View File

@ -19,8 +19,8 @@ import (
userv1 "github.com/spotdemo4/trevstack/server/internal/connect/user/v1" userv1 "github.com/spotdemo4/trevstack/server/internal/connect/user/v1"
"github.com/spotdemo4/trevstack/server/internal/connect/user/v1/userv1connect" "github.com/spotdemo4/trevstack/server/internal/connect/user/v1/userv1connect"
"github.com/spotdemo4/trevstack/server/internal/interceptors" "github.com/spotdemo4/trevstack/server/internal/interceptors"
"github.com/spotdemo4/trevstack/server/internal/putil"
"github.com/spotdemo4/trevstack/server/internal/sqlc" "github.com/spotdemo4/trevstack/server/internal/sqlc"
"github.com/spotdemo4/trevstack/server/internal/util"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
) )
@ -96,7 +96,7 @@ func (h *Handler) UpdatePassword(ctx context.Context, req *connect.Request[userv
// Update password // Update password
err = h.db.UpdateUser(ctx, sqlc.UpdateUserParams{ err = h.db.UpdateUser(ctx, sqlc.UpdateUserParams{
Password: util.ToPointer(string(hash)), Password: putil.ToPointer(string(hash)),
ID: userid, ID: userid,
}) })
if err != nil { if err != nil {

View File

@ -1,4 +1,4 @@
package util package putil
func DerefOrEmpty[T any](val *T) T { func DerefOrEmpty[T any](val *T) T {
if val == nil { if val == nil {

View File

@ -1,4 +1,4 @@
package util package putil
import ( import (
"fmt" "fmt"