UPDATE: Auth module, User module

internal/models/role.go

@@ -2,7 +2,7 @@ package models
 
 import (
 	"history-api/internal/dtos/response"
-	"history-api/pkg/constant"
+	"history-api/pkg/constants"
 	"time"
 )
 
@@ -44,6 +44,13 @@ func (r *RoleEntity) ToResponse() *response.RoleResponse {
 	}
 }
 
+func (r *RoleEntity) ToRoleSimple() *RoleSimple {
+	return &RoleSimple{
+		ID:   r.ID,
+		Name: r.Name,
+	}
+}
+
 func RolesEntityToResponse(rs []*RoleEntity) []*response.RoleResponse {
 	out := make([]*response.RoleResponse, len(rs))
 	for i := range rs {
@@ -52,10 +59,10 @@ func RolesEntityToResponse(rs []*RoleEntity) []*response.RoleResponse {
 	return out
 }
 
-func RolesEntityToRoleConstant(rs []*RoleSimple) []constant.Role {
-	out := make([]constant.Role, len(rs))
+func RolesEntityToRoleConstant(rs []*RoleSimple) []constants.Role {
+	out := make([]constants.Role, len(rs))
 	for i := range rs {
-		data, ok := constant.ParseRole(rs[i].Name)
+		data, ok := constants.ParseRole(rs[i].Name)
 		if !ok {
 			continue
 		}

internal/models/token.go

@@ -1,35 +1,9 @@
 package models
 
-import (
-	"history-api/internal/dtos/response"
-	"history-api/pkg/convert"
-
-	"github.com/jackc/pgx/v5/pgtype"
-)
+import "history-api/pkg/constants"
 
 type TokenEntity struct {
-	ID        pgtype.UUID        `json:"id"`
-	UserID    pgtype.UUID        `json:"user_id"`
-	Token     string             `json:"token"`
-	TokenType int16              `json:"token_type"`
-	ExpiresAt pgtype.Timestamptz `json:"expires_at"`
-	CreatedAt pgtype.Timestamptz `json:"created_at"`
-}
-
-func (t *TokenEntity) ToResponse() *response.TokenResponse {
-	return &response.TokenResponse{
-		ID:        convert.UUIDToString(t.ID),
-		UserID:    convert.UUIDToString(t.UserID),
-		TokenType: t.TokenType,
-		ExpiresAt: convert.TimeToPtr(t.ExpiresAt),
-		CreatedAt: convert.TimeToPtr(t.CreatedAt),
-	}
-}
-
-func TokensEntityToResponse(ts []*TokenEntity) []*response.TokenResponse {
-	out := make([]*response.TokenResponse, len(ts))
-	for i := range ts {
-		out[i] = ts[i].ToResponse()
-	}
-	return out
+	Email     string              `json:"email"`
+	Token     string              `json:"token"`
+	TokenType constants.TokenType `json:"token_type"`
 }