feat: Refactor DTOs to use types.ULID and update companyId fields to be optional
This commit is contained in:
@@ -17,6 +17,7 @@ import (
|
||||
"github.com/timetracker/backend/internal/api/utils"
|
||||
"github.com/timetracker/backend/internal/config"
|
||||
"github.com/timetracker/backend/internal/models"
|
||||
"github.com/timetracker/backend/internal/types"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -318,41 +319,41 @@ func validateToken(tokenString string) (*Claims, error) {
|
||||
}
|
||||
|
||||
// GetUserIDFromContext extracts the user ID from the context
|
||||
func GetUserIDFromContext(c *gin.Context) (ulid.ULID, error) {
|
||||
func GetUserIDFromContext(c *gin.Context) (types.ULID, error) {
|
||||
userID, exists := c.Get("userID")
|
||||
if !exists {
|
||||
return ulid.ULID{}, errors.New("user ID not found in context")
|
||||
return types.ULID{}, errors.New("user ID not found in context")
|
||||
}
|
||||
|
||||
userIDStr, ok := userID.(string)
|
||||
if !ok {
|
||||
return ulid.ULID{}, errors.New("invalid user ID type in context")
|
||||
return types.ULID{}, errors.New("invalid user ID type in context")
|
||||
}
|
||||
|
||||
id, err := ulid.Parse(userIDStr)
|
||||
if err != nil {
|
||||
return ulid.ULID{}, err
|
||||
return types.ULID{}, err
|
||||
}
|
||||
|
||||
return id, nil
|
||||
return types.FromULID(id), nil
|
||||
}
|
||||
|
||||
// GetCompanyIDFromContext extracts the company ID from the context
|
||||
func GetCompanyIDFromContext(c *gin.Context) (ulid.ULID, error) {
|
||||
func GetCompanyIDFromContext(c *gin.Context) (types.ULID, error) {
|
||||
companyID, exists := c.Get("companyID")
|
||||
if !exists {
|
||||
return ulid.ULID{}, errors.New("company ID not found in context")
|
||||
return types.ULID{}, errors.New("company ID not found in context")
|
||||
}
|
||||
|
||||
companyIDStr, ok := companyID.(string)
|
||||
if !ok {
|
||||
return ulid.ULID{}, errors.New("invalid company ID type in context")
|
||||
return types.ULID{}, errors.New("invalid company ID type in context")
|
||||
}
|
||||
|
||||
id, err := ulid.Parse(companyIDStr)
|
||||
if err != nil {
|
||||
return ulid.ULID{}, err
|
||||
return types.ULID{}, err
|
||||
}
|
||||
|
||||
return id, nil
|
||||
return types.FromULID(id), nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user