🔥 Remove article draft status

controller/console/userctl.go

@@ -42,13 +42,12 @@ func GetUsersAction(c *gin.Context) {
 	userModels := service.User.GetBlogUsers(session.BID)
 	for _, userModel := range userModels {
 		users = append(users, &ConsoleUser{
-			ID:                    userModel.ID,
-			Name:                  userModel.Name,
-			Nickname:              userModel.Nickname,
-			Role:                  userModel.Role,
-			URL:                   blogURLSetting.Value + util.PathAuthors + "/" + userModel.Name,
-			AvatarURL:             userModel.AvatarURL,
-			PublishedArticleCount: userModel.PublishedArticleCount,
+			ID:        userModel.ID,
+			Name:      userModel.Name,
+			Nickname:  userModel.Nickname,
+			Role:      userModel.Role,
+			URL:       blogURLSetting.Value + util.PathAuthors + "/" + userModel.Name,
+			AvatarURL: userModel.AvatarURL,
 		})
 	}
 

model/article.go

@@ -40,5 +40,4 @@ type Article struct {
 // Article statuses.
 const (
 	ArticleStatusPublished = iota
-	ArticleStatusDraft
 )

model/setting.go

@@ -105,10 +105,9 @@ const (
 const (
 	SettingCategoryStatistic = "statistic"
 
-	SettingNameStatisticArticleCount          = "statisticArticleCount"
-	SettingNameStatisticPublishedArticleCount = "statisticPublishedArticleCount"
-	SettingNameStatisticCommentCount          = "statisticCommentCount"
-	SettingNameStatisticViewCount             = "statisticViewCount"
+	SettingNameStatisticArticleCount = "statisticArticleCount"
+	SettingNameStatisticCommentCount = "statisticCommentCount"
+	SettingNameStatisticViewCount    = "statisticViewCount"
 )
 
 // Setting values of category "preference".

model/tag.go

@@ -20,9 +20,8 @@ package model
 type Tag struct {
 	Model
 
-	Title                 string `gorm:"size:128" json:"title"`
-	ArticleCount          int    `json:"articleCount"`          // including drafts and published articles
-	PublishedArticleCount int    `json:"publishedArticleCount"` // just including published articles
+	Title        string `gorm:"size:128" json:"title"`
+	ArticleCount int    `json:"articleCount"`
 
 	BlogID uint `json:"blogID"`
 }

model/user.go

@@ -20,14 +20,13 @@ package model
 type User struct {
 	Model
 
-	Name                  string `gorm:"size:32" json:"name"`
-	Nickname              string `gorm:"size:32" json:"nickname"`
-	Role                  int    `json:"role"`
-	AvatarURL             string `gorm:"size:255" json:"avatarURL"`
-	B3Key                 string `gorm:"size:32" json:"b3Key"`
-	Locale                string `gorm:"size:32 json:"locale"`
-	ArticleCount          int    `json:"articleCount"`          // including drafts and published articles
-	PublishedArticleCount int    `json:"publishedArticleCount"` // just including published articles
+	Name         string `gorm:"size:32" json:"name"`
+	Nickname     string `gorm:"size:32" json:"nickname"`
+	Role         int    `json:"role"`
+	AvatarURL    string `gorm:"size:255" json:"avatarURL"`
+	B3Key        string `gorm:"size:32" json:"b3Key"`
+	Locale       string `gorm:"size:32 json:"locale"`
+	ArticleCount int    `json:"articleCount"`
 
 	BlogID uint `json:"blogID"`
 }

service/articlesrv.go

@@ -120,11 +120,6 @@ func (srv *articleService) AddArticle(article *model.Article) error {
 
 		return err
 	}
-	if err := Statistic.IncPublishedArticleCountWithoutTx(tx, article.BlogID); nil != err {
-		tx.Rollback()
-
-		return err
-	}
 	tx.Commit()
 
 	return nil
@@ -222,7 +217,6 @@ func (srv *articleService) RemoveArticle(id uint) error {
 		return err
 	}
 	author.ArticleCount = author.ArticleCount - 1
-	author.PublishedArticleCount = author.PublishedArticleCount - 1
 	if err := tx.Model(author).Updates(author).Error; nil != err {
 		tx.Rollback()
 
@@ -243,11 +237,6 @@ func (srv *articleService) RemoveArticle(id uint) error {
 
 		return err
 	}
-	if err := Statistic.DecPublishedArticleCountWithoutTx(tx, author.BlogID); nil != err {
-		tx.Rollback()
-
-		return err
-	}
 	comments := []*model.Comment{}
 	if err := tx.Model(&model.Comment{}).Where("article_id = ?", id).Find(&comments).Error; nil != err {
 		tx.Rollback()
@@ -364,7 +353,6 @@ func removeTagArticleRels(tx *gorm.DB, article *model.Article) error {
 			continue
 		}
 		tag.ArticleCount = tag.ArticleCount - 1
-		tag.PublishedArticleCount = tag.PublishedArticleCount - 1
 		if err := tx.Save(tag).Error; nil != err {
 			continue
 		}
@@ -385,14 +373,12 @@ func tagArticle(tx *gorm.DB, article *model.Article) error {
 		if "" == tag.Title {
 			tag.Title = tagTitle
 			tag.ArticleCount = 1
-			tag.PublishedArticleCount = 1
 			tag.BlogID = article.BlogID
 			if err := tx.Create(tag).Error; nil != err {
 				return err
 			}
 		} else {
 			tag.ArticleCount = tag.ArticleCount + 1
-			tag.PublishedArticleCount = tag.PublishedArticleCount + 1
 			if err := tx.Model(tag).Updates(tag).Error; nil != err {
 				return err
 			}

service/initsrv.go

@@ -170,7 +170,7 @@ func (srv *initService) InitPlatform(platformAdmin *model.User) error {
 
 func initPlatformAdmin(tx *gorm.DB, admin *model.User, blogID uint) error {
 	admin.Role = model.UserRolePlatformAdmin
-	admin.ArticleCount, admin.PublishedArticleCount = 1, 1 // article "Hello, World!"
+	admin.ArticleCount = 1 // article "Hello, World!"
 	admin.BlogID = blogID
 	admin.Locale = "zh_CN"
 
@@ -237,10 +237,9 @@ Pipe 博客系统是一个开源项目，如果你觉得它很赞，请到[项
 	}
 
 	tag := &model.Tag{
-		Title:                 "Pipe",
-		ArticleCount:          1,
-		PublishedArticleCount: 1,
-		BlogID:                blogID,
+		Title:        "Pipe",
+		ArticleCount: 1,
+		BlogID:       blogID,
 	}
 	if err := tx.Create(tag).Error; nil != err {
 		return err
@@ -494,13 +493,6 @@ func initStatisticSettings(tx *gorm.DB, blogID uint) error {
 		BlogID:   blogID}).Error; nil != err {
 		return err
 	}
-	if err := tx.Create(&model.Setting{
-		Category: model.SettingCategoryStatistic,
-		Name:     model.SettingNameStatisticPublishedArticleCount,
-		Value:    "1", // article "Hello, World!"
-		BlogID:   blogID}).Error; nil != err {
-		return err
-	}
 	if err := tx.Create(&model.Setting{
 		Category: model.SettingCategoryStatistic,
 		Name:     model.SettingNameStatisticCommentCount,

service/statisticsrv.go

@@ -140,74 +140,6 @@ func (srv *statisticService) DecArticleCountWithoutTx(tx *gorm.DB, blogID uint)
 	return nil
 }
 
-func (srv *statisticService) IncPublishedArticleCount(blogID uint) error {
-	tx := db.Begin()
-	if err := srv.IncPublishedArticleCountWithoutTx(tx, blogID); nil != err {
-		tx.Rollback()
-
-		return err
-	}
-	tx.Commit()
-
-	return nil
-}
-
-func (srv *statisticService) IncPublishedArticleCountWithoutTx(tx *gorm.DB, blogID uint) error {
-	srv.mutex.Lock()
-	defer srv.mutex.Unlock()
-
-	setting := &model.Setting{}
-	if err := tx.Where("name = ? AND category = ? AND blog_id = ?", model.SettingNameStatisticPublishedArticleCount, model.SettingCategoryStatistic, blogID).Find(setting).Error; nil != err {
-		return err
-	}
-
-	count, err := strconv.Atoi(setting.Value)
-	if nil != err {
-		return err
-	}
-
-	setting.Value = strconv.Itoa(count + 1)
-	if err := tx.Model(setting).Updates(setting).Error; nil != err {
-		return err
-	}
-
-	return nil
-}
-
-func (srv *statisticService) DecPublishedArticleCount(blogID uint) error {
-	tx := db.Begin()
-	if err := srv.DecPublishedArticleCountWithoutTx(tx, blogID); nil != err {
-		tx.Rollback()
-
-		return err
-	}
-	tx.Commit()
-
-	return nil
-}
-
-func (srv *statisticService) DecPublishedArticleCountWithoutTx(tx *gorm.DB, blogID uint) error {
-	srv.mutex.Lock()
-	defer srv.mutex.Unlock()
-
-	setting := &model.Setting{}
-	if err := tx.Where("name = ? AND category = ? AND blog_id = ?", model.SettingNameStatisticPublishedArticleCount, model.SettingCategoryStatistic, blogID).Find(setting).Error; nil != err {
-		return err
-	}
-
-	count, err := strconv.Atoi(setting.Value)
-	if nil != err {
-		return err
-	}
-
-	setting.Value = strconv.Itoa(count - 1)
-	if err := tx.Model(setting).Updates(setting).Error; nil != err {
-		return err
-	}
-
-	return nil
-}
-
 func (srv *statisticService) IncCommentCount(blogID uint) error {
 	tx := db.Begin()
 	if err := srv.IncCommentCountWithoutTx(tx, blogID); nil != err {

service/statisticsrv_test.go

@@ -24,8 +24,8 @@ import (
 
 func TestGetAllStatistics(t *testing.T) {
 	settings := Statistic.GetAllStatistics(1)
-	if 4 != len(settings) {
-		t.Errorf("expected is [%d], actual is [%d]", 4, len(settings))
+	if 3 != len(settings) {
+		t.Errorf("expected is [%d], actual is [%d]", 3, len(settings))
 	}
 }