Merge pull request #44 from FantLab/FLGO-43

FLGO-43 protobuf

Author: kenrube

.vscode/launch.json

@@ -9,7 +9,8 @@
             "program": "${workspaceRoot}/main.go",
             "env": {
                 "MYSQL_CS": "root@/fl?charset=utf8&parseTime=True&loc=Local",
-                "PORT": 4242
+                "PORT": 4242,
+                "GIN_MODE": "debug"
             },
             "args": [],
             "buildFlags": "-tags debug"
@@ -22,7 +23,8 @@
             "program": "${workspaceRoot}/main.go",
             "env": {
                 "MYSQL_CS": "root@/fl?charset=utf8&parseTime=True&loc=Local",
-                "PORT": 4242
+                "PORT": 4242,
+                "GIN_MODE": "release"
             },
             "args": []
         }

README.md

@@ -10,3 +10,11 @@
 - Назначить reviewer-а
 - ...
 - PROFIT
+
+# Protobuf
+
+```
+cd protobuf
+
+protoc --go_out=generated schema/*.proto
+```

go.mod

@@ -4,6 +4,7 @@ go 1.12
 
 require (
 	github.com/gin-gonic/gin v1.4.0
+	github.com/golang/protobuf v1.3.1
 	github.com/jinzhu/gorm v1.9.8
 	github.com/segmentio/ksuid v1.0.2
 	golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c

main.go

@@ -29,8 +29,6 @@ func main() {
 	db.SetLogger(logger.GormLogger)
 	db.LogMode(true)
 
-	utils.SetupGinMode()
-
 	configuration := config.ParseConfig()
 	services := &shared.Services{
 		Config:       configuration,

make_module.sh

@@ -9,7 +9,7 @@ fi
 
 cd modules
 mkdir -p $PACKAGE && cd $PACKAGE
-for FILE in datacontroller dbcontroller dbmodels models; do
+for FILE in datacontroller dbcontroller dbmodels; do
     if [ ! -f "$FILE.go" ]; then
         echo "package $PACKAGE" > "$FILE.go"
     fi

middlewares/session.go

@@ -12,7 +12,7 @@ func Session(services *shared.Services) gin.HandlerFunc {
 
 		if len(sid) > 0 {
 			type userID struct {
-				Value int `gorm:"Column:user_id"`
+				Value uint32 `gorm:"Column:user_id"`
 			}
 
 			var uid userID

modules/authapi/api.go

@@ -1,6 +1,7 @@
 package authapi
 
 import (
+	"fantlab/protobuf/generated/fantlab/pb"
 	"fantlab/shared"
 	"fantlab/utils"
 	"net/http"
@@ -54,9 +55,10 @@ func (c *Controller) Login(ctx *gin.Context) {
 		return
 	}
 
-	session := session{
-		UserId:  userData.UserID,
-		Session: sid,
+	session := &pb.UserSessionResponse{
+		UserId:       userData.UserID,
+		SessionToken: sid,
 	}
-	utils.ShowJson(ctx, http.StatusOK, session)
+
+	utils.ShowProto(ctx, http.StatusOK, session)
 }

modules/authapi/datacontroller.go

@@ -22,7 +22,7 @@ func NewController(services *shared.Services) *Controller {
 func (c *Controller) ShowCommunities(ctx *gin.Context) {
 	dbCommunities := fetchCommunities(c.services.DB)
 	communities := getCommunities(dbCommunities)
-	utils.ShowJson(ctx, http.StatusOK, communities)
+	utils.ShowProto(ctx, http.StatusOK, communities)
 }
 
 func (c *Controller) ShowBlogs(ctx *gin.Context) {
@@ -46,7 +46,7 @@ func (c *Controller) ShowBlogs(ctx *gin.Context) {
 
 	dbBlogs := fetchBlogs(c.services.DB, uint32(limit), uint32(offset), sort)
 	blogs := getBlogs(dbBlogs)
-	utils.ShowJson(ctx, http.StatusOK, blogs)
+	utils.ShowProto(ctx, http.StatusOK, blogs)
 }
 
 func (c *Controller) ShowBlogArticles(ctx *gin.Context) {
@@ -82,5 +82,5 @@ func (c *Controller) ShowBlogArticles(ctx *gin.Context) {
 	}
 
 	articles := getBlogArticles(dbBlogTopics, c.services.UrlFormatter)
-	utils.ShowJson(ctx, http.StatusOK, articles)
+	utils.ShowProto(ctx, http.StatusOK, articles)
 }