A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
update tag delete
aichy126cbc300ee19ac
diff --git a/go.mod b/go.modindex 0cdb7b76..f8692421 100644--- a/go.mod+++ b/go.mod@@ -35,12 +35,12 @@ require (github.com/segmentfault/pacman/contrib/server/http v0.0.0-20221018072427-a15dd1434e05github.com/spf13/cobra v1.6.1github.com/stretchr/testify v1.8.1- github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a+ github.com/swaggo/files v1.0.0github.com/swaggo/gin-swagger v1.5.3- github.com/swaggo/swag v1.8.7+ github.com/swaggo/swag v1.8.10github.com/yuin/goldmark v1.4.13golang.org/x/crypto v0.1.0- golang.org/x/net v0.1.0+ golang.org/x/net v0.2.0gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23dfgopkg.in/yaml.v3 v3.0.1modernc.org/sqlite v1.14.2@@ -118,7 +118,7 @@ require (go.uber.org/zap v1.23.0 // indirectgolang.org/x/image v0.1.0 // indirectgolang.org/x/mod v0.6.0 // indirect- golang.org/x/sys v0.1.0 // indirect+ golang.org/x/sys v0.2.0 // indirectgolang.org/x/text v0.5.0 // indirectgolang.org/x/tools v0.2.0 // indirectgoogle.golang.org/protobuf v1.28.1 // indirect@@ -139,4 +139,5 @@ require (// github action runner Sometimes it will time out.replace gitee.com/travelliu/dm v1.8.11192 => github.com/aichy126/dm v1.8.11192+replace modernc.org/z v1.2.19 => github.com/aichy126/modernc.org_z v1.2.19diff --git a/go.sum b/go.sumindex 3a2504b4..a84db432 100644--- a/go.sum+++ b/go.sum@@ -64,6 +64,8 @@ github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=github.com/agiledragon/gomonkey/v2 v2.3.1/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY=github.com/aichy126/dm v1.8.11192/go.mod h1:DHTzyhCrM843x9VdKVbZ+GKXGRbKM2sJ4LxihRxShkE=+github.com/aichy126/modernc.org_z v1.2.19 h1:g4KvQojkFWBJk47OGvKzuudTr5mRF7jORSwobYyc2Sc=+github.com/aichy126/modernc.org_z v1.2.19/go.mod h1:+ZpP0pc4zz97eukOzW3xagV/lS82IpPN9NGG5pNF9vY=github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=@@ -668,13 +670,14 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsgithub.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs=github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=-github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a h1:kAe4YSu0O0UFn1DowNo2MY5p6xzqtJ/wQ7LZynSvGaY=github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a/go.mod h1:lKJPbtWzJ9JhsTN1k1gZgleJWY/cqq0psdoMmaThG3w=+github.com/swaggo/files v1.0.0 h1:1gGXVIeUFCS/dta17rnP0iOpr6CXFwKD7EO5ID233e4=+github.com/swaggo/files v1.0.0/go.mod h1:N59U6URJLyU1PQgFqPM7wXLMhJx7QAolnvfQkqO13kc=github.com/swaggo/gin-swagger v1.5.3 h1:8mWmHLolIbrhJJTflsaFoZzRBYVmEE7JZGIq08EiC0Q=github.com/swaggo/gin-swagger v1.5.3/go.mod h1:3XJKSfHjDMB5dBo/0rrTXidPmgLeqsX89Yp4uA50HpI=github.com/swaggo/swag v1.8.1/go.mod h1:ugemnJsPZm/kRwFUnzBlbHRd0JY9zE1M4F+uy2pAaPQ=-github.com/swaggo/swag v1.8.7 h1:2K9ivTD3teEO+2fXV6zrZKDqk5IuU2aJtBDo8U7omWU=-github.com/swaggo/swag v1.8.7/go.mod h1:ezQVUUhly8dludpVk+/PuwJWvLLanB13ygV5Pr9enSk=+github.com/swaggo/swag v1.8.10 h1:eExW4bFa52WOjqRzRD58bgWsWfdFJso50lpbeTcmTfo=+github.com/swaggo/swag v1.8.10/go.mod h1:ezQVUUhly8dludpVk+/PuwJWvLLanB13ygV5Pr9enSk=github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=@@ -844,8 +847,8 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxgolang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=-golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=+golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=+golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=@@ -938,11 +941,12 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBcgolang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=+golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=@@ -1287,8 +1291,6 @@ modernc.org/tcl v1.8.13 h1:V0sTNBw0Re86PvXZxuCub3oO9WrSTqALgrwNZNvLFGw=modernc.org/tcl v1.8.13/go.mod h1:V+q/Ef0IJaNUSECieLU4o+8IScapxnMyFV6i/7uQlAY=modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk=modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=-modernc.org/z v1.2.19 h1:BGyRFWhDVn5LFS5OcX4Yd/MlpRTOc7hOPTdcIpCiUao=-modernc.org/z v1.2.19/go.mod h1:+ZpP0pc4zz97eukOzW3xagV/lS82IpPN9NGG5pNF9vY=rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=diff --git a/i18n/en_US.yaml b/i18n/en_US.yamlindex e02c3382..a1bee5c8 100644--- a/i18n/en_US.yaml+++ b/i18n/en_US.yaml@@ -108,6 +108,8 @@ backend:other: Should not contain synonym tags.cannot_update:other: No permission to update.+ is_used_cannot_delete:+ other: "You cannot delete a tag that is in use"cannot_set_synonym_as_itself:other: You cannot set the synonym of the current tag as itself.smtp:diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yamlindex ba0770ef..7cc0694f 100644--- a/i18n/zh_CN.yaml+++ b/i18n/zh_CN.yaml@@ -105,6 +105,8 @@ backend:other: "不应包含同义词标签。"cannot_update:other: "没有更新标签权限。"+ is_used_cannot_delete:+ other: "您不能删除正在被使用的标签"cannot_set_synonym_as_itself:other: "您不能将当前标签的同义词设置为本身。"smtp:diff --git a/internal/base/reason/reason.go b/internal/base/reason/reason.goindex bc726d1f..a33e33cc 100644--- a/internal/base/reason/reason.go+++ b/internal/base/reason/reason.go@@ -43,6 +43,7 @@ const (TagNotFound = "error.tag.not_found"TagNotContainSynonym = "error.tag.not_contain_synonym_tags"TagCannotUpdate = "error.tag.cannot_update"+ TagIsUsedCannotDelete = "error.tag.is_used_cannot_delete"RankFailToMeetTheCondition = "error.rank.fail_to_meet_the_condition"ThemeNotFound = "error.theme.not_found"LangNotFound = "error.lang.not_found"diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.goindex 1d938eb5..d4c4d256 100644--- a/internal/service/tag/tag_service.go+++ b/internal/service/tag/tag_service.go@@ -50,6 +50,15 @@ func NewTagService(// RemoveTag delete tagfunc (ts *TagService) RemoveTag(ctx context.Context, req *schema.RemoveTagReq) (err error) {+ tagCount, err := ts.tagCommonService.CountTagRelByTagID(ctx, req.TagID)+ if err != nil {+ return err+ }+ //If the tag has associated problems, it cannot be deleted+ if tagCount > 0 {+ return errors.BadRequest(reason.TagIsUsedCannotDelete)+ }+ // tagRelRepoerr = ts.tagRepo.RemoveTag(ctx, req.TagID)if err != nil {return errdiff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.goindex 004b05db..824a46ee 100644--- a/internal/service/tag_common/tag_common.go+++ b/internal/service/tag_common/tag_common.go@@ -563,6 +563,10 @@ func (ts *TagCommonService) ObjectChangeTag(ctx context.Context, objectTagData *return nil}+func (ts *TagCommonService) CountTagRelByTagID(ctx context.Context, tagID string) (count int64, err error) {+ return ts.tagRelRepo.CountTagRelByTagID(ctx, tagID)+}+// RefreshTagQuestionCount refresh tag question countfunc (ts *TagCommonService) RefreshTagQuestionCount(ctx context.Context, tagIDs []string) (err error) {for _, tagID := range tagIDs {