Merge branch 'main' into setup-basic-access-control

migrations/20230725191302-add-names-to-users.sql

@@ -0,0 +1,9 @@
+-- +migrate Up
+
+ALTER TABLE users
+    ADD COLUMN full_name TEXT NOT NULL DEFAULT '';
+
+-- +migrate Down
+
+ALTER TABLE users
+    DROP COLUMN full_name;

model/users.go

@@ -8,6 +8,7 @@ import (
 
 type User struct {
 	gorm.Model
+	FullName      string // FIXME: Use nullable string
 	Username      string
 	LoginProvider userenums.LoginProvider
 }

params/users/create.go

@@ -9,6 +9,7 @@ import (
 )
 
 type Create struct {
+	Name          string `json:"name"`
 	Username      string `json:"username"`
 	LoginProvider string `json:"provider"`
 }
@@ -37,6 +38,7 @@ func (params *Create) ToModel() *model.User {
 		panic(errors.New("Illegal path - invalid provider"))
 	}
 	return &model.User{
+		FullName:      params.Name,
 		Username:      params.Username,
 		LoginProvider: provider,
 	}

view/users/view.go

@@ -4,13 +4,19 @@ import "github.com/source-academy/stories-backend/model"
 
 type View struct {
 	ID            uint   `json:"id"`
+	Name          string `json:"name"`
 	Username      string `json:"username"`
 	LoginProvider string `json:"provider"`
 }
 
 func SingleFrom(user model.User) View {
+	name := user.FullName
+	if name == "" {
+		name = user.Username
+	}
 	userView := View{
 		ID:            user.ID,
+		Name:          name,
 		Username:      user.Username,
 		LoginProvider: user.LoginProvider.ToString(),
 	}