Improve /v1/publication/estimate api.

src/api/publication.go

@@ -64,17 +64,12 @@ func (a *Publication) Estimate(ctx *gear.Context) error {
 		return gear.ErrInternalServerError.From(err)
 	}
 
-	teContents, err := src.ToTEContents()
-	if err != nil {
-		return gear.ErrInternalServerError.From(err)
-	}
-
-	teTokens, _ := json.Marshal(teContents)
+	teTokens, err := src.ToEstimateToken()
 	if err != nil {
 		return gear.ErrInternalServerError.From(err)
 	}
 
-	tokens := a.blls.Tiktokens(string(teTokens)) * 2
+	tokens := a.blls.Tiktokens(teTokens) * 2
 	output := &EstimateOutput{
 		Balance: wallet.Balance(),
 		Tokens:  tokens,
@@ -130,18 +125,18 @@ func (a *Publication) Create(ctx *gear.Context) error {
 	}
 
 	if wallet.Balance() < 1 {
-		return gear.ErrPaymentRequired.WithMsgf("insufficient balance")
+		return gear.ErrPaymentRequired.WithMsg("insufficient balance")
 	}
 
-	_, err = a.blls.Writing.GetPublication(ctx, &bll.QueryPublication{
+	dst, _ := a.blls.Writing.GetPublication(ctx, &bll.QueryPublication{
 		GID:      input.GID,
 		CID:      input.CID,
 		Language: *input.ToLanguage,
 		Version:  input.Version,
 		Fields:   "status,creator,updated_at",
 	})
-	if err == nil {
-		return gear.ErrConflict.WithMsg("%s publication already exists", *input.ToLanguage)
+	if dst != nil {
+		return gear.ErrConflict.WithMsgf("%s publication already exists", *input.ToLanguage)
 	}
 
 	src, err := a.blls.Writing.GetPublication(ctx, &bll.QueryPublication{

src/bll/writing_publication.go

@@ -2,6 +2,7 @@ package bll
 
 import (
 	"context"
+	"encoding/json"
 	"net/url"
 	"strconv"
 
@@ -155,6 +156,26 @@ func (i *PublicationOutput) ToTEContents() (content.TEContents, error) {
 	return contents, nil
 }
 
+func (i *PublicationOutput) ToEstimateToken() (string, error) {
+	if i.Content == nil {
+		return "", gear.ErrInternalServerError.WithMsg("empty content")
+	}
+	doc, err := content.ParseDocumentNode(*i.Content)
+	if err != nil {
+		return "", gear.ErrInternalServerError.From(err)
+	}
+	contents := doc.ToTEContents()
+	for i := range contents {
+		contents[i].ID = ""
+	}
+
+	teTokens, err := json.Marshal(contents)
+	if err != nil {
+		return "", gear.ErrInternalServerError.From(err)
+	}
+	return string(teTokens), nil
+}
+
 func (i *PublicationOutput) IntoPublicationDraft(gid util.ID, language, model string, input []byte) (*PublicationDraft, error) {
 	draft := &PublicationDraft{
 		GID:      gid,