目录直接相关的 API #234

RanKKI · 2022-10-08T12:26:54Z

v0.Post("/indices", req.JSON, h.NeedLogin, h.NewIndex)
v0.Put("/indices/:id", req.JSON, h.NeedLogin, h.UpdateIndex)
// v0.Delete("/indices/:id", h.NeedLogin, h.DeleteIndex) 该 PR 不实现该方法，相关代码已删除

v0.Post("/indices/:id/subjects", req.JSON, h.NeedLogin, h.AddIndexSubject)
v0.Put("/indices/:id/subjects/:subject_id", req.JSON, h.NeedLogin, h.UpdateIndexSubject)
v0.Delete("/indices/:id/subjects/:subject_id", h.NeedLogin, h.RemoveIndexSubject)

h.i.Get may return two type of errors, not found and db error resp should behave differently

netlify · 2022-10-08T12:27:05Z

✅ Deploy Preview for bangumi-org-server ready!

Name	Link
🔨 Latest commit	`6ce4fa6`
🔍 Latest deploy log	https://app.netlify.com/sites/bangumi-org-server/deploys/635676879337b400086976dd
😎 Deploy Preview	https://deploy-preview-234--bangumi-org-server.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

internal/web/res/index.go

codecov · 2022-10-08T12:30:01Z

Codecov Report

Base: 49.55% // Head: 51.07% // Increases project coverage by +1.52% 🎉

Coverage data is based on head (6ce4fa6) compared to base (4f2558d).
Patch coverage: 72.95% of modified lines in pull request are covered.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #234      +/-   ##
==========================================
+ Coverage   49.55%   51.07%   +1.52%     
==========================================
  Files         198      204       +6     
  Lines        7804     8153     +349     
==========================================
+ Hits         3867     4164     +297     
- Misses       3480     3507      +27     
- Partials      457      482      +25

Impacted Files	Coverage Δ
internal/model/subject.go	`44.44% <ø> (ø)`
internal/model/timeline.go	`32.35% <ø> (+32.35%)`	⬆️
internal/web/handler/comments.go	`11.04% <0.00%> (ø)`
main.go	`0.00% <ø> (ø)`
internal/ctrl/get_index.go	`34.48% <34.48%> (ø)`
internal/pkg/generic/conv.go	`40.00% <40.00%> (ø)`
internal/web/handler/index/subject.go	`53.57% <53.57%> (ø)`
internal/web/handler/index/index.go	`43.06% <68.91%> (ø)`
internal/index/mysql_repository.go	`70.00% <76.36%> (+15.58%)`	⬆️
internal/ctrl/update_subject_collection.go	`68.14% <82.50%> (+6.04%)`	⬆️
... and 17 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

trim21 · 2022-10-12T04:38:47Z

这个PR是可以review了吗？改一下openapi文件？

internal/web/res/index.go

RanKKI · 2022-10-12T05:14:38Z

这个PR是可以review了吗？改一下openapi文件？

不好意思，这两天在忙别的，先 review 代码吧， openapi 我今天晚点补上

internal/index/mysql_repository.go

internal/index/mysql_repository_test.go

internal/model/index.go

internal/web/handler.go

internal/web/handler/index.go

This reverts commit dbcd78e.

trim21 · 2022-10-15T12:46:50Z

看下slack私聊

internal/web/res/index.go

openapi/v0.yaml

internal/web/handler/index.go

trim21 · 2022-10-15T17:27:23Z

internal/index/mysql_repository.go

 			Comment: s.Comment,
 			Subject: sub,
 		}
 	}

 	return results, nil
 }
+
+func (r mysqlRepo) AddOrUpdateIndexSubject(


这个是不是应该包在一个事务里

不需要吧，前面都是查询，后面要么改或者增，没必要用事务

但我觉得这要加锁，避免创建两份目录

不需要吧，前面都是查询，后面要么改或者增，没必要用事务

但我觉得这要加锁，避免创建两份目录

同时发两个请求的话有可能添加两个条目进目录吧，或者因为有unique key（没看sql表怎么定义的）而出错

嗯，用事务也没法解决。
感觉对于这种创建资源的还是应该是一定时间内阻止一样的请求 #233

这个要不我写个中间件 drop 请求吧.. 没啥别的好的想法解决这个问题了

trim21 · 2022-10-15T17:50:18Z

subject.ConvertDao 本来是没想导出的，ListSubjects应该在controller上面做的。

（在我其他地方是这么写的，但不是很确定是不是最好的办法，会不会太过繁琐了一点。）

trim21 · 2022-10-15T19:47:30Z

咨询一下，
CREATE TABLE
  IF NOT EXISTS `chii_index_related` (
    `idx_rlt_cat` TINYINT(3) NOT NULL,
    `idx_rlt_type` SMALLINT(6) UNSIGNED NOT NULL COMMENT '关联条目类型',
  ) ENGINE = MyISAM DEFAULT CHARSET = utf8 COMMENT = '目录关联表';
这里的 cat 我没理解错应该是 category，是目录里筛选条目类型的东西，但 type 是干这事的.. 是弃用的字段么

这个type是条目类型，cat不知道是什么，可能只是我们没用到。

RanKKI · 2022-10-16T01:19:48Z

这个type是条目类型，cat不知道是什么，可能只是我们没用到。

我看了下代码，之前是用 cat 做的分类，没有见到过 type 字段。

昨天还发现一点问题， ListSubjects 接口的 type 不支持传入 person 和 character 两个值

trim21 · 2022-10-16T11:20:49Z

这个type是条目类型，cat不知道是什么，可能只是我们没用到。

我看了下代码，之前是用 cat 做的分类，没有见到过 type 字段。

昨天还发现一点问题， ListSubjects 接口的 type 不支持传入 person 和 character 两个值

我突然发现忘了做角色和人物的相关功能了，你有兴趣补一下吗（

RanKKI · 2022-10-17T03:51:16Z

我先把目录的补完吧，
期末了要准备 Final 了，时间不是很多，结束如果没有人搞我可以来整。

trim21 · 2022-10-17T05:53:47Z

我先把目录的补完吧，期末了要准备 Final 了，时间不是很多，结束如果没有人搞我可以来整。

OK

trim21 · 2022-10-17T05:53:58Z

合并一下主线（

trim21 · 2022-10-21T10:38:35Z

lint没过

RanKKI · 2022-10-21T11:10:48Z

是 ctrl 里的一个lint，我打算再开个pr修来着，毕竟和这次功能没啥关系..Hugh(Hui) LiuKind Regards On Oct 21, 2022, at 18:38, Trim21 ***@***.***> wrote: lint没过 —Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you authored the thread.Message ID: ***@***.***>

trim21 · 2022-10-21T12:29:56Z

需要把 func (ctrl Ctrl) GetIndexWithCache(c context.Context, id uint32) (res.Index, bool, error) { 改成 func (ctl Ctrl) GetIndexWithCache(c context.Context, id uint32) (res.Index, bool, error) {

trim21 · 2022-10-21T12:30:07Z

报错是报在了其他文件，但是是这个PR引起的

RanKKI · 2022-10-22T03:13:08Z

报错是报在了其他文件，但是是这个PR引起的

发现了.. 我这报错在 internal/ctrl/count_episode_for_subject.go:30:17: 但是是因为 index.go...
改好了。

trim21 · 2022-10-24T08:49:05Z

sai老板还在摸，再等等（

trim21 · 2022-10-24T10:51:01Z

sai老板给权限了（

和了一个别的PR，有个冲突

trim21 · 2022-10-24T11:34:46Z

internal/index/mysql_repository.go

+
+	indexSubject, err := r.q.IndexSubject.WithContext(ctx).
+		Where(r.q.IndexSubject.IndexID.Eq(id), r.q.IndexSubject.SubjectID.Eq(uint32(subjectID))).
+		FirstOrInit()


FirstOrInit还会返回gorm.ErrRecordNotFound吗?

而且这里Init了，indexSubject.ID还是0吗。

FirstOrInit还会返回gorm.ErrRecordNotFound吗?

不会，确实判断的有点多余了

而且这里Init了，indexSubject.ID还是0吗。

这里主要是初始化对象，使 indexSubject 不会是 nil，然后里面的数据都是默认值， Int 默认就是 0

那下面convertDao失败的话岂不是会留一条错误纪录在里面...

咦，convertDao 在 firstOrInit 上面呀。

如果 convert 失败了，错误就直接出去了。

啊确实，看错了

RanKKI added 11 commits October 4, 2022 20:50

feat(indices): add router

019c648

feat(indices): create new index

b210d38

feat(indices): update index's infomation

c215d64

feat(indices): delete index

055e32b

feat(indices): update time of index

cfa4cc2

style(db): remove useless options

5bf8aed

style(indices): use 'description' instead of 'desc'

a04bade

fix(indices): error handler

f05dec9

h.i.Get may return two type of errors, not found and db error resp should behave differently

feat(indices): CURD subjects in the index

3cbd443

style(indices): lint error

b02c841

test(indices): delete/add non-exists index/indexsubject

757c3bf

RanKKI marked this pull request as ready for review October 8, 2022 12:28

trim21 reviewed Oct 8, 2022

View reviewed changes

internal/web/res/index.go Show resolved Hide resolved

fix(indices): response key & lint error

c494a80

trim21 reviewed Oct 12, 2022

View reviewed changes

internal/web/res/index.go Outdated Show resolved Hide resolved

trim21 reviewed Oct 12, 2022

View reviewed changes

internal/index/mysql_repository.go Show resolved Hide resolved

trim21 reviewed Oct 12, 2022

View reviewed changes

internal/index/mysql_repository_test.go Show resolved Hide resolved

trim21 reviewed Oct 12, 2022

View reviewed changes

internal/model/index.go Outdated Show resolved Hide resolved

trim21 reviewed Oct 12, 2022

View reviewed changes

internal/web/handler.go Outdated Show resolved Hide resolved

RanKKI added 4 commits October 12, 2022 15:21

remove: delete index

dbcd78e

style: use past tense variable name

70eca4c

test(indices): test on new index not the exists index in the test DB"

24a920e

docs: api info

bfae787

trim21 reviewed Oct 12, 2022

View reviewed changes

internal/web/handler/index.go Outdated Show resolved Hide resolved

RanKKI added 2 commits October 12, 2022 19:39

Revert "remove: delete index"

e09984d

This reverts commit dbcd78e.

remove: api of delete index

b99f86c

trim21 reviewed Oct 15, 2022

View reviewed changes

internal/web/res/index.go Show resolved Hide resolved

trim21 reviewed Oct 15, 2022

View reviewed changes

openapi/v0.yaml Show resolved Hide resolved

trim21 requested changes Oct 15, 2022

View reviewed changes

RanKKI added 2 commits October 17, 2022 12:38

fix: response on invalid payload & invalidate cache after update

45a75b6

docs: decompose requried payload and response

d5da8a9

RanKKI added 4 commits October 17, 2022 14:03

Merge branch 'bangumi:master' into feat/indices_part_a

14f1eca

refactor: index package

f5298bb

refactor: indexID as param

4323205

feat: all input string should be printable

51d9451

fix: lint error

714b699

Merge branch 'master' into feat/indices_part_a

6ce4fa6

trim21 reviewed Oct 24, 2022

View reviewed changes

trim21 merged commit c1ee878 into bangumi:master Oct 24, 2022

RanKKI deleted the feat/indices_part_a branch November 10, 2022 11:11

RanKKI mentioned this pull request Nov 10, 2022

[Feature Request]: 目录 #230

Open

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

目录直接相关的 API #234

目录直接相关的 API #234

RanKKI commented Oct 8, 2022 •

edited

Loading

netlify bot commented Oct 8, 2022 •

edited

Loading

codecov bot commented Oct 8, 2022 •

edited

Loading

trim21 commented Oct 12, 2022

RanKKI commented Oct 12, 2022

trim21 commented Oct 15, 2022

trim21 Oct 15, 2022

RanKKI Oct 16, 2022

trim21 Oct 17, 2022

RanKKI Oct 18, 2022

RanKKI Oct 22, 2022

trim21 commented Oct 15, 2022 •

edited

Loading

trim21 commented Oct 15, 2022 •

edited

Loading

RanKKI commented Oct 16, 2022

trim21 commented Oct 16, 2022 •

edited

Loading

RanKKI commented Oct 17, 2022

trim21 commented Oct 17, 2022

trim21 commented Oct 17, 2022

trim21 commented Oct 21, 2022

RanKKI commented Oct 21, 2022 via email

trim21 commented Oct 21, 2022

trim21 commented Oct 21, 2022

RanKKI commented Oct 22, 2022

trim21 commented Oct 24, 2022

trim21 commented Oct 24, 2022

trim21 Oct 24, 2022

trim21 Oct 24, 2022 •

edited

Loading

RanKKI Oct 24, 2022

trim21 Oct 24, 2022

RanKKI Oct 24, 2022

trim21 Oct 24, 2022

目录直接相关的 API #234

目录直接相关的 API #234

Conversation

RanKKI commented Oct 8, 2022 • edited Loading

netlify bot commented Oct 8, 2022 • edited Loading

✅ Deploy Preview for bangumi-org-server ready!

codecov bot commented Oct 8, 2022 • edited Loading

Codecov Report

trim21 commented Oct 12, 2022

RanKKI commented Oct 12, 2022

trim21 commented Oct 15, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

trim21 commented Oct 15, 2022 • edited Loading

trim21 commented Oct 15, 2022 • edited Loading

RanKKI commented Oct 16, 2022

trim21 commented Oct 16, 2022 • edited Loading

RanKKI commented Oct 17, 2022

trim21 commented Oct 17, 2022

trim21 commented Oct 17, 2022

trim21 commented Oct 21, 2022

RanKKI commented Oct 21, 2022 via email

trim21 commented Oct 21, 2022

trim21 commented Oct 21, 2022

RanKKI commented Oct 22, 2022

trim21 commented Oct 24, 2022

trim21 commented Oct 24, 2022

Choose a reason for hiding this comment

trim21 Oct 24, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

RanKKI commented Oct 8, 2022 •

edited

Loading

netlify bot commented Oct 8, 2022 •

edited

Loading

codecov bot commented Oct 8, 2022 •

edited

Loading

trim21 commented Oct 15, 2022 •

edited

Loading

trim21 commented Oct 15, 2022 •

edited

Loading

trim21 commented Oct 16, 2022 •

edited

Loading

trim21 Oct 24, 2022 •

edited

Loading