Skip to content

Commit 128c44f

Browse files
kumfokumfo
committed
feat(menu): update schema to remove deprecated min_tags and add MinimumTags to SiteQuestionsReq
1 parent 3264fdd commit 128c44f

6 files changed

Lines changed: 35 additions & 46 deletions

File tree

‎docs/docs.go‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10982,12 +10982,7 @@ const docTemplate = `{
1098210982
"$ref": "#/definitions/schema.SiteInterfaceSettingsResp"
1098310983
},
1098410984
"login": {
10985-
"description": "todo",
10986-
"allOf": [
10987-
{
10988-
"$ref": "#/definitions/schema.SiteLoginResp"
10989-
}
10990-
]
10985+
"$ref": "#/definitions/schema.SiteLoginResp"
1099110986
},
1099210987
"revision": {
1099310988
"type": "string"
@@ -11163,6 +11158,11 @@ const docTemplate = `{
1116311158
"maximum": 65535,
1116411159
"minimum": 0
1116511160
},
11161+
"min_tags": {
11162+
"type": "integer",
11163+
"maximum": 5,
11164+
"minimum": 0
11165+
},
1116611166
"restrict_answer": {
1116711167
"type": "boolean"
1116811168
}
@@ -11176,6 +11176,11 @@ const docTemplate = `{
1117611176
"maximum": 65535,
1117711177
"minimum": 0
1117811178
},
11179+
"min_tags": {
11180+
"type": "integer",
11181+
"maximum": 5,
11182+
"minimum": 0
11183+
},
1117911184
"restrict_answer": {
1118011185
"type": "boolean"
1118111186
}
@@ -11260,11 +11265,6 @@ const docTemplate = `{
1126011265
"schema.SiteTagsReq": {
1126111266
"type": "object",
1126211267
"properties": {
11263-
"min_tags": {
11264-
"type": "integer",
11265-
"maximum": 5,
11266-
"minimum": 0
11267-
},
1126811268
"recommend_tags": {
1126911269
"type": "array",
1127011270
"items": {
@@ -11285,11 +11285,6 @@ const docTemplate = `{
1128511285
"schema.SiteTagsResp": {
1128611286
"type": "object",
1128711287
"properties": {
11288-
"min_tags": {
11289-
"type": "integer",
11290-
"maximum": 5,
11291-
"minimum": 0
11292-
},
1129311288
"recommend_tags": {
1129411289
"type": "array",
1129511290
"items": {

‎docs/swagger.json‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10974,12 +10974,7 @@
1097410974
"$ref": "#/definitions/schema.SiteInterfaceSettingsResp"
1097510975
},
1097610976
"login": {
10977-
"description": "todo",
10978-
"allOf": [
10979-
{
10980-
"$ref": "#/definitions/schema.SiteLoginResp"
10981-
}
10982-
]
10977+
"$ref": "#/definitions/schema.SiteLoginResp"
1098310978
},
1098410979
"revision": {
1098510980
"type": "string"
@@ -11155,6 +11150,11 @@
1115511150
"maximum": 65535,
1115611151
"minimum": 0
1115711152
},
11153+
"min_tags": {
11154+
"type": "integer",
11155+
"maximum": 5,
11156+
"minimum": 0
11157+
},
1115811158
"restrict_answer": {
1115911159
"type": "boolean"
1116011160
}
@@ -11168,6 +11168,11 @@
1116811168
"maximum": 65535,
1116911169
"minimum": 0
1117011170
},
11171+
"min_tags": {
11172+
"type": "integer",
11173+
"maximum": 5,
11174+
"minimum": 0
11175+
},
1117111176
"restrict_answer": {
1117211177
"type": "boolean"
1117311178
}
@@ -11252,11 +11257,6 @@
1125211257
"schema.SiteTagsReq": {
1125311258
"type": "object",
1125411259
"properties": {
11255-
"min_tags": {
11256-
"type": "integer",
11257-
"maximum": 5,
11258-
"minimum": 0
11259-
},
1126011260
"recommend_tags": {
1126111261
"type": "array",
1126211262
"items": {
@@ -11277,11 +11277,6 @@
1127711277
"schema.SiteTagsResp": {
1127811278
"type": "object",
1127911279
"properties": {
11280-
"min_tags": {
11281-
"type": "integer",
11282-
"maximum": 5,
11283-
"minimum": 0
11284-
},
1128511280
"recommend_tags": {
1128611281
"type": "array",
1128711282
"items": {

‎docs/swagger.yaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2210,9 +2210,7 @@ definitions:
22102210
interface:
22112211
$ref: '#/definitions/schema.SiteInterfaceSettingsResp'
22122212
login:
2213-
allOf:
2214-
- $ref: '#/definitions/schema.SiteLoginResp'
2215-
description: todo
2213+
$ref: '#/definitions/schema.SiteLoginResp'
22162214
revision:
22172215
type: string
22182216
site_advanced:
@@ -2330,6 +2328,10 @@ definitions:
23302328
maximum: 65535
23312329
minimum: 0
23322330
type: integer
2331+
min_tags:
2332+
maximum: 5
2333+
minimum: 0
2334+
type: integer
23332335
restrict_answer:
23342336
type: boolean
23352337
type: object
@@ -2339,6 +2341,10 @@ definitions:
23392341
maximum: 65535
23402342
minimum: 0
23412343
type: integer
2344+
min_tags:
2345+
maximum: 5
2346+
minimum: 0
2347+
type: integer
23422348
restrict_answer:
23432349
type: boolean
23442350
type: object
@@ -2396,10 +2402,6 @@ definitions:
23962402
type: object
23972403
schema.SiteTagsReq:
23982404
properties:
2399-
min_tags:
2400-
maximum: 5
2401-
minimum: 0
2402-
type: integer
24032405
recommend_tags:
24042406
items:
24052407
$ref: '#/definitions/schema.SiteWriteTag'
@@ -2413,10 +2415,6 @@ definitions:
24132415
type: object
24142416
schema.SiteTagsResp:
24152417
properties:
2416-
min_tags:
2417-
maximum: 5
2418-
minimum: 0
2419-
type: integer
24202418
recommend_tags:
24212419
items:
24222420
$ref: '#/definitions/schema.SiteWriteTag'

‎internal/migrations/v30.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ func splitWriteMenu(ctx context.Context, x *xorm.Engine) error {
8080
}
8181
// site questions settings
8282
siteQuestions := &schema.SiteQuestionsResp{
83+
MinimumTags: siteWrite.MinimumTags,
8384
MinimumContent: siteWrite.MinimumContent,
8485
RestrictAnswer: siteWrite.RestrictAnswer,
8586
}
8687
// site tags settings
8788
siteTags := &schema.SiteTagsResp{
8889
ReservedTags: siteWrite.ReservedTags,
8990
RecommendTags: siteWrite.RecommendTags,
90-
MinimumTags: siteWrite.MinimumTags,
9191
RequiredTag: siteWrite.RequiredTag,
9292
}
9393

‎internal/schema/siteinfo_schema.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ type SiteBrandingReq struct {
8888
}
8989

9090
// SiteWriteReq site write request
91+
// Deprecated: use SiteQuestionsReq, SiteAdvancedReq and SiteTagsReq instead
9192
type SiteWriteReq struct {
9293
MinimumContent int `validate:"omitempty,gte=0,lte=65535" json:"min_content"`
9394
RestrictAnswer bool `validate:"omitempty" json:"restrict_answer"`
@@ -107,6 +108,7 @@ type SiteWriteResp SiteWriteReq
107108

108109
// SiteQuestionsReq site questions settings request
109110
type SiteQuestionsReq struct {
111+
MinimumTags int `validate:"omitempty,gte=0,lte=5" json:"min_tags"`
110112
MinimumContent int `validate:"omitempty,gte=0,lte=65535" json:"min_content"`
111113
RestrictAnswer bool `validate:"omitempty" json:"restrict_answer"`
112114
}
@@ -124,7 +126,6 @@ type SiteAdvancedReq struct {
124126
type SiteTagsReq struct {
125127
ReservedTags []*SiteWriteTag `validate:"omitempty,dive" json:"reserved_tags"`
126128
RecommendTags []*SiteWriteTag `validate:"omitempty,dive" json:"recommend_tags"`
127-
MinimumTags int `validate:"omitempty,gte=0,lte=5" json:"min_tags"`
128129
RequiredTag bool `validate:"omitempty" json:"required_tag"`
129130
UserID string `json:"-"`
130131
}

‎internal/service/tag_common/tag_common.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ func (ts *TagCommonService) ExistRecommend(ctx context.Context, tags []*schema.T
295295
}
296296

297297
func (ts *TagCommonService) GetMinimumTags(ctx context.Context) (int, error) {
298-
siteInfo, err := ts.siteInfoService.GetSiteTag(ctx)
298+
siteInfo, err := ts.siteInfoService.GetSiteQuestion(ctx)
299299
if err != nil {
300300
return 1, err
301301
}

0 commit comments

Comments
 (0)