Skip to content

Commit

Permalink
refactor: rm topic (#274)
Browse files Browse the repository at this point in the history
  • Loading branch information
trim21 authored Jan 2, 2023
1 parent 62864c7 commit b454fc6
Show file tree
Hide file tree
Showing 75 changed files with 179 additions and 8,210 deletions.
2 changes: 1 addition & 1 deletion Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ tasks:
- ./cmd/gen/gorm/main.go
- go.mod
cmds:
- go run ./cmd/gen/gorm/main.go
- go run --tags gen ./cmd/gen/gorm/main.go

clean:
cmds:
Expand Down
92 changes: 0 additions & 92 deletions cmd/gen/dal/comment.go

This file was deleted.

57 changes: 0 additions & 57 deletions cmd/gen/dal/template/comments.go

This file was deleted.

28 changes: 0 additions & 28 deletions cmd/gen/dal/template/stub.go

This file was deleted.

79 changes: 0 additions & 79 deletions cmd/gen/gorm/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -405,85 +405,6 @@ func main() {
gen.FieldType("rev_creator", userIDTypeString),
))

g.ApplyBasic(g.GenerateModelAs("chii_groups", "Group",
gen.FieldTrimPrefix("grp_"),
gen.FieldType("grp_id", groupIDTypeString),
gen.FieldType("grp_accessible", "uint8"),
gen.FieldType("grp_creator", userIDTypeString),
gen.FieldRename("grp_creator", "CreatorID"),
gen.FieldRename("grp_desc", "Description"),
gen.FieldRename("grp_builddate", createdTime),
gen.FieldRename("grp_lastpost", "LastPostedTime"),
gen.FieldComment("grp_lastpost", "目前永远是0"),
))

g.ApplyBasic(g.GenerateModelAs("chii_group_members", "GroupMember",
gen.FieldTrimPrefix("gmb_"),
gen.FieldRename("gmb_uid", "UserID"),
gen.FieldType("gmb_uid", userIDTypeString),
gen.FieldType("gmb_gid", groupIDTypeString),
gen.FieldRename("gmb_gid", "GroupID"),
gen.FieldRename("gmb_dateline", createdTime),
))

g.ApplyBasic(g.GenerateModelAs("chii_subject_topics", "SubjectTopic",
gen.FieldTrimPrefix("sbj_tpc_"),
gen.FieldRename("sbj_tpc_subject_id", "SubjectID"),
gen.FieldRename("sbj_tpc_dateline", createdTime),
gen.FieldRename("sbj_tpc_lastpost", "UpdatedTime"),
gen.FieldRename("sbj_tpc_display", "Display"),
gen.FieldType("sbj_tpc_state", "uint8"),
gen.FieldType("sbj_tpc_display", "uint8"),
))

g.ApplyBasic(g.GenerateModelAs("chii_group_topics", "GroupTopic",
gen.FieldTrimPrefix("grp_tpc_"),
gen.FieldRename("grp_tpc_gid", "GroupID"),
gen.FieldRename("grp_tpc_dateline", createdTime),
gen.FieldRename("grp_tpc_lastpost", "UpdatedTime"),
gen.FieldRename("grp_tpc_display", "Display"),
gen.FieldType("grp_tpc_state", "uint8"),
gen.FieldType("grp_tpc_display", "uint8"),
))

g.ApplyBasic(g.GenerateModelAs("chii_subject_posts", "SubjectTopicComment",
gen.FieldTrimPrefix("sbj_pst_"),
gen.FieldRename("sbj_pst_mid", "TopicID"),
gen.FieldType("sbj_pst_state", "uint8"),
gen.FieldRename("sbj_pst_dateline", createdTime),
))

g.ApplyBasic(g.GenerateModelAs("chii_group_posts", "GroupTopicComment",
gen.FieldTrimPrefix("grp_pst_"),
gen.FieldRename("grp_pst_mid", "TopicID"),
gen.FieldType("grp_pst_state", "uint8"),
gen.FieldRename("grp_pst_dateline", createdTime),
))

g.ApplyBasic(g.GenerateModelAs("chii_ep_comments", "EpisodeComment",
gen.FieldTrimPrefix("ep_pst_"),
gen.FieldRename("ep_pst_mid", "TopicID"),
gen.FieldRename("ep_pst_dateline", createdTime),
))

g.ApplyBasic(g.GenerateModelAs("chii_crt_comments", "CharacterComment",
gen.FieldTrimPrefix("crt_pst_"),
gen.FieldRename("crt_pst_mid", "TopicID"),
gen.FieldRename("crt_pst_dateline", createdTime),
))

g.ApplyBasic(g.GenerateModelAs("chii_index_comments", "IndexComment",
gen.FieldTrimPrefix("idx_pst_"),
gen.FieldRename("idx_pst_mid", "TopicID"),
gen.FieldRename("idx_pst_dateline", createdTime),
))

g.ApplyBasic(g.GenerateModelAs("chii_prsn_comments", "PersonComment",
gen.FieldTrimPrefix("prsn_pst_"),
gen.FieldRename("prsn_pst_mid", "TopicID"),
gen.FieldRename("prsn_pst_dateline", createdTime),
))

g.ApplyBasic(g.GenerateModelAs("chii_friends", "Friend",
gen.FieldTrimPrefix("frd_"),
gen.FieldType("frd_uid", userIDTypeString),
Expand Down
6 changes: 2 additions & 4 deletions cmd/web/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"github.com/bangumi/server/internal/character"
"github.com/bangumi/server/internal/collection"
"github.com/bangumi/server/internal/episode"
"github.com/bangumi/server/internal/group"
"github.com/bangumi/server/internal/index"
"github.com/bangumi/server/internal/notification"
"github.com/bangumi/server/internal/oauth"
Expand All @@ -44,7 +43,6 @@ import (
"github.com/bangumi/server/internal/search"
"github.com/bangumi/server/internal/subject"
"github.com/bangumi/server/internal/timeline"
"github.com/bangumi/server/internal/topic"
"github.com/bangumi/server/internal/user"
"github.com/bangumi/server/web"
)
Expand Down Expand Up @@ -86,11 +84,11 @@ func start() error {

character.NewMysqlRepo, subject.NewMysqlRepo, user.NewUserRepo, person.NewMysqlRepo,
index.NewMysqlRepo, auth.NewMysqlRepo, episode.NewMysqlRepo, revision.NewMysqlRepo, collection.NewMysqlRepo,
topic.NewMysqlRepo, timeline.NewMysqlRepo, pm.NewMysqlRepo, notification.NewMysqlRepo,
timeline.NewMysqlRepo, pm.NewMysqlRepo, notification.NewMysqlRepo,

dam.New,

auth.NewService, person.NewService, group.NewMysqlRepo, search.New,
auth.NewService, person.NewService, search.New,
),

ctrl.Module,
Expand Down
4 changes: 0 additions & 4 deletions ctrl/ctrl.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"github.com/bangumi/server/internal/pm"
"github.com/bangumi/server/internal/subject"
"github.com/bangumi/server/internal/timeline"
"github.com/bangumi/server/internal/topic"
"github.com/bangumi/server/internal/user"
)

Expand All @@ -42,7 +41,6 @@ func New(
index index.Repo,
timeline timeline.Repo,
user user.Repo,
topic topic.Repo,
tx dal.Transaction,
dam dam.Dam,
privateMessage pm.Repo,
Expand All @@ -56,7 +54,6 @@ func New(
dam: dam,

user: user,
topic: topic,
person: person,
episode: episode,
subject: subject,
Expand All @@ -76,7 +73,6 @@ type Ctrl struct {
dam dam.Dam

user user.Repo
topic topic.Repo
person person.Repo
episode episode.Repo
subject subject.Repo
Expand Down
1 change: 1 addition & 0 deletions ctrl/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ package ctrl
import "errors"

var ErrOffsetTooBig = errors.New("limit too big")
var ErrInvalidInput = errors.New("invalid input")
Loading

0 comments on commit b454fc6

Please sign in to comment.