fix: remove duplicate fields in User model
This commit is contained in:
Rede5
parent
948858eca0
commit
ff17eb2e4c
1 changed files with 105 additions and 109 deletions
|
|
@ -1,109 +1,105 @@
|
|||
package models
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"time"
|
||||
)
|
||||
|
||||
// User represents a system user (SuperAdmin, CompanyAdmin, Recruiter, or JobSeeker)
|
||||
type User struct {
|
||||
ID string `json:"id" db:"id"`
|
||||
Identifier string `json:"identifier" db:"identifier"`
|
||||
PasswordHash string `json:"-" db:"password_hash"` // Never expose password hash in JSON
|
||||
Role string `json:"role" db:"role"` // superadmin, admin, recruiter, candidate
|
||||
|
||||
// Personal Info
|
||||
FullName string `json:"fullName" db:"full_name"`
|
||||
Phone *string `json:"phone,omitempty" db:"phone"`
|
||||
LineID *string `json:"lineId,omitempty" db:"line_id"`
|
||||
WhatsApp *string `json:"whatsapp,omitempty" db:"whatsapp"`
|
||||
Instagram *string `json:"instagram,omitempty" db:"instagram"`
|
||||
|
||||
// Candidate Profile Info
|
||||
BirthDate *time.Time `json:"birthDate,omitempty" db:"birth_date"`
|
||||
Address *string `json:"address,omitempty" db:"address"`
|
||||
City *string `json:"city,omitempty" db:"city"`
|
||||
State *string `json:"state,omitempty" db:"state"`
|
||||
ZipCode *string `json:"zipCode,omitempty" db:"zip_code"`
|
||||
Education *string `json:"education,omitempty" db:"education"`
|
||||
Experience *string `json:"experience,omitempty" db:"experience"`
|
||||
Skills []string `json:"skills,omitempty" db:"skills"`
|
||||
Objective *string `json:"objective,omitempty" db:"objective"`
|
||||
Title *string `json:"title,omitempty" db:"title"`
|
||||
Bio *string `json:"bio,omitempty" db:"bio"`
|
||||
AvatarURL *string `json:"avatarUrl,omitempty" db:"avatar_url"`
|
||||
|
||||
// Settings
|
||||
Language string `json:"language" db:"language"` // pt, en, es, ja
|
||||
Active bool `json:"active" db:"active"`
|
||||
|
||||
// Metadata
|
||||
CreatedAt time.Time `json:"createdAt" db:"created_at"`
|
||||
UpdatedAt time.Time `json:"updatedAt" db:"updated_at"`
|
||||
LastLoginAt *time.Time `json:"lastLoginAt,omitempty" db:"last_login_at"`
|
||||
|
||||
// Profile Profile
|
||||
Bio *string `json:"bio,omitempty" db:"bio"`
|
||||
ProfilePictureURL *string `json:"profilePictureUrl,omitempty" db:"profile_picture_url"`
|
||||
Skills []byte `json:"skills,omitempty" db:"skills"` // JSONB
|
||||
Experience []byte `json:"experience,omitempty" db:"experience"` // JSONB
|
||||
Education []byte `json:"education,omitempty" db:"education"` // JSONB
|
||||
}
|
||||
|
||||
// UserResponse is the public representation of a user (without sensitive data)
|
||||
type UserResponse struct {
|
||||
ID string `json:"id"`
|
||||
Identifier string `json:"identifier"`
|
||||
Role string `json:"role"`
|
||||
FullName string `json:"fullName"`
|
||||
Phone *string `json:"phone,omitempty"`
|
||||
LineID *string `json:"lineId,omitempty"`
|
||||
WhatsApp *string `json:"whatsapp,omitempty"`
|
||||
Instagram *string `json:"instagram,omitempty"`
|
||||
Language string `json:"language"`
|
||||
Active bool `json:"active"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
LastLoginAt *time.Time `json:"lastLoginAt,omitempty"`
|
||||
Bio *string `json:"bio,omitempty"`
|
||||
ProfilePictureURL *string `json:"profilePictureUrl,omitempty"`
|
||||
Skills []string `json:"skills,omitempty"`
|
||||
Experience []any `json:"experience,omitempty"`
|
||||
Education []any `json:"education,omitempty"`
|
||||
}
|
||||
|
||||
// ToResponse converts User to UserResponse
|
||||
func (u *User) ToResponse() UserResponse {
|
||||
// Helper to unmarshal JSONB
|
||||
var skills []string
|
||||
if len(u.Skills) > 0 {
|
||||
_ = json.Unmarshal(u.Skills, &skills)
|
||||
}
|
||||
var experience []any
|
||||
if len(u.Experience) > 0 {
|
||||
_ = json.Unmarshal(u.Experience, &experience)
|
||||
}
|
||||
var education []any
|
||||
if len(u.Education) > 0 {
|
||||
_ = json.Unmarshal(u.Education, &education)
|
||||
}
|
||||
|
||||
return UserResponse{
|
||||
ID: u.ID,
|
||||
Identifier: u.Identifier,
|
||||
Role: u.Role,
|
||||
FullName: u.FullName,
|
||||
Phone: u.Phone,
|
||||
LineID: u.LineID,
|
||||
WhatsApp: u.WhatsApp,
|
||||
Instagram: u.Instagram,
|
||||
Language: u.Language,
|
||||
Active: u.Active,
|
||||
CreatedAt: u.CreatedAt,
|
||||
LastLoginAt: u.LastLoginAt,
|
||||
Bio: u.Bio,
|
||||
ProfilePictureURL: u.ProfilePictureURL,
|
||||
Skills: skills,
|
||||
Experience: experience,
|
||||
Education: education,
|
||||
}
|
||||
}
|
||||
package models
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"time"
|
||||
)
|
||||
|
||||
// User represents a system user (SuperAdmin, CompanyAdmin, Recruiter, or JobSeeker)
|
||||
type User struct {
|
||||
ID string `json:"id" db:"id"`
|
||||
Identifier string `json:"identifier" db:"identifier"`
|
||||
PasswordHash string `json:"-" db:"password_hash"` // Never expose password hash in JSON
|
||||
Role string `json:"role" db:"role"` // superadmin, admin, recruiter, candidate
|
||||
|
||||
// Personal Info
|
||||
FullName string `json:"fullName" db:"full_name"`
|
||||
Phone *string `json:"phone,omitempty" db:"phone"`
|
||||
LineID *string `json:"lineId,omitempty" db:"line_id"`
|
||||
WhatsApp *string `json:"whatsapp,omitempty" db:"whatsapp"`
|
||||
Instagram *string `json:"instagram,omitempty" db:"instagram"`
|
||||
|
||||
// Candidate Profile Info
|
||||
BirthDate *time.Time `json:"birthDate,omitempty" db:"birth_date"`
|
||||
Address *string `json:"address,omitempty" db:"address"`
|
||||
City *string `json:"city,omitempty" db:"city"`
|
||||
State *string `json:"state,omitempty" db:"state"`
|
||||
ZipCode *string `json:"zipCode,omitempty" db:"zip_code"`
|
||||
Objective *string `json:"objective,omitempty" db:"objective"`
|
||||
Title *string `json:"title,omitempty" db:"title"`
|
||||
AvatarURL *string `json:"avatarUrl,omitempty" db:"avatar_url"`
|
||||
|
||||
// Profile (JSONB fields)
|
||||
Bio *string `json:"bio,omitempty" db:"bio"`
|
||||
ProfilePictureURL *string `json:"profilePictureUrl,omitempty" db:"profile_picture_url"`
|
||||
Skills []byte `json:"skills,omitempty" db:"skills"` // JSONB
|
||||
Experience []byte `json:"experience,omitempty" db:"experience"` // JSONB
|
||||
Education []byte `json:"education,omitempty" db:"education"` // JSONB
|
||||
|
||||
// Settings
|
||||
Language string `json:"language" db:"language"` // pt, en, es, ja
|
||||
Active bool `json:"active" db:"active"`
|
||||
|
||||
// Metadata
|
||||
CreatedAt time.Time `json:"createdAt" db:"created_at"`
|
||||
UpdatedAt time.Time `json:"updatedAt" db:"updated_at"`
|
||||
LastLoginAt *time.Time `json:"lastLoginAt,omitempty" db:"last_login_at"`
|
||||
}
|
||||
|
||||
// UserResponse is the public representation of a user (without sensitive data)
|
||||
type UserResponse struct {
|
||||
ID string `json:"id"`
|
||||
Identifier string `json:"identifier"`
|
||||
Role string `json:"role"`
|
||||
FullName string `json:"fullName"`
|
||||
Phone *string `json:"phone,omitempty"`
|
||||
LineID *string `json:"lineId,omitempty"`
|
||||
WhatsApp *string `json:"whatsapp,omitempty"`
|
||||
Instagram *string `json:"instagram,omitempty"`
|
||||
Language string `json:"language"`
|
||||
Active bool `json:"active"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
LastLoginAt *time.Time `json:"lastLoginAt,omitempty"`
|
||||
Bio *string `json:"bio,omitempty"`
|
||||
ProfilePictureURL *string `json:"profilePictureUrl,omitempty"`
|
||||
Skills []string `json:"skills,omitempty"`
|
||||
Experience []any `json:"experience,omitempty"`
|
||||
Education []any `json:"education,omitempty"`
|
||||
}
|
||||
|
||||
// ToResponse converts User to UserResponse
|
||||
func (u *User) ToResponse() UserResponse {
|
||||
// Helper to unmarshal JSONB
|
||||
var skills []string
|
||||
if len(u.Skills) > 0 {
|
||||
_ = json.Unmarshal(u.Skills, &skills)
|
||||
}
|
||||
var experience []any
|
||||
if len(u.Experience) > 0 {
|
||||
_ = json.Unmarshal(u.Experience, &experience)
|
||||
}
|
||||
var education []any
|
||||
if len(u.Education) > 0 {
|
||||
_ = json.Unmarshal(u.Education, &education)
|
||||
}
|
||||
|
||||
return UserResponse{
|
||||
ID: u.ID,
|
||||
Identifier: u.Identifier,
|
||||
Role: u.Role,
|
||||
FullName: u.FullName,
|
||||
Phone: u.Phone,
|
||||
LineID: u.LineID,
|
||||
WhatsApp: u.WhatsApp,
|
||||
Instagram: u.Instagram,
|
||||
Language: u.Language,
|
||||
Active: u.Active,
|
||||
CreatedAt: u.CreatedAt,
|
||||
LastLoginAt: u.LastLoginAt,
|
||||
Bio: u.Bio,
|
||||
ProfilePictureURL: u.ProfilePictureURL,
|
||||
Skills: skills,
|
||||
Experience: experience,
|
||||
Education: education,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue