Commit 06cc192c authored by Mo Firouz's avatar Mo Firouz Committed by Andrei Mihu
Browse files

Use snake_case for realtime API. Fix user update query.

parent cdd7c3d6

main.go

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ var ( 
		EnumsAsInts:  true,

		EmitDefaults: false,

		Indent:       "",

		OrigName:     false,

		OrigName:     true,

	}

	jsonpbUnmarshaler = &jsonpb.Unmarshaler{

		AllowUnknownFields: false,

server/core_account.go

+2 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ import ( 
	"database/sql"

	"strconv"

	"strings"

	"time"



	"github.com/golang/protobuf/ptypes/timestamp"

	"github.com/golang/protobuf/ptypes/wrappers"
@@ -185,10 +184,9 @@ func UpdateAccount(db *sql.DB, logger *zap.Logger, userID uuid.UUID, username st 
		return errors.New("No fields to update.")

	}



	ts := time.Now().UTC().Unix()

	params = append(params, ts, userID)

	params = append(params, userID)



	query := "UPDATE users SET update_time = $" + strconv.Itoa(index) + ", " + strings.Join(statements, ", ") + " WHERE id = $" + strconv.Itoa(index+1)

	query := "UPDATE users SET update_time = now(), " + strings.Join(statements, ", ") + " WHERE id = $" + strconv.Itoa(index)



	if _, err := db.Exec(query, params...); err != nil {

		if e, ok := err.(*pq.Error); ok && e.Code == dbErrorUniqueViolation && strings.Contains(e.Message, "users_username_key") {