Added update model

Author: wybiral

Diff for: middleware/middleware.go

@@ -8,7 +8,7 @@ import (
 func AuthRequired(handler http.HandlerFunc) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		session, _ := sessions.Store.Get(r, "session")
-		_, ok := session.Values["username"]
+		_, ok := session.Values["user_id"]
 		if !ok {
 			http.Redirect(w, r, "/login", 302)
 			return

Diff for: models/comment.go

@@ -0,0 +1,58 @@
+package models
+
+import (
+	"fmt"
+)
+
+type Update struct {
+	key string
+}
+
+func NewUpdate(userId int64, body string) (*Update, error) {
+	id, err := client.Incr("update:next-id").Result()
+	if err != nil {
+		return nil, err
+	}
+	key := fmt.Sprintf("update:%d", id)
+	pipe := client.Pipeline()
+	pipe.HSet(key, "id", id)
+	pipe.HSet(key, "user_id", userId)
+	pipe.HSet(key, "body", body)
+	pipe.LPush("updates", id)
+	_, err = pipe.Exec()
+	if err != nil {
+		return nil, err
+	}
+	return &Update{key}, nil
+}
+
+func (update *Update) GetBody() (string, error) {
+	return client.HGet(update.key, "body").Result()
+}
+
+func (update *Update) GetUser() (*User, error) {
+	userId, err := client.HGet(update.key, "user_id").Int64()
+	if err != nil {
+		return nil, err
+	}
+	return GetUserById(userId)
+}
+
+
+func GetUpdates() ([]*Update, error) {
+	updateIds, err := client.LRange("updates", 0, 10).Result()
+	if err != nil {
+		return nil, err
+	}
+	updates := make([]*Update, len(updateIds))
+	for i, id := range updateIds {
+		key := "update:" + id
+		updates[i] = &Update{key}
+	}
+	return updates, nil
+}
+
+func PostUpdate(userId int64, body string) error {
+	_, err := NewUpdate(userId, body)
+	return err
+}

Diff for: models/update.go

@@ -34,6 +34,10 @@ func NewUser(username string, hash []byte) (*User, error) {
 	return &User{key}, nil
 }
 
+func (user *User) GetId() (int64, error) {
+	return client.HGet(user.key, "id").Int64()
+}
+
 func (user *User) GetUsername() (string, error) {
 	return client.HGet(user.key, "username").Result()
 }
@@ -54,23 +58,27 @@ func (user *User) Authenticate(password string) error {
 	return err
 }
 
+func GetUserById(id int64) (*User, error) {
+	key := fmt.Sprintf("user:%d", id)
+	return &User{key}, nil
+}
+
 func GetUserByUsername(username string) (*User, error) {
 	id, err := client.HGet("user:by-username", username).Int64()
 	if err == redis.Nil {
 		return nil, ErrUserNotFound
 	} else if err != nil {
 		return nil, err
 	}
-	key := fmt.Sprintf("user:%d", id)
-	return &User{key}, nil
+	return GetUserById(id)
 }
 
-func AuthenticateUser(username, password string) error {
+func AuthenticateUser(username, password string) (*User, error) {
 	user, err := GetUserByUsername(username)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return user.Authenticate(password)
+	return user, user.Authenticate(password)
 }
 
 func RegisterUser(username, password string) error {

Diff for: models/user.go

@@ -23,19 +23,27 @@ func NewRouter() *mux.Router {
 }
 
 func indexGetHandler(w http.ResponseWriter, r *http.Request) {
-	comments, err := models.GetComments()
+	updates, err := models.GetUpdates()
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		w.Write([]byte("Internal server error"))
 		return
 	}
-	utils.ExecuteTemplate(w, "index.html", comments)
+	utils.ExecuteTemplate(w, "index.html", updates)
 }
 
 func indexPostHandler(w http.ResponseWriter, r *http.Request) {
+	session, _ := sessions.Store.Get(r, "session")
+	untypedUserId := session.Values["user_id"]
+	userId, ok := untypedUserId.(int64)
+	if !ok {
+		w.WriteHeader(http.StatusInternalServerError)
+		w.Write([]byte("Internal server error"))
+		return
+	}
 	r.ParseForm()
-	comment := r.PostForm.Get("comment")
-	err := models.PostComment(comment)
+	body := r.PostForm.Get("update")
+	err := models.PostUpdate(userId, body)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		w.Write([]byte("Internal server error"))
@@ -52,7 +60,7 @@ func loginPostHandler(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 	username := r.PostForm.Get("username")
 	password := r.PostForm.Get("password")
-	err := models.AuthenticateUser(username, password)
+	user, err := models.AuthenticateUser(username, password)
 	if err != nil {
 		switch err {
 		case models.ErrUserNotFound:
@@ -65,8 +73,14 @@ func loginPostHandler(w http.ResponseWriter, r *http.Request) {
 		}
 		return
 	}
+	userId, err := user.GetId()
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		w.Write([]byte("Internal server error"))
+		return
+	}
 	session, _ := sessions.Store.Get(r, "session")
-	session.Values["username"] = username
+	session.Values["user_id"] = userId
 	session.Save(r, w)
 	http.Redirect(w, r, "/", 302)
 }

Diff for: routes/routes.go

@@ -1,18 +1,23 @@
 <html>
 	<head>
-		<title>Comments</title>
+		<title>Updates</title>
 		<link rel="stylesheet" type="text/css" href="/static/index.css">
 	</head>
 	<body>
-		<h1>Comments</h1>
+		<h1>Updates</h1>
 		<form method="POST">
-			<textarea name="comment"></textarea>
+			<textarea name="update"></textarea>
 			<div>
-				<button type="submit">Post Comment</button>
+				<button type="submit">Post Update</button>
 			</div>
 		</form>
 		{{ range . }}
-		<div>{{ . }}</div>
+		<div>
+			<div>
+				<strong>{{ .GetUser.GetUsername }} wrote:</strong>
+			</div>
+			<div>{{ .GetBody }}</div>
+		</div>
 		{{ end }}
 	</body>
 </html>