@@ -32,12 +32,15 @@ CREATE TABLE IF NOT EXISTS mc_accounts (
   id uuid PRIMARY KEY,
   username varchar(16) NOT NULL,
   skin text,
-  user_id uuid NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+  user_id uuid NOT NULL REFERENCES users (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
   created_at timestamptz NOT NULL DEFAULT now(),
   updated_at timestamptz NOT NULL DEFAULT now(),
   deleted_at timestamptz
 );
 
+CREATE UNIQUE INDEX mc_accounts_user_id_key ON mc_accounts (user_id) WHERE deleted_at IS NULL;
+CREATE UNIQUE INDEX mc_accounts_key ON mc_accounts (id) WHERE deleted_at IS NULL;
+
 --gopg:split
 
 CREATE TABLE IF NOT EXISTS games (
 
@@ -67,7 +67,8 @@ func GetMe(c *gin.Context) {
 }
 
 func EditMe(c *gin.Context) {
-	userId := uuid.MustParse(c.GetString(jwt.ContextKey))
+	v, _ := c.Get(session.SessionUserIDKey)
+	userId := v.(uuid.UUID)
 
 	var body userv1Resource.EditUserBody
 	if err := c.ShouldBindJSON(&body); err != nil {
@@ -91,16 +92,15 @@ func EditMe(c *gin.Context) {
 	}
 
 	user := userv1Model.User{
-		Model: model.Model{
-			ID: userId,
-		},
 		MCAccount: &mcv1Model.MCAccount{
 			Model:    model.Model{ID: mcUser.UUID},
+			UserID:   userId,
 			Username: mcUser.Username,
+			Skin:     mcUser.Textures.Skin.URL,
 		},
 	}
 
-	if err := userv1Service.EditMCAccount(user.MCAccount, user.ID); err != nil {
+	if err := userv1Service.UpsertUserMCAccount(&user, userId); err != nil {
 		if err == pg.ErrNoRows {
 			c.Error(apiErr.NewNotFoundError(ErrUserNotFound, v1Err.ErrUserNotFound))
 		} else {
@@ -121,6 +121,7 @@ func EditMe(c *gin.Context) {
 		MCAccount: &userv1Resource.MCAccount{
 			MCUsername: user.MCAccount.Username,
 			MCUUID:     user.MCAccount.ID,
+			Skin:       user.MCAccount.Skin,
 		},
 		LastLogin: user.LastLogin,
 		CreatedAt: user.CreatedAt,
 
@@ -26,6 +26,7 @@ type TwitchAccount struct {
 type MCAccount struct {
 	MCUsername string    `json:"mcUsername"`
 	MCUUID     uuid.UUID `json:"mcUuid"`
+	Skin       string    `json:"skin"`
 }
 
 type EditUserBody struct {
 
@@ -3,8 +3,11 @@ package user
 import (
 	"agones-minecraft/db"
 	"agones-minecraft/models/v1/mc"
+	"context"
 	"time"
 
+	userv1Model "agones-minecraft/models/v1/user"
+
 	"github.com/go-pg/pg/v10"
 	"github.com/google/uuid"
 )
@@ -14,8 +17,27 @@ func CreateMCAccount(tx *pg.Tx, account *mc.MCAccount) error {
 	return err
 }
 
-func EditMCAccount(account *mc.MCAccount, userId uuid.UUID) error {
-	account.UpdatedAt = time.Now()
-	_, err := db.DB().Model(account).Where("user_id = ?", userId).Update()
-	return err
+func UpsertUserMCAccount(user *userv1Model.User, userId uuid.UUID) error {
+	return db.DB().RunInTransaction(context.Background(), func(t *pg.Tx) error {
+		updatedAt := time.Now()
+
+		_, err := t.Model(user.MCAccount).
+			OnConflict("(user_id) WHERE deleted_at IS NULL DO UPDATE").
+			Set("id = EXCLUDED.id, skin = EXCLUDED.skin, username = EXCLUDED.username, updated_at = ?", updatedAt).
+			Insert()
+		if err != nil {
+			return err
+		}
+
+		updateUser := t.Model(user).
+			Set("updated_at = ?", updatedAt).
+			Where("id = ?", userId).
+			Returning("*")
+
+		return t.Model(user).
+			Relation("TwitchAccount").
+			Relation("MCAccount").
+			WithUpdate("updateUser", updateUser).
+			First()
+	})
 }
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ type TwitchAccount struct {`
`26`	`26`	`type MCAccount struct {`
`27`	`27`	MCUsername string `json:"mcUsername"`
`28`	`28`	MCUUID uuid.UUID `json:"mcUuid"`
	`29`	+ Skin string `json:"skin"`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`type EditUserBody struct {`