Compare commits

..

No commits in common. "642566c8b2ce4573de30b87a078beb838f0b0e8a" and "20c9660c3a67e6b5b6237accb03aafe226b10a27" have entirely different histories.

6 changed files with 27 additions and 37 deletions

View File

@ -5,11 +5,10 @@ import (
) )
type Staff struct { type Staff struct {
ID string `gorm:"primaryKey" json:"id"` ID string `gorm:"primaryKey" json:"id"`
Name string `gorm:"default:null;unique" json:"name"` Username string `gorm:"default:null;unique" json:"username"`
ProfilePicture string `gorm:"default:null" json:"profile_picture"` Email string `gorm:"unique;not null" json:"email"`
Email string `gorm:"unique;not null" json:"email"` Password string `gorm:"not null" json:"password"`
Password string `gorm:"not null" json:"password"` CreatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
CreatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"` UpdatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
UpdatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
} }

View File

@ -17,10 +17,9 @@ type LoginRepoResponse struct {
} }
type StaffProfile struct { type StaffProfile struct {
ID string `json:"id"` ID string `json:"id"`
Email string `json:"email"` Email string `json:"email"`
Name string `json:"name"` Username string `json:"username"`
ProfilePicture string `json:"profile_picture"`
} }
type UserProfile struct { type UserProfile struct {

View File

@ -16,22 +16,20 @@ type User struct {
} }
type RegisterStaffReq struct { type RegisterStaffReq struct {
Email string `json:"email" validate:"required"` Email string `json:"email" validate:"required"`
Password string `json:"password" validate:"required"` Password string `json:"password" validate:"required"`
Name string `json:"name" validate:"required"` Username string `json:"username" validate:"required"`
ProfilePicture string `json:"profile_picture"`
} }
type UpdateStaffReq struct { type UpdateStaffReq struct {
Email string `json:"email"` Email string `json:"email"`
Password string `json:"password"` Password string `json:"password"`
Name string `json:"name"` Username string `json:"username"`
} }
type Staff struct { type Staff struct {
ID string `json:"id"` ID string `json:"id"`
Email string `json:"email"` Email string `json:"email"`
Password string `json:"password"` Password string `json:"password"`
Name string `json:"name"` Username string `json:"username"`
ProfilePicture string `json:"profile_picture"`
} }

View File

@ -9,10 +9,9 @@ func (as *AuthSvc) GetStaffProfile(email string) (*authdomain.StaffProfile, erro
} }
profile := &authdomain.StaffProfile{ profile := &authdomain.StaffProfile{
ID: staff.ID, ID: staff.ID,
Name: staff.Name, Username: staff.Username,
Email: staff.Email, Email: staff.Email,
ProfilePicture: staff.ProfilePicture,
} }
return profile, nil return profile, nil

View File

@ -20,11 +20,10 @@ func (a *AuthSvc) RegisterStaff(spec authdomain.RegisterStaffReq) (string, error
} }
staff := authdomain.Staff{ staff := authdomain.Staff{
ID: uuid.NewString(), ID: uuid.NewString(),
Email: spec.Email, Email: spec.Email,
Password: hashedPwd, Password: hashedPwd,
Name: spec.Name, Username: spec.Username,
ProfilePicture: spec.ProfilePicture,
} }
_, err = a.staffRepo.Create(&staff) _, err = a.staffRepo.Create(&staff)

View File

@ -25,9 +25,7 @@ paths:
type: string type: string
email: email:
type: string type: string
name: username:
type: string
profile_picture:
type: string type: string
"400": "400":
description: Bad request description: Bad request
@ -110,14 +108,12 @@ paths:
format: email format: email
password: password:
type: string type: string
name: username:
type: string
profile_picture:
type: string type: string
required: required:
- email - email
- password - password
- name - username
responses: responses:
"201": "201":
description: Staff member created description: Staff member created