Множество улучшенийv0.0.2

2 files changed, 48 insertions, 5 deletions

diff --git a/routes/node.go b/routes/node.go
index c754b9a..2f5b7d3 100644
--- a/routes/node.go
+++ b/routes/node.go
@@ -34,12 +34,23 @@ func (r *Router) Node(c echo.Context) error {
 		}
 	}
 
-	nodes, count, err := r.nodeRepo.List(c.Request().Context(), parentID)
+	nodes, err := r.nodeRepo.List(c.Request().Context(), parentID)
 	if err != nil {
 		return err
 	}
 
-	return utils.Render(c, views.Node(node, nodes, count))
+	topics := make([]*models.Node, 0, len(nodes))
+	posts := make([]*models.Node, 0, len(nodes))
+	for _, n := range nodes {
+		switch n.Type {
+		case models.PostType:
+			posts = append(posts, n)
+		case models.TopicType:
+			topics = append(topics, n)
+		}
+	}
+
+	return utils.Render(c, views.Node(node, topics, posts))
 }
 
 func (r *Router) NewPost(c echo.Context) error {
@@ -63,7 +74,38 @@ func (r *Router) NewPost(c echo.Context) error {
 			return err
 		}
 
-		return c.Redirect(302, fmt.Sprintf("/n/%d#post%d", parentID, postID))
+		return c.Redirect(302, fmt.Sprintf("/t/%d#post%d", parentID, postID))
+	}
+
+	node, err := r.nodeRepo.Get(c.Request().Context(), parentID)
+	if err != nil {
+		return err
+	}
+
+	return utils.Render(c, views.NewPost(node))
+}
+func (r *Router) NewTopic(c echo.Context) error {
+	req := new(nodeRequest)
+	if err := c.Bind(req); err != nil {
+		return err
+	}
+	user := contextlib.GetUser(c.Request().Context())
+	if user == nil {
+		return echo.ErrForbidden
+	}
+	sParentID := c.Param("id")
+	parentID, err := strconv.Atoi(sParentID)
+	if err != nil {
+		return err
+	}
+
+	if c.Request().Method == http.MethodPost {
+		postID, err := r.nodeRepo.Create(c.Request().Context(), req.Type, req.Text, user.ID, parentID)
+		if err != nil {
+			return err
+		}
+
+		return c.Redirect(302, fmt.Sprintf("/t/%d", postID))
 	}
 
 	node, err := r.nodeRepo.Get(c.Request().Context(), parentID)
@@ -71,5 +113,5 @@ func (r *Router) NewPost(c echo.Context) error {
 		return err
 	}
 
-	return utils.Render(c, views.NewNode(node))
+	return utils.Render(c, views.NewTopic(node))
 }
diff --git a/routes/user.go b/routes/user.go
index 95d5717..dd5bd61 100644
--- a/routes/user.go
+++ b/routes/user.go
@@ -7,6 +7,7 @@ import (
 	"github.com/gorilla/sessions"
 	"github.com/labstack/echo-contrib/session"
 	"github.com/labstack/echo/v4"
+	"gitrepo.ru/neonxp/gorum/models"
 	"gitrepo.ru/neonxp/gorum/utils"
 	"gitrepo.ru/neonxp/gorum/views"
 )
@@ -72,7 +73,7 @@ func (r *Router) Register(c echo.Context) error {
 		return err
 	}
 	if c.Request().Method == http.MethodPost {
-		uid, err := r.userRepo.Create(c.Request().Context(), req.Email, req.Password, req.Username)
+		uid, err := r.userRepo.Create(c.Request().Context(), req.Email, req.Password, req.Username, models.RoleUser)
 		if err != nil {
 			return err
 		}