Merge pull request #46 from FantLab/FLGO-45

FLGO-45 Fix json fields
FantLab · Jul 1, 2019 · 2cdade8 · 2cdade8
2 parents d860bdd + b8d74a3
commit 2cdade8
Show file tree

Hide file tree

Showing 11 changed files with 195 additions and 153 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Reamde
 На данный момент репозиторий содержит код API для Фантлаба, написанный на Go. В состоянии активной разработки.
 
-# Порядок работы
+## Порядок работы
 - Завести issue с описанием задачи/бага
 - Создать у себя ветку FLGO-{#issue}
 - Написать код
@@ -11,10 +11,9 @@
 - ...
 - PROFIT
 
-# Protobuf
+## Protobuf
 
-```
-cd protobuf
-
-protoc --go_out=generated schema/*.proto
+```console
+$ cd protobuf/
+$ protoc --go_out=generated schema/*.proto
 ```
diff --git a/modules/authapi/api.go b/modules/authapi/api.go
@@ -1,10 +1,11 @@
 package authapi
 
 import (
+	"net/http"
+
 	"fantlab/protobuf/generated/fantlab/pb"
 	"fantlab/shared"
 	"fantlab/utils"
-	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/segmentio/ksuid"

diff --git a/modules/blogsapi/datacontroller.go b/modules/blogsapi/datacontroller.go
@@ -15,8 +15,8 @@ func getCommunities(dbCommunities []dbCommunity) *pb.Blog_CommunitiesResponse {
 			Title:                dbCommunity.Name,
 			CommunityDescription: dbCommunity.Description,
 			Stats: &pb.Blog_Community_Stats{
-				ArticlesCount:    dbCommunity.TopicsCount,
-				SubscribersCount: dbCommunity.SubscriberCount,
+				ArticleCount:    dbCommunity.TopicsCount,
+				SubscriberCount: dbCommunity.SubscriberCount,
 			},
 			LastArticle: &pb.Blog_LastArticle{
 				Id:    dbCommunity.LastTopicId,
@@ -56,8 +56,8 @@ func getBlogs(dbBlogs []dbBlog) *pb.Blog_BlogsResponse {
 			},
 			IsClosed: dbBlog.IsClose,
 			Stats: &pb.Blog_Blog_Stats{
-				ArticlesCount:    dbBlog.TopicsCount,
-				SubscribersCount: dbBlog.SubscriberCount,
+				ArticleCount:    dbBlog.TopicsCount,
+				SubscriberCount: dbBlog.SubscriberCount,
 			},
 			LastArticle: &pb.Blog_LastArticle{
 				Id:    dbBlog.LastTopicId,

diff --git a/protobuf/generated/fantlab/pb/auth_models.pb.go b/protobuf/generated/fantlab/pb/auth_models.pb.go
diff --git a/protobuf/generated/fantlab/pb/blog_models.pb.go b/protobuf/generated/fantlab/pb/blog_models.pb.go