Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

issue/106 default null #108

Merged
merged 1 commit into from
Nov 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion models/department.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "github.com/google/uuid"

type DepartmentBase struct {
ID uuid.UUID `json:"id"`
Name string `json:"name" example:"pediatric surgery"`
Name string `json:"name" gorm:"default:NULL" example:"pediatric surgery"`
}

type Department struct {
Expand Down
4 changes: 2 additions & 2 deletions models/emergency.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

type Emergency struct {
ID uuid.UUID `json:"id"`
StartLoc Point `json:"startLoc"`
StartLoc Point `json:"startLoc" gorm:"default:NULL"`
TimeStamp time.Time `json:"timeStamp" gorm:"default:now()"`
EmergencyRoomID uuid.UUID `json:"emergencyRoomID" gorm:"default:NULL"` // explicitly set the FK to NULL, else PG is confused
EmergencyRoomID uuid.UUID `json:"emergencyRoomID" gorm:"default:NULL"`
EmergencyRoom EmergencyRoom `json:"emergencyRoom" gorm:"foreignKey:EmergencyRoomID"`
NeededDepartments []Department `json:"neededDepartments" gorm:"many2many:emergencies_need_departments"`
Answers []Answer `json:"answers" gorm:"many2many:emergency_related_answers"`
Expand Down
8 changes: 4 additions & 4 deletions models/questions.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import "github.com/google/uuid"

type Question struct {
ID uuid.UUID `json:"id"`
Question string `json:"question" example:"Are children involved?"`
Question string `json:"question" gorm:"default:NULL" example:"Are children involved?"`
}

type Answer struct {
ID uuid.UUID `json:"id"`
Answer string `json:"answer" example:"Yes"`
Statement string `json:"statement" example:"There are children involved."`
QuestionID uuid.UUID `json:"questionID"`
Answer string `json:"answer" gorm:"default:NULL" example:"Yes"`
Statement string `json:"statement" gorm:"default:NULL" example:"There are children involved."`
QuestionID uuid.UUID `json:"questionID" gorm:"default:NULL"`
Question Question `json:"question" gorm:"foreignKey:QuestionID"`
}
8 changes: 4 additions & 4 deletions models/room.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import (
)

type EmergencyRoomBase struct {
Name string `json:"name" binding:"required" example:"Uniklinikum Münster"`
Location Point `json:"location" binding:"required"`
DisplayableAddress string `json:"displayableAddress" binding:"required" example:"Kardinal-von-Galen-Ring 10, 48149 Münster, Germany"`
Name string `json:"name" gorm:"default:NULL" binding:"required" example:"Uniklinikum Münster"`
Location Point `json:"location" gorm:"default:NULL" binding:"required"`
DisplayableAddress string `json:"displayableAddress" gorm:"default:NULL" binding:"required" example:"Kardinal-von-Galen-Ring 10, 48149 Münster, Germany"`
Open bool `json:"open" gorm:"column:is_open;default:true"`
Utilization int16 `json:"utilization" gorm:"default:1" example:"4"`
}

type EmergencyRoom struct {
ID uuid.UUID `json:"id"`
EmergencyRoomBase
OrganizationID uuid.UUID `json:"organizationID"`
OrganizationID uuid.UUID `json:"organizationID" gorm:"default:NULL"`
Organization Organization `json:"organization"`
Departments []Department `json:"-" gorm:"many2many:rooms_have_departments" `
}
6 changes: 3 additions & 3 deletions models/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ const Admin = "admin"

type UserBase struct {
ID uuid.UUID `json:"id"`
Email string `json:"email"`
Email string `json:"email" gorm:"default:NULL"`
FullName string `json:"fullName" gorm:"default:NULL"`
AvatarUrl string `json:"avatarUrl" gorm:"default:NULL"`
}

type User struct {
UserBase
PwBcrypt string
PwBcrypt string `gorm:"default:NULL"`
GlobalRoles []GlobalRole
Organizations []Organization `gorm:"many2many:organizations_have_users"`
}

type GlobalRole struct {
UserID uuid.UUID
Role string
Role string `gorm:"default:NULL"`
}