cleanup models (#44)

server/db/init.go

@@ -42,7 +42,6 @@ func Init(ctx context.Context, tracer *trace.TracerProvider) (*bun.DB, *sql.DB,
 		(*models.User)(nil),
 		(*models.Building)(nil),
 		(*models.Room)(nil),
-		(*models.Answer)(nil),
 		(*models.Setting)(nil)}
 
 	for _, relation := range relations {

server/models/building.go

@@ -7,13 +7,13 @@ import (
 type Building struct {
 	bun.BaseModel `bun:"table:buildings,alias:b"`
 
-	ID     int32  `bun:"id,pk,autoincrement"`
-	Name   string `bun:"name,notnull"`
-	Street string `bun:"street,notnull"`
-	Number string `bun:"number,notnull"`
-	City   string `bun:"city,notnull"`
-	Zip    int32  `bun:"zip,notnull"`
-	Osm    string `bun:"osm,notnull"`
+	ID     int32  `bun:",pk,autoincrement"`
+	Name   string `bun:",notnull,type:varchar(255)"`
+	Street string `bun:",notnull,type:varchar(255)"`
+	Number string `bun:",notnull,type:varchar(255)"`
+	City   string `bun:",notnull,type:varchar(255)"`
+	Zip    int32  `bun:",notnull"`
+	Osm    string `bun:",notnull,type:varchar(255)"`
 
 	Rooms []*Room `bun:"rel:has-many,join:id=building_id"`
 }

server/models/event.go

@@ -11,10 +11,10 @@ type Event struct {
 	bun.BaseModel `bun:"table:events,alias:e"`
 
 	ID          int32  `bun:",pk,autoincrement"`
-	Title       string `bun:",notnull"`
+	Title       string `bun:",notnull,type:varchar(255)"`
 	Description string
-	TopicName   string    `bun:",notnull"`
-	TypeName    string    `bun:",notnull"`
+	TopicName   string    `bun:",notnull,type:varchar(50)"`
+	TypeName    string    `bun:",notnull,type:varchar(50)"`
 	From        time.Time `bun:",notnull"`
 	To          time.Time `bun:",notnull"`
 	NeedsTutors bool      `bun:",notnull"`
@@ -39,7 +39,7 @@ type EventToTutor struct {
 	Event      *Event `bun:"rel:belongs-to,join:event_id=id"`
 	TutorMail  string `bun:",pk"`
 	Tutor      *Tutor `bun:"rel:belongs-to,join:tutor_mail=mail"`
-	RoomNumber string `bun:",pk"`
+	RoomNumber string `bun:",pk,type:varchar(50)"`
 	BuildingID int32  `bun:",pk"`
 	Room       *Room  `bun:"rel:belongs-to,join:room_number=number,join:building_id=building_id"`
 }

server/models/label.go

@@ -7,7 +7,7 @@ import (
 type Label struct {
 	bun.BaseModel `bun:"table:labels,alias:l"`
 
-	Name  string `bun:",pk"`
-	Color string
-	Kind  string `bun:",notnull"`
+	Name  string `bun:",pk,type:varchar(50)"`
+	Color string `bun:",type:varchar(7)"`
+	Kind  string `bun:",notnull,type:varchar(20)"`
 }

server/models/room.go

@@ -9,8 +9,8 @@ import (
 type Room struct {
 	bun.BaseModel `bun:"table:rooms,alias:r"`
 
-	Number     string `bun:",pk,notnull"`
-	Name       string
+	Number     string `bun:",pk,notnull,type:varchar(50)"`
+	Name       string `bun:",type:varchar(255)"`
 	Capacity   int16
 	Floor      int8
 	BuildingID int32 `bun:",pk"`
@@ -26,10 +26,10 @@ func (*Room) BeforeCreateTable(ctx context.Context, query *bun.CreateTableQuery)
 }
 
 type RoomToEvent struct {
-	RoomNumber string `bun:",pk"`
+	RoomNumber string `bun:",pk,type:varchar(50)"`
 	BuildingID int32  `bun:",pk"`
 	Room       *Room  `bun:"rel:belongs-to,join:room_number=number,join:building_id=building_id"`
-	EventID    int32  `bun:"event_id,pk"`
+	EventID    int32  `bun:",pk"`
 	Event      *Event `bun:"rel:belongs-to,join:event_id=id"`
 }
 

server/models/setting.go

@@ -7,5 +7,5 @@ type Setting struct {
 
 	Key   string `bun:",pk,type:varchar(255)"`
 	Value string `bun:",notnull"`
-	Type  string `bun:"notnull,type:varchar(50)"`
+	Type  string `bun:",notnull,type:varchar(50)"`
 }

server/models/student.go

@@ -12,18 +12,17 @@ type Student struct {
 	Score    int8
 	Accepted bool
 
-	EventsRegistered []Event  `bun:"m2m:student_to_events,join:Student=Event"`
-	Answers          []Answer `bun:"rel:has-many,join:mail=student_mail"`
+	EventsRegistered []Event `bun:"m2m:student_to_events,join:Student=Event"`
 }
 
 func (Student) IsUser() {}
 
 type StudentToEvent struct {
-	StudentMail string   `bun:",pk"`
+	StudentMail string   `bun:",pk,type:varchar(255)"`
 	Student     *Student `bun:"rel:belongs-to,join:student_mail=mail"`
 	EventID     int32    `bun:",pk"`
 	Event       *Event   `bun:"rel:belongs-to,join:event_id=id"`
-	RoomNumber  string   `bun:",pk"`
+	RoomNumber  string   `bun:",pk,type:varchar(50)"`
 	BuildingID  int32    `bun:",pk"`
 	Room        *Room    `bun:"rel:belongs-to,join:room_number=number,join:building_id=building_id"`
 }

server/models/tutor.go

@@ -16,7 +16,7 @@ type Tutor struct {
 func (Tutor) IsUser() {}
 
 type TutorToEvent struct {
-	TutorMail string `bun:",pk"`
+	TutorMail string `bun:",pk,type:varchar(255)"`
 	Tutor     *Tutor `bun:"rel:belongs-to,join:tutor_mail=mail"`
 	EventID   int32  `bun:",pk"`
 	Event     *Event `bun:"rel:belongs-to,join:event_id=id"`

server/models/user.go

@@ -9,12 +9,12 @@ import (
 type User struct {
 	bun.BaseModel `bun:"table:users,alias:u"`
 
-	Mail         string    `bun:"mail,pk,notnull"`
-	Fn           string    `bun:"fn,notnull"`
-	Sn           string    `bun:"sn"`
-	Confirmed    bool      `bun:"confirmed,notnull"`
-	SessionID    int32     `bun:"session_id"`
-	LastLogin    time.Time `bun:"last_login,default:current_timestamp"`
-	PasswordHash string    `bun:"password_hash"`
-	CreatedAt    time.Time `bun:"created_at,default:current_timestamp"`
+	Mail         string `bun:",pk,notnull,type:varchar(255)"`
+	Fn           string `bun:",notnull,type:varchar(255)"`
+	Sn           string `bun:"type:varchar(255)"`
+	Confirmed    bool   `bun:"confirmed,notnull"`
+	SessionID    int32
+	LastLogin    time.Time `bun:",default:current_timestamp"`
+	PasswordHash string    `bun:"type:varchar(64)"`
+	CreatedAt    time.Time `bun:",default:current_timestamp"`
 }