Skip to content

Commit 49f7e51

Browse files
inochidaininiinochidainini
authored
Merge pull request #1417 from traPtitech/LauncherVersionToEditon
LauncherVersionをEditionに置き換え
2 parents b3a3c40 + 6494440 commit 49f7e51

36 files changed

+429
-429
lines changed

‎src/domain/game_play_log.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
type GamePlayLog struct {
1010
id values.GamePlayLogID
11-
editionID values.LauncherVersionID
11+
editionID values.EditionID
1212
gameID values.GameID
1313
gameVersionID values.GameVersionID
1414
startTime time.Time
@@ -19,7 +19,7 @@ type GamePlayLog struct {
1919

2020
func NewGamePlayLog(
2121
id values.GamePlayLogID,
22-
editionID values.LauncherVersionID,
22+
editionID values.EditionID,
2323
gameID values.GameID,
2424
gameVersionID values.GameVersionID,
2525
startTime time.Time,
@@ -43,7 +43,7 @@ func (g *GamePlayLog) GetID() values.GamePlayLogID {
4343
return g.id
4444
}
4545

46-
func (g *GamePlayLog) GetEditionID() values.LauncherVersionID {
46+
func (g *GamePlayLog) GetEditionID() values.EditionID {
4747
return g.editionID
4848
}
4949

‎src/domain/game_play_stats.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,19 @@ func (g *GamePlayStatsInEdition) GetPlayTime() time.Duration {
6666
}
6767

6868
type EditionPlayStats struct {
69-
editionID values.LauncherVersionID
70-
editionName values.LauncherVersionName
69+
editionID values.EditionID
70+
editionName values.EditionName
7171
totalPlayCount int
7272
totalPlayTime time.Duration
7373
gameStats []*GamePlayStatsInEdition
7474
hourlyStats []*HourlyPlayStats
7575
}
7676

77-
func (e *EditionPlayStats) GetEditionID() values.LauncherVersionID {
77+
func (e *EditionPlayStats) GetEditionID() values.EditionID {
7878
return e.editionID
7979
}
8080

81-
func (e *EditionPlayStats) GetEditionName() values.LauncherVersionName {
81+
func (e *EditionPlayStats) GetEditionName() values.EditionName {
8282
return e.editionName
8383
}
8484

@@ -123,7 +123,7 @@ func NewGamePlayStatsInEdition(gameID values.GameID, playCount int, playTime tim
123123
}
124124
}
125125

126-
func NewEditionPlayStats(editionID values.LauncherVersionID, editionName values.LauncherVersionName, totalPlayCount int, totalPlayTime time.Duration, gameStats []*GamePlayStatsInEdition, hourlyStats []*HourlyPlayStats) *EditionPlayStats {
126+
func NewEditionPlayStats(editionID values.EditionID, editionName values.EditionName, totalPlayCount int, totalPlayTime time.Duration, gameStats []*GamePlayStatsInEdition, hourlyStats []*HourlyPlayStats) *EditionPlayStats {
127127
return &EditionPlayStats{
128128
editionID: editionID,
129129
editionName: editionName,

‎src/domain/launcher_version.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,40 @@ import (
77
"github.com/traPtitech/trap-collection-server/src/domain/values"
88
)
99

10-
// LauncherVersion
10+
// Edition
1111
// ランチャーのバージョンを表すドメイン。
1212
// 現在の仕様では、バージョン名、アンケートURLの変更はできないため、
1313
// SetName、SetQuestionnaireURLは使われない。
1414
// 工大祭などのイベント用ランチャーバージョンではアンケートを持つが、
1515
// コミケでの販売用ランチャーバージョンではアンケートを持たない。
16-
type LauncherVersion struct {
17-
id values.LauncherVersionID
18-
name values.LauncherVersionName
16+
type Edition struct {
17+
id values.EditionID
18+
name values.EditionName
1919
haveQuestionnaire bool
20-
questionnaireURL values.LauncherVersionQuestionnaireURL
20+
questionnaireURL values.EditionQuestionnaireURL
2121
createdAt time.Time
2222
}
2323

24-
func NewLauncherVersionWithoutQuestionnaire(
25-
id values.LauncherVersionID,
26-
name values.LauncherVersionName,
24+
func NewEditionWithoutQuestionnaire(
25+
id values.EditionID,
26+
name values.EditionName,
2727
createdAt time.Time,
28-
) *LauncherVersion {
29-
return &LauncherVersion{
28+
) *Edition {
29+
return &Edition{
3030
id: id,
3131
name: name,
3232
haveQuestionnaire: false,
3333
createdAt: createdAt,
3434
}
3535
}
3636

37-
func NewLauncherVersionWithQuestionnaire(
38-
id values.LauncherVersionID,
39-
name values.LauncherVersionName,
40-
questionnaireURL values.LauncherVersionQuestionnaireURL,
37+
func NewEditionWithQuestionnaire(
38+
id values.EditionID,
39+
name values.EditionName,
40+
questionnaireURL values.EditionQuestionnaireURL,
4141
createdAt time.Time,
42-
) *LauncherVersion {
43-
return &LauncherVersion{
42+
) *Edition {
43+
return &Edition{
4444
id: id,
4545
name: name,
4646
haveQuestionnaire: true,
@@ -49,40 +49,40 @@ func NewLauncherVersionWithQuestionnaire(
4949
}
5050
}
5151

52-
func (lv *LauncherVersion) GetID() values.LauncherVersionID {
52+
func (lv *Edition) GetID() values.EditionID {
5353
return lv.id
5454
}
5555

56-
func (lv *LauncherVersion) GetName() values.LauncherVersionName {
56+
func (lv *Edition) GetName() values.EditionName {
5757
return lv.name
5858
}
5959

60-
func (lv *LauncherVersion) SetName(name values.LauncherVersionName) {
60+
func (lv *Edition) SetName(name values.EditionName) {
6161
lv.name = name
6262
}
6363

6464
var (
6565
ErrNoQuestionnaire = errors.New("no questionnaire")
6666
)
6767

68-
func (lv *LauncherVersion) GetQuestionnaireURL() (values.LauncherVersionQuestionnaireURL, error) {
68+
func (lv *Edition) GetQuestionnaireURL() (values.EditionQuestionnaireURL, error) {
6969
if !lv.haveQuestionnaire {
7070
return nil, ErrNoQuestionnaire
7171
}
7272

7373
return lv.questionnaireURL, nil
7474
}
7575

76-
func (lv *LauncherVersion) SetQuestionnaireURL(questionnaireURL values.LauncherVersionQuestionnaireURL) {
76+
func (lv *Edition) SetQuestionnaireURL(questionnaireURL values.EditionQuestionnaireURL) {
7777
lv.questionnaireURL = questionnaireURL
7878
lv.haveQuestionnaire = true
7979
}
8080

81-
func (lv *LauncherVersion) UnsetQuestionnaireURL() {
81+
func (lv *Edition) UnsetQuestionnaireURL() {
8282
lv.questionnaireURL = nil
8383
lv.haveQuestionnaire = false
8484
}
8585

86-
func (lv *LauncherVersion) GetCreatedAt() time.Time {
86+
func (lv *Edition) GetCreatedAt() time.Time {
8787
return lv.createdAt
8888
}

‎src/domain/values/launcher.go‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,54 @@ import (
1111
)
1212

1313
type (
14-
LauncherVersionID uuid.UUID
15-
LauncherVersionName string
16-
LauncherVersionQuestionnaireURL *url.URL
17-
LauncherUserID uuid.UUID
18-
LauncherUserProductKey string
19-
LauncherUserStatus int
20-
LauncherSessionID uuid.UUID
21-
LauncherSessionAccessToken string
14+
EditionID uuid.UUID
15+
EditionName string
16+
EditionQuestionnaireURL *url.URL
17+
LauncherUserID uuid.UUID
18+
LauncherUserProductKey string
19+
LauncherUserStatus int
20+
LauncherSessionID uuid.UUID
21+
LauncherSessionAccessToken string
2222
)
2323

2424
const (
2525
LauncherUserStatusActive LauncherUserStatus = iota
2626
LauncherUserStatusInactive
2727
)
2828

29-
func NewLauncherVersionID() LauncherVersionID {
30-
return LauncherVersionID(uuid.New())
29+
func NewEditionID() EditionID {
30+
return EditionID(uuid.New())
3131
}
3232

33-
func NewLauncherVersionIDFromUUID(id uuid.UUID) LauncherVersionID {
34-
return LauncherVersionID(id)
33+
func NewEditionIDFromUUID(id uuid.UUID) EditionID {
34+
return EditionID(id)
3535
}
3636

37-
func NewLauncherVersionName(name string) LauncherVersionName {
38-
return LauncherVersionName(name)
37+
func NewEditionName(name string) EditionName {
38+
return EditionName(name)
3939
}
4040

4141
var (
42-
ErrLauncherVersionNameEmpty = errors.New("launcher version name is empty")
43-
ErrLauncherVersionNameTooLong = errors.New("version name is too long")
42+
ErrEditionNameEmpty = errors.New("launcher version name is empty")
43+
ErrEditionNameTooLong = errors.New("version name is too long")
4444
)
4545

46-
func (lvn LauncherVersionName) Validate() error {
46+
func (lvn EditionName) Validate() error {
4747
// バージョン名は空ではない
4848
if len(lvn) == 0 {
49-
return ErrLauncherVersionNameEmpty
49+
return ErrEditionNameEmpty
5050
}
5151

5252
// バージョン名は32文字以内
5353
if utf8.RuneCountInString(string(lvn)) > 32 {
54-
return ErrLauncherVersionNameTooLong
54+
return ErrEditionNameTooLong
5555
}
5656

5757
return nil
5858
}
5959

60-
func NewLauncherVersionQuestionnaireURL(url *url.URL) LauncherVersionQuestionnaireURL {
61-
return LauncherVersionQuestionnaireURL(url)
60+
func NewEditionQuestionnaireURL(url *url.URL) EditionQuestionnaireURL {
61+
return EditionQuestionnaireURL(url)
6262
}
6363

6464
func NewLauncherUserID() LauncherUserID {

‎src/domain/values/launcher_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/stretchr/testify/assert"
99
)
1010

11-
func TestLauncherVersionNameValidate(t *testing.T) {
11+
func TestEditionNameValidate(t *testing.T) {
1212
t.Parallel()
1313

1414
type test struct {
@@ -33,7 +33,7 @@ func TestLauncherVersionNameValidate(t *testing.T) {
3333
description: "英数字33字でエラー",
3434
versionName: "abcdefghijklmnopqrstuvwxyz0123456",
3535
isErr: true,
36-
err: ErrLauncherVersionNameTooLong,
36+
err: ErrEditionNameTooLong,
3737
},
3838
{
3939
description: "マルチバイト文字32字でもエラーなし",
@@ -44,19 +44,19 @@ func TestLauncherVersionNameValidate(t *testing.T) {
4444
description: "マルチバイト文字33字でエラー",
4545
versionName: "あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむ",
4646
isErr: true,
47-
err: ErrLauncherVersionNameTooLong,
47+
err: ErrEditionNameTooLong,
4848
},
4949
{
5050
description: "空文字でエラー",
5151
versionName: "",
5252
isErr: true,
53-
err: ErrLauncherVersionNameEmpty,
53+
err: ErrEditionNameEmpty,
5454
},
5555
}
5656

5757
for _, testCase := range testCases {
5858
t.Run(testCase.description, func(t *testing.T) {
59-
err := LauncherVersionName(testCase.versionName).Validate()
59+
err := EditionName(testCase.versionName).Validate()
6060

6161
if testCase.isErr {
6262
if testCase.err == nil {

‎src/handler/v2/checker.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ func (checker *Checker) EditionIDAuthChecker(ctx context.Context, ai *openapi3fi
568568
if err != nil {
569569
return echo.NewHTTPError(http.StatusBadRequest, "invalid editionID")
570570
}
571-
editionID := values.NewLauncherVersionIDFromUUID(uuidEditionID)
571+
editionID := values.NewEditionIDFromUUID(uuidEditionID)
572572

573573
if editionID != edition.GetID() {
574574
return echo.NewHTTPError(http.StatusUnauthorized, "editionID is not matched")
@@ -577,7 +577,7 @@ func (checker *Checker) EditionIDAuthChecker(ctx context.Context, ai *openapi3fi
577577
return nil
578578
}
579579

580-
func (checker *Checker) checkEditionAuth(c echo.Context, ai *openapi3filter.AuthenticationInput) (*domain.LauncherUser, *domain.LauncherVersion, bool, string, error) {
580+
func (checker *Checker) checkEditionAuth(c echo.Context, ai *openapi3filter.AuthenticationInput) (*domain.LauncherUser, *domain.Edition, bool, string, error) {
581581
accessToken, ok, message := checker.getAccessToken(ai)
582582
if !ok {
583583
return nil, nil, false, message, nil

‎src/handler/v2/context.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ func (context *Context) GetProductKey(c echo.Context) (*domain.LauncherUser, err
2929
return productKey, nil
3030
}
3131

32-
func (context *Context) SetEdition(c echo.Context, edition *domain.LauncherVersion) {
32+
func (context *Context) SetEdition(c echo.Context, edition *domain.Edition) {
3333
c.Set(editionContextKey, edition)
3434
}
3535

36-
func (context *Context) GetEdition(c echo.Context) (*domain.LauncherVersion, error) {
37-
edition, ok := c.Get(editionContextKey).(*domain.LauncherVersion)
36+
func (context *Context) GetEdition(c echo.Context) (*domain.Edition, error) {
37+
edition, ok := c.Get(editionContextKey).(*domain.Edition)
3838
if !ok || edition == nil {
3939
return nil, ErrNoValue
4040
}

0 commit comments

Comments
 (0)