Fix: various bug fix

handlers/auth/postLogin.go

@@ -6,11 +6,14 @@ import (
 	"gitea.konchin.com/ytshih/inp2025/middlewares"
 	"gitea.konchin.com/ytshih/inp2025/models"
 	"gitea.konchin.com/ytshih/inp2025/types"
-	"gitea.konchin.com/ytshih/inp2025/utils"
 
 	"github.com/uptrace/bunrouter"
 )
 
+type PostLoginOutput struct {
+	LoginCount int `msgpack:"loginCount"`
+}
+
 func (self *Handlers) PostLogin(
 	w http.ResponseWriter,
 	req bunrouter.Request,
@@ -25,11 +28,12 @@ func (self *Handlers) PostLogin(
 	}
 
 	res, err := self.db.NewUpdate().
-		Model((*models.User)(nil)).
+		Model(&user).
 		Set("login_count = login_count + ?", 1).
 		Set("is_logged = ?", true).
 		Where("is_logged = ?", false).
 		Where("username = ?", user.Username).
+		Returning("*").
 		Exec(ctx)
 	if err != nil {
 		return middlewares.HTTPError{
@@ -46,8 +50,6 @@ func (self *Handlers) PostLogin(
 				OriginError: err,
 			}
 		}
-		// debug
-		return utils.Success(w)
 		if cnt == 0 {
 			return middlewares.HTTPError{
 				StatusCode: http.StatusUnauthorized,
@@ -55,5 +57,7 @@ func (self *Handlers) PostLogin(
 			}
 		}
 	}
-	return utils.Success(w)
+	return bunrouter.JSON(w, PostLoginOutput{
+		LoginCount: user.LoginCount,
+	})
 }

handlers/auth/postLogout.go

@@ -24,6 +24,7 @@ func (self *Handlers) PostLogout(
 	}
 
 	_, err := self.db.NewUpdate().
+		Model((*models.User)(nil)).
 		Set("is_logged = ?", false).
 		Where("username = ?", user.Username).
 		Exec(ctx)

handlers/auth/postRegister.go

@@ -11,6 +11,11 @@ import (
 	"github.com/uptrace/bunrouter"
 )
 
+type PostRegisterInput struct {
+	Username string `json:"username"`
+	Password string `json:"password"`
+}
+
 func (self *Handlers) PostRegister(
 	w http.ResponseWriter,
 	req bunrouter.Request,
@@ -26,15 +31,20 @@ func (self *Handlers) PostRegister(
 		}
 	}
 
-	var user models.User
-	if err := json.Unmarshal(b, &user); err != nil {
+	var input PostRegisterInput
+	if err := json.Unmarshal(b, &input); err != nil {
 		return middlewares.HTTPError{
 			StatusCode:  http.StatusBadRequest,
-			Message:     "failed to unmarshal json into user",
+			Message:     "failed to unmarshal json",
 			OriginError: err,
 		}
 	}
 
+	user := models.User{
+		Username:   input.Username,
+		Password:   input.Password,
+		LoginCount: 0,
+	}
 	res, err := self.db.NewInsert().
 		Model(&user).
 		On("CONFLICT (username) DO NOTHING").

handlers/wordle/getState.go

@@ -15,7 +15,6 @@ func (self *Handlers) GetState(
 	w http.ResponseWriter,
 	req bunrouter.Request,
 ) error {
-	// fmt.Fprintf(os.Stderr, "GET /api/state\n")
 	c, err := self.upgrader.Upgrade(w, req.Request, nil)
 	if err != nil {
 		return middlewares.HTTPError{

handlers/wordle/handlers.go

@@ -22,15 +22,14 @@ func (op *OperationSubs) Run(self *Handlers) error {
 	if !ok {
 		self.state.History[op.Username] = [types.GUESS_COUNT_LIMIT]types.Guess{}
 	}
-	// fmt.Fprintf(os.Stderr, "[DEBUG] %+v\n", self.state.History)
 	self.subs = append(self.subs, op.SubsCh)
 
 	return nil
 }
 
 type OperationGuess struct {
-	Username string `msgpack:"username"`
-	Guess    string `msgpack:"guess"`
+	Username string
+	Guess    string
 }
 
 func (op *OperationGuess) Run(self *Handlers) error {
@@ -57,6 +56,13 @@ func (op *OperationGuess) Run(self *Handlers) error {
 	return nil
 }
 
+type OperationEnd struct{}
+
+func (op *OperationEnd) Run(self *Handlers) error {
+	self.state.GameEnd = true
+	return nil
+}
+
 type Handlers struct {
 	ans      string
 	state    types.WordleState
@@ -90,7 +96,6 @@ func (self *Handlers) GameFlow() {
 			panic(fmt.Errorf("game flow operation failed, %w", err))
 		}
 
-		// fmt.Fprintf(os.Stderr, "[DEBUG] %+v\n", self.state.History)
 		for _, ch := range self.subs {
 			*ch <- self.state
 		}

handlers/wordle/postEnd.go

@@ -0,0 +1,16 @@
+package wordle
+
+import (
+	"net/http"
+
+	"gitea.konchin.com/ytshih/inp2025/utils"
+	"github.com/uptrace/bunrouter"
+)
+
+func (self *Handlers) PostEnd(
+	w http.ResponseWriter,
+	req bunrouter.Request,
+) error {
+	self.opCh <- &OperationEnd{}
+	return utils.Success(w)
+}