First merge from develop to main (WIP) #7

Merged
sugar merged 199 commits from develop into main 2026-01-27 17:47:07 +00:00
2 changed files with 2 additions and 1 deletions
Showing only changes of commit e0e1abab93 - Show all commits

View File

@@ -20,7 +20,7 @@ type Attendance struct {
AttendanceId uuid.UUID `json:"attendance_id" gorm:"type:uuid;uniqueIndex;not null"` AttendanceId uuid.UUID `json:"attendance_id" gorm:"type:uuid;uniqueIndex;not null"`
EventId uuid.UUID `json:"event_id" gorm:"type:uuid;uniqueIndex:unique_event_user;not null"` EventId uuid.UUID `json:"event_id" gorm:"type:uuid;uniqueIndex:unique_event_user;not null"`
UserId uuid.UUID `json:"user_id" gorm:"type:uuid;uniqueIndex:unique_event_user;not null"` UserId uuid.UUID `json:"user_id" gorm:"type:uuid;uniqueIndex:unique_event_user;not null"`
Role string `json:"role" gorm:"not null"` Role string `json:"role" gorm:"type:varchar(255);not null"`
CheckinAt time.Time `json:"checkin_at"` CheckinAt time.Time `json:"checkin_at"`
} }

View File

@@ -21,6 +21,7 @@ type User struct {
Nickname string `json:"nickname"` Nickname string `json:"nickname"`
Subtitle string `json:"subtitle"` Subtitle string `json:"subtitle"`
Avatar string `json:"avatar"` Avatar string `json:"avatar"`
Bio string `json:"bio" gorm:"type:text"`
PermissionLevel uint `json:"permission_level" gorm:"default:10;not null"` PermissionLevel uint `json:"permission_level" gorm:"default:10;not null"`
} }