Added title for message and make UI better

Author: zafinxueqian

README.md

@@ -1,6 +1,6 @@
 # Micri Message
 
-This application is for operating messages based on rest api with simple user authentification, registration and login. It is easy to deploy application on aws with only 2 steps.
+This application is for operating messages based on rest api with simple user authentication, registration and login. It is easy to deploy application on aws with only 2 steps.
 
 ## Getting Started
 
@@ -71,7 +71,7 @@ curl -X DELETE -H "Accept: application/json" http://<public-dns>/messages/<:mess
 ```
 * You can create a new message by running: 
 ```
-curl -X POST -H "Accept: application/json" http://<public-dns>/messages/create?content=<your-message>
+curl -X POST -d "title=8&content=8" -H "Accept: application/json" http://<public-dns>/messages/create
 ```
 
 Also you can absolutely interact with application through UI!

database/setup.sql

@@ -1,4 +1,4 @@
---create zplatform or zrpe database
+-- create micro-message database
 \echo 'Installing micro-message database!'
 
 alter user postgres password 'PG_ROOT_PASSWORD';
@@ -32,7 +32,8 @@ ALTER ROLE PG_USER SET search_path = PG_USER;
 
 \c PG_DATABASE PG_USER;
 create table message (
-    id  SERIAL PRIMARY KEY, 
+    id  SERIAL PRIMARY KEY,
+    title varchar,
     content text, 
     palindrome boolean
 );
@@ -44,4 +45,3 @@ create table users (
     email varchar
 );
 
-

handlers/authHandler_test.go

@@ -0,0 +1,88 @@
+package handlers
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+)
+
+//TestEnsursLoggedIn tests EnsureLoggedIn function
+func TestEnsureLoggedIn(t *testing.T) {
+	testCases := map[string]struct {
+		loggedIn bool
+		code     int
+	}{
+		"Test function EnsureLoggedIn without authentication": {
+			false,
+			http.StatusUnauthorized,
+		},
+		"Test function EnsureLoggedIn with authentication": {
+			true,
+			http.StatusOK,
+		},
+	}
+
+	for caseName, testCase := range testCases {
+		t.Run(caseName, func(t *testing.T) {
+			r := getRouter(false)
+			r.GET("/", setLogIn(testCase.loggedIn), EnsureLoggedIn(), func(c *gin.Context) {
+				c.Status(http.StatusOK)
+			})
+			testAuthHandler(t, r, testCase.code)
+		})
+	}
+}
+
+//TestEnsursNotLoggedIn tests  EnsureNotLoggedIn function
+func TestEnsureNotLoggedIn(t *testing.T) {
+	testCases := map[string]struct {
+		loggedIn bool
+		code     int
+	}{
+		"Test function EnsursNotLoggedIn without authentication": {
+			false,
+			http.StatusOK,
+		},
+		"Test function EnsursNotLoggedIn with authentication": {
+			true,
+			http.StatusUnauthorized,
+		},
+	}
+
+	for caseName, testCase := range testCases {
+		t.Run(caseName, func(t *testing.T) {
+			r := getRouter(false)
+			r.GET("/", setLogIn(testCase.loggedIn), EnsureNotLoggedIn(), func(c *gin.Context) {
+				c.Status(http.StatusOK)
+			})
+			testAuthHandler(t, r, testCase.code)
+		})
+	}
+}
+
+func TestSetUserStatusAuthenticated(t *testing.T) {
+	r := getRouter(false)
+	r.GET("/", SetUserStatus(), func(c *gin.Context) {
+		loggedInInterface, exists := c.Get("is_logged_in")
+		if !exists || !loggedInInterface.(bool) {
+			t.Fail()
+		}
+	})
+
+	w := httptest.NewRecorder()
+
+	http.SetCookie(w, &http.Cookie{Name: "token", Value: "123"})
+
+	req, _ := http.NewRequest("GET", "/", nil)
+	req.Header = http.Header{"Cookie": w.HeaderMap["Set-Cookie"]}
+
+	r.ServeHTTP(w, req)
+}
+
+func setLogIn(loggedIn bool) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		c.Set("is_logged_in", loggedIn)
+	}
+}

handlers/helpers_test.go

@@ -27,6 +27,7 @@ func getRouter(withTemplates bool) *gin.Engine {
 	r := gin.Default()
 	if withTemplates {
 		r.LoadHTMLGlob("../templates/*")
+		r.Use(SetUserStatus())
 	}
 	return r
 }
@@ -36,7 +37,6 @@ func testHTTPResponse(t *testing.T, r *gin.Engine, req *http.Request, f func(w *
 
 	// Create a response recorder
 	w := httptest.NewRecorder()
-
 	// Create the service and process the above request.
 	r.ServeHTTP(w, req)
 
@@ -46,12 +46,12 @@ func testHTTPResponse(t *testing.T, r *gin.Engine, req *http.Request, f func(w *
 }
 
 func getLoginUser() string {
-    params := url.Values{}
-    params.Add("username", "user1")
-    params.Add("password", "pass1")
-    params.Add("email", "user1@qlik.com")
+	params := url.Values{}
+	params.Add("username", "user1")
+	params.Add("password", "pass1")
+	params.Add("email", "user1@qlik.com")
 
-    return params.Encode()
+	return params.Encode()
 }
 
 func getRegistrationUser() string {
@@ -62,8 +62,24 @@ func getRegistrationUser() string {
 	return param.Encode()
 }
 
+func getNewMessage() string {
+	param := url.Values{}
+	param.Add("title", "test")
+	param.Add("content", "test123")
+
+	return param.Encode()
+}
+
 func getDeleteMessage() string {
-    param := url.Values{}
-    param.Add("messageid", "1")
-    return param.Encode()
+	param := url.Values{}
+	param.Add("messageid", "1")
+	return param.Encode()
+}
+
+func testAuthHandler(t *testing.T, r *gin.Engine, expectedCode int) {
+	req, _ := http.NewRequest("GET", "/", nil)
+
+	testHTTPResponse(t, r, req, func(w *httptest.ResponseRecorder) bool {
+		return w.Code == expectedCode
+	})
 }

handlers/messageHandler.go

@@ -12,46 +12,44 @@ import (
 
 //ShowIndexPage shows index page and message list inside it
 func ShowIndexPage(c *gin.Context) {
-	messages, _ := store.GetAllMessages()
 	isLoggedIn, _ := c.Get("is_logged_in")
 	//fresh index page according to the values
 	render(c, gin.H{
 		"is_logged_in": isLoggedIn,
-		"title":        "Welcome to Micro Message!",
-		"payload":      messages}, "index.html")
+		"title":        "Welcome to Micro Message!"}, "index.html")
 }
 
 //ShowCreatePage shows create message page
 func ShowCreatePage(c *gin.Context) {
-    isLoggedIn, _ := c.Get("is_logged_in")
+	isLoggedIn, _ := c.Get("is_logged_in")
 	render(c, gin.H{
-        "is_logged_in": isLoggedIn,
-		"title": "Create Message"}, "create-message.html")
+		"is_logged_in": isLoggedIn,
+		"title":        "Create Message"}, "create-message.html")
 }
 
 //GetMessages shows list of messages and
 func GetMessages(c *gin.Context) {
-    isLoggedIn, _ := c.Get("is_logged_in")
+	isLoggedIn, _ := c.Get("is_logged_in")
 	if messages, err := store.GetAllMessages(); err == nil {
 		render(c, gin.H{
-            "is_logged_in": isLoggedIn,
-			"title":   "Message List",
-			"payload": messages}, "messages.html")
+			"is_logged_in": isLoggedIn,
+			"title":        "Message List",
+			"payload":      messages}, "messages.html")
 	} else {
 		c.AbortWithStatus(http.StatusNotFound)
 	}
 }
 
 //GetMessage get message based on message id
 func GetMessage(c *gin.Context) {
-    isLoggedIn, _ := c.Get("is_logged_in")
+	isLoggedIn, _ := c.Get("is_logged_in")
 	//convert parameter value from string to integer
 	if messageId, err := strconv.Atoi(c.Param("messageid")); err == nil {
 		if message, err := store.GetMessageByID(messageId); err == nil {
 			render(c, gin.H{
-                "is_logged_in": isLoggedIn,
-				"id":      message.ID,
-				"payload": message}, "message.html")
+				"is_logged_in": isLoggedIn,
+				"id":           message.ID,
+				"payload":      message}, "message.html")
 		} else {
 			//if message not found
 			c.AbortWithError(http.StatusNotFound, err)
@@ -63,14 +61,15 @@ func GetMessage(c *gin.Context) {
 
 //CreateMessage ceates a new message
 func CreateMessage(c *gin.Context) {
-    isLoggedIn, _ := c.Get("is_logged_in")
-	// Obtain the POSTed content values
+	isLoggedIn, _ := c.Get("is_logged_in")
+	// Obtain the POSTed title, content values
+	title := c.PostForm("title")
 	content := c.PostForm("content")
-	if id, err := store.CreateMessage(content); err == nil {
+	if id, err := store.CreateMessage(title, content); err == nil || id != 0 {
 		render(c, gin.H{
-            "is_logged_in": isLoggedIn,
-			"title": "Submission Successful",
-			"id":    id}, "submission.html")
+			"is_logged_in": isLoggedIn,
+			"title":        "Submission Successful",
+			"id":           id}, "submission.html")
 	} else {
 		c.AbortWithError(http.StatusInternalServerError, errors.New("Failed to create message"))
 	}
@@ -81,7 +80,7 @@ func DeleteMessage(c *gin.Context) {
 	if messageId, err := strconv.Atoi(c.Param("messageid")); err == nil {
 		if err := store.DeleteMessage(messageId); err == nil {
 			render(c, gin.H{
-                "title": "Successfully deleted message"}, "delete-successful.html")
+				"title": "Successfully deleted message"}, "delete-successful.html")
 		} else {
 			c.AbortWithError(http.StatusNoContent, fmt.Errorf("Not find corresponding message based in id %d", messageId))
 		}
@@ -94,10 +93,16 @@ func DeleteMessage(c *gin.Context) {
 // If the header doesn't specify this, HTML is rendered, provided that
 // the template name is present
 func render(c *gin.Context, data gin.H, templateName string) {
+	loggedInInterface, _ := c.Get("is_logged_in")
+	data["is_logged_in"] = loggedInInterface.(bool)
+
 	switch c.Request.Header.Get("Accept") {
 	case "application/json":
 		// Respond with JSON
 		c.JSON(http.StatusOK, data["payload"])
+		if data["id"] != "" {
+			c.JSON(http.StatusOK, data["id"])
+		}
 	case "application/xml":
 		// Respond with XML
 		c.XML(http.StatusOK, data["payload"])

handlers/messageHandlers_test.go

@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"strconv"
 	"strings"
 	"testing"
 )
@@ -30,31 +31,47 @@ func TestShowIndexPageUnauthenticated(t *testing.T) {
 }
 
 func TestShowCreatePage(t *testing.T) {
-    r := getRouter(true)
-    r.GET("/messages/create", ShowCreatePage)
-
-    req, _ := http.NewRequest("GET", "/messages/create", nil)
-    testHTTPResponse(t, r, req, func(w *httptest.ResponseRecorder) bool {
-        statusOK := w.Code == http.StatusOK
-
-        p, err := ioutil.ReadAll(w.Body)
-        pageOK := err == nil && strings.Index(string(p), "<title>Create Message</title>") > 0
-        
-        return statusOK && pageOK
-    })
+	r := getRouter(true)
+	r.GET("/messages/create", ShowCreatePage)
+
+	req, _ := http.NewRequest("GET", "/messages/create", nil)
+	testHTTPResponse(t, r, req, func(w *httptest.ResponseRecorder) bool {
+		statusOK := w.Code == http.StatusOK
+
+		p, err := ioutil.ReadAll(w.Body)
+		pageOK := err == nil && strings.Index(string(p), "<title>Create Message</title>") > 0
+
+		return statusOK && pageOK
+	})
 }
 
 func TestGetMessages(t *testing.T) {
-    r := getRouter(true)
-    r.GET("/messages", GetMessages)
-
-    req, _ := http.NewRequest("GET", "/messages", nil)
-        testHTTPResponse(t, r, req, func(w *httptest.ResponseRecorder) bool {
-        statusOK := w.Code == http.StatusOK
-
-        p, err := ioutil.ReadAll(w.Body)
-        pageOK := err == nil && strings.Index(string(p), "<title>Message List</title>") > 0
-        
-        return statusOK && pageOK
-    })
+	r := getRouter(true)
+	r.GET("/messages", GetMessages)
+
+	req, _ := http.NewRequest("GET", "/messages", nil)
+	testHTTPResponse(t, r, req, func(w *httptest.ResponseRecorder) bool {
+		statusOK := w.Code == http.StatusOK
+
+		p, err := ioutil.ReadAll(w.Body)
+		pageOK := err == nil && strings.Index(string(p), "<title>Message List</title>") > 0
+
+		return statusOK && pageOK
+	})
+}
+
+func TestCreateMessage(t *testing.T) {
+	w := httptest.NewRecorder()
+	r := getRouter(true)
+	r.GET("/mesages/create", CreateMessage)
+
+	newMessage := getNewMessage()
+	req, err := http.NewRequest("POST", "/messages/create", strings.NewReader(newMessage))
+	if err != nil {
+		t.Fail()
+	}
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Add("Content-Length", strconv.Itoa(len(newMessage)))
+
+	r.ServeHTTP(w, req)
 }