Issue/#19 #50
Merged
Issue/#19 #50
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pkg/dkwatcher/dkwatcher.go
Outdated
Comment on lines
108
to
134
| nextTalk, err := track.Talks.GetNextTalk() | ||
| if err != nil { | ||
| logger.Info("nextTalk is none") | ||
| continue | ||
| } | ||
| if !track.Talks.IsStartNextTalkSoon(howManyMinutesUntilNotify) { | ||
| logger.Info("nextTalk is not start soon. trackNo:%s", track.Id) | ||
| continue | ||
| } | ||
| val, err := redisClient.GetNextTalkNotification(ctx, int(nextTalk.Id)) | ||
| if err != nil { | ||
| logger.Error(xerrors.Errorf("message: %w", err), "db.GetNextTalkNotification() was failed") | ||
| return err | ||
| } | ||
| if val != "" { | ||
| logger.Info("nextTalkNotification already sent . trackNo:%s", track.Id) | ||
| continue | ||
| } | ||
| currentTalk, err := track.Talks.GetCurrentTalk() | ||
| if err != nil { | ||
| logger.Info("currentTalk is none") | ||
| currentTalk = &model.Talk{} | ||
| } | ||
| if err := mw.SetTrack(track); err != nil { | ||
| logger.Error(xerrors.Errorf("message: %w", err), "mw.SetTrack was failed") | ||
| continue | ||
| } |
There was a problem hiding this comment.
dreamkast から取得してきたデータはまず mw に保存して、それから dkwatcher -> notifier に通知するかを判断するべきです。(でないと obswatcher が古いタイムテーブルを見続ける可能性があるため)
そのため、mw.SetTrack() を 108 行目に移動してもらえますか？
There was a problem hiding this comment.
ありがとうございます。確かに先にmwに保存するべきですね。
f7dd3c1
pkg/dkwatcher/dkwatcher.go
Outdated
Comment on lines
117
to
125
| val, err := redisClient.GetNextTalkNotification(ctx, int(nextTalk.Id)) | ||
| if err != nil { | ||
| logger.Error(xerrors.Errorf("message: %w", err), "db.GetNextTalkNotification() was failed") | ||
| return err | ||
| } | ||
| if val != "" { | ||
| logger.Info("nextTalkNotification already sent . trackNo:%s", track.Id) | ||
| continue | ||
| } |
There was a problem hiding this comment.
(nits なので直さなくて問題ないです)
- ここで取り出す val は early return するかどうかの判断以外に利用しないので、以下のようにスコープを閉じてしまう書き方をするほうが自分は好きです (val をここ以外で利用しないことが明確になるため)
if val, err := redisClient.GetNextTalkNotification(ctx, int(nextTalk.Id)); err != nil {
logger.Error(xerrors.Errorf("message: %w", err), "db.GetNextTalkNotification() was failed")
return err
} else if val != "" {
logger.Info("nextTalkNotification already sent . trackNo:%s", track.Id)
continue
}
|
PR 出しました、確認お願いします #55 |
ありがとうございます、mergeさせていただきました |
ShotaKitazawa
approved these changes
Oct 23, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ref: #19