Skip to content

Commit 3443a65

Browse files
wtkswtks
authored
Merge pull request #798 from isucon/fix-init-data
初期データのトークン類の長さが実装と異なっていたのを修正
2 parents b2bbef0 + 9afcb05 commit 3443a65

6 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎bench/benchmarker/scenario/data.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ import (
1111
var data embed.FS
1212

1313
type ValidateData struct {
14-
// 01JDFEDF00B09BNMV8MP0RB34G,匠椅子製作所,0811617de5c97aea5ddb433f085c3d1e,cd8a581e44c8cc269ce9f1484b96f534,2024-11-24 16:00:00.000000,2024-11-24 16:00:00.000000
14+
// 01JDFEDF00B09BNMV8MP0RB34G,匠椅子製作所,0811617de5c97aea5ddb433f085c3d1ef2598ab71531ab3492ebb8629f0598d2,cd8a581e44c8cc269ce9f1484b96f5346258d3790eab576c224e3b347f852245,2024-11-24 16:00:00.000000,2024-11-24 16:00:00.000000
1515
Owner01JDFEDF00B09BNMV8MP0RB34G struct {
1616
Sales api.OwnerGetSalesOK
1717
Sales1732579200000to1732622400000 api.OwnerGetSalesOK
1818
Chairs api.OwnerGetChairsOK
1919
}
20-
// 01JDM0N9W89PK57C7XEVGD5C80,Runolfsdottir6120,冬深,宇野,1978-01-20,21e9562de048ee9b34da840296509fa9,775a18ee413f42d,2024-11-26 10:35:49.000000,2024-11-26 10:35:49.000000
20+
// 01JDM0N9W89PK57C7XEVGD5C80,Runolfsdottir6120,冬深,宇野,1978-01-20,21e9562de048ee9b34da840296509fa913bc34d804b3aab4dc4db77f3f6995e4,775a18ee413f42da826c77e8a85244,2024-11-26 10:35:49.000000,2024-11-26 10:35:49.000000
2121
User01JDM0N9W89PK57C7XEVGD5C80 struct {
2222
Rides api.AppGetRidesOK
2323
}
24-
// 01JDK5EFNGT8ZHMTQXQ4BNH8NQ,Block5589,良太,森田,1963-12-10,c9e15fd57545f43105ace9088f1c467e,04d0b8f306231f6,2024-11-26 02:40:14.000000,2024-11-26 02:40:14.000000
24+
// 01JDK5EFNGT8ZHMTQXQ4BNH8NQ,Block5589,良太,森田,1963-12-10,c9e15fd57545f43105ace9088f1c467eb3ddd232b49ac1ce6b6c52f5fb4d59e3,04d0b8f306231f6a63dc9164d4ce04,2024-11-26 02:40:14.000000,2024-11-26 02:40:14.000000
2525
User01JDK5EFNGT8ZHMTQXQ4BNH8NQ struct {
2626
Rides api.AppGetRidesOK
2727
Estimated_3_10 api.AppPostRidesEstimatedFareOK
2828
Estimated_m11_10 api.AppPostRidesEstimatedFareOK
2929
}
30-
// 01JDJ4XN10E2CRZ37RNZ5GAFW6,Sauer4603,宇里,早川,1961-04-06,a8b21d78f143c3facdece4dffba964cc,e9620e1cf137d53,2024-11-25 17:11:48.000000,2024-11-25 17:11:48.000000
30+
// 01JDJ4XN10E2CRZ37RNZ5GAFW6,Sauer4603,宇里,早川,1961-04-06,a8b21d78f143c3facdece4dffba964cc5120a341e383b1077e308be5cc67a8eb,e9620e1cf137d538374a96a2c1054d,2024-11-25 17:11:48.000000,2024-11-25 17:11:48.000000
3131
User01JDJ4XN10E2CRZ37RNZ5GAFW6 struct {
3232
Rides api.AppGetRidesOK
3333
Estimated_3_10 api.AppPostRidesEstimatedFareOK

‎bench/benchmarker/scenario/prevalidation.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func validateInitialData(ctx context.Context, clientConfig webapp.ClientConfig)
104104
if err != nil {
105105
return err
106106
}
107-
ownerClient.SetCookie(&http.Cookie{Name: "owner_session", Value: "0811617de5c97aea5ddb433f085c3d1e"})
107+
ownerClient.SetCookie(&http.Cookie{Name: "owner_session", Value: "0811617de5c97aea5ddb433f085c3d1ef2598ab71531ab3492ebb8629f0598d2"})
108108

109109
chairs, err := ownerClient.OwnerGetChairs(ctx)
110110
if err != nil {
@@ -135,7 +135,7 @@ func validateInitialData(ctx context.Context, clientConfig webapp.ClientConfig)
135135
if err != nil {
136136
return err
137137
}
138-
userClient.SetCookie(&http.Cookie{Name: "app_session", Value: "21e9562de048ee9b34da840296509fa9"})
138+
userClient.SetCookie(&http.Cookie{Name: "app_session", Value: "21e9562de048ee9b34da840296509fa913bc34d804b3aab4dc4db77f3f6995e4"})
139139

140140
rides, err := userClient.AppGetRequests(ctx)
141141
if err != nil {
@@ -150,7 +150,7 @@ func validateInitialData(ctx context.Context, clientConfig webapp.ClientConfig)
150150
if err != nil {
151151
return err
152152
}
153-
userClient.SetCookie(&http.Cookie{Name: "app_session", Value: "c9e15fd57545f43105ace9088f1c467e"})
153+
userClient.SetCookie(&http.Cookie{Name: "app_session", Value: "c9e15fd57545f43105ace9088f1c467eb3ddd232b49ac1ce6b6c52f5fb4d59e3"})
154154

155155
rides, err := userClient.AppGetRequests(ctx)
156156
if err != nil {
@@ -187,7 +187,7 @@ func validateInitialData(ctx context.Context, clientConfig webapp.ClientConfig)
187187
if err != nil {
188188
return err
189189
}
190-
userClient.SetCookie(&http.Cookie{Name: "app_session", Value: "a8b21d78f143c3facdece4dffba964cc"})
190+
userClient.SetCookie(&http.Cookie{Name: "app_session", Value: "a8b21d78f143c3facdece4dffba964cc5120a341e383b1077e308be5cc67a8eb"})
191191

192192
rides, err := userClient.AppGetRequests(ctx)
193193
if err != nil {

‎bench/cmd/generate_init_data.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ $ mysqldump --skip-create-options --skip-add-drop-table --disable-keys --no-crea
148148
owner := &Owner{
149149
ID: makeULIDFromTime(registeredAt),
150150
Name: random.GenerateOwnerName(),
151-
AccessToken: random.GenerateHexString(32),
152-
ChairRegisterToken: random.GenerateHexString(32),
151+
AccessToken: random.GenerateHexString(64),
152+
ChairRegisterToken: random.GenerateHexString(64),
153153
CreatedAt: registeredAt,
154154
UpdatedAt: registeredAt,
155155
}
@@ -164,7 +164,7 @@ $ mysqldump --skip-create-options --skip-add-drop-table --disable-keys --no-crea
164164
Name: model.GenerateName(),
165165
Model: model.Name,
166166
IsActive: false,
167-
AccessToken: random.GenerateHexString(32),
167+
AccessToken: random.GenerateHexString(64),
168168
CreatedAt: createdAt,
169169
UpdatedAt: createdAt,
170170
modelData: model,
@@ -182,8 +182,8 @@ $ mysqldump --skip-create-options --skip-add-drop-table --disable-keys --no-crea
182182
FirstName: random.GenerateFirstName(),
183183
LastName: random.GenerateLastName(),
184184
DateOfBirth: random.GenerateDateOfBirth(),
185-
AccessToken: random.GenerateHexString(32),
186-
InvitationCode: random.GenerateHexString(15),
185+
AccessToken: random.GenerateHexString(64),
186+
InvitationCode: random.GenerateHexString(30),
187187
CreatedAt: registeredAt,
188188
UpdatedAt: registeredAt,
189189
}
@@ -197,8 +197,8 @@ $ mysqldump --skip-create-options --skip-add-drop-table --disable-keys --no-crea
197197
FirstName: random.GenerateFirstName(),
198198
LastName: random.GenerateLastName(),
199199
DateOfBirth: random.GenerateDateOfBirth(),
200-
AccessToken: random.GenerateHexString(32),
201-
InvitationCode: random.GenerateHexString(15),
200+
AccessToken: random.GenerateHexString(64),
201+
InvitationCode: random.GenerateHexString(30),
202202
CreatedAt: registeredAt,
203203
UpdatedAt: registeredAt,
204204
}

‎docs/manual.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -169,25 +169,25 @@ ISURIDEでは、利用者が使用するクライアントアプリケーショ
169169

170170
| 利用者名 | sessionToken |
171171
| ----------- | -------------------------------- |
172-
| Collier6283 | 34ea320039fc61ae2558176607a2e12c |
173-
| Miller6106 | d175bd9d34b9c4e0b3d9864a07ccee37 |
174-
| Goldner6682 | d1c9df78002d6829f32f1d676c472de1 |
172+
| Collier6283 | 34ea320039fc61ae2558176607a2e12ca402cbba22ea21e8c28a46df63f4fd25 |
173+
| Miller6106 | d175bd9d34b9c4e0b3d9864a07ccee37f043b9df1e77ca20c78bc5878a537dc6 |
174+
| Goldner6682 | d1c9df78002d6829f32f1d676c472de1e2f2ce23d8c949979316060e55124205 |
175175

176176
#### オーナー一覧
177177

178178
| オーナー名 | sessionToken |
179179
| ------------------ | -------------------------------- |
180-
| Seat Revival | 7188f2fb45c7d81a6ba30d1572cfff37 |
181-
| 快座製作所 | 001d0876c1197819935c6f2e32eb0320 |
182-
| 匠椅子製作所 | 0811617de5c97aea5ddb433f085c3d1e |
183-
| つくる椅子株式会社 | c3eb38a254ca73e84b4d01158870a06d |
184-
| NextStep Cab | 3585ccc78c507660a4802973d269849e |
180+
| Seat Revival | 7188f2fb45c7d81a6ba30d1572cfff37b3857e66f7b50513bbf89eb2c4bc0ac7 |
181+
| 快座製作所 | 001d0876c1197819935c6f2e32eb03209c2a874ee6e6463fadffc9d6b14c1ef6 |
182+
| 匠椅子製作所 | 0811617de5c97aea5ddb433f085c3d1ef2598ab71531ab3492ebb8629f0598d2 |
183+
| つくる椅子株式会社 | c3eb38a254ca73e84b4d01158870a06d16aefa44f2db7d077a3c82dd8a9c17c2 |
184+
| NextStep Cab | 3585ccc78c507660a4802973d269849e111d2b983b844fbcf63e0c6b1ca94f68 |
185185

186186
#### シミュレーターで利用する椅子
187187

188188
| 椅子名 | モデル名 | オーナー名 | sessionToken |
189189
| ----------- | ------------------- | ---------- | -------------------------------- |
190-
| QC-L13-8361 | クエストチェア Lite | 快座製作所 | 3013d5ec84e1b230f913a17d71ef27c8 |
190+
| QC-L13-8361 | クエストチェア Lite | 快座製作所 | 3013d5ec84e1b230f913a17d71ef27c8d09d777b1cce7a3c1e2ffd4040848411 |
191191

192192
## 競技環境について
193193

‎frontend/initial-data.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
{
44
"id": "01JDFEDF0032PVQ8C193WGKKPB",
55
"name": "Seat Revival",
6-
"token": "7188f2fb45c7d81a6ba30d1572cfff37"
6+
"token": "7188f2fb45c7d81a6ba30d1572cfff37b3857e66f7b50513bbf89eb2c4bc0ac7"
77
},
88
{
99
"id": "01JDFEDF008NTA922W12FS7800",
1010
"name": "快座製作所",
11-
"token": "001d0876c1197819935c6f2e32eb0320"
11+
"token": "001d0876c1197819935c6f2e32eb03209c2a874ee6e6463fadffc9d6b14c1ef6"
1212
},
1313
{
1414
"id": "01JDFEDF00B09BNMV8MP0RB34G",
1515
"name": "匠椅子製作所",
16-
"token": "0811617de5c97aea5ddb433f085c3d1e"
16+
"token": "0811617de5c97aea5ddb433f085c3d1ef2598ab71531ab3492ebb8629f0598d2"
1717
},
1818
{
1919
"id": "01JDFEDF00RBY5VSY7C18K3NVF",
2020
"name": "つくる椅子株式会社",
21-
"token": "c3eb38a254ca73e84b4d01158870a06d"
21+
"token": "c3eb38a254ca73e84b4d01158870a06d16aefa44f2db7d077a3c82dd8a9c17c2"
2222
},
2323
{
2424
"id": "01JDFEDF00YK9SN2RGHVCC8JAY",
2525
"name": "NextStep Cab",
26-
"token": "3585ccc78c507660a4802973d269849e"
26+
"token": "3585ccc78c507660a4802973d269849e111d2b983b844fbcf63e0c6b1ca94f68"
2727
}
2828
],
2929
"users": [
@@ -33,33 +33,33 @@
3333
"firstname": "和治",
3434
"lastname": "大森",
3535
"date_of_birth": "1972-01-20",
36-
"token": "34ea320039fc61ae2558176607a2e12c",
37-
"invitation_code": "5c4a695f66d598e"
36+
"token": "34ea320039fc61ae2558176607a2e12ca402cbba22ea21e8c28a46df63f4fd25",
37+
"invitation_code": "5c4a695f66d598eac2a1da230f39d4"
3838
},
3939
{
4040
"id": "01JDJ23EA0C0P2KFPTXEJNC8TE",
4141
"username": "Miller6106",
4242
"firstname": "寿英",
4343
"lastname": "緒方",
4444
"date_of_birth": "1963-12-13",
45-
"token": "d175bd9d34b9c4e0b3d9864a07ccee37",
46-
"invitation_code": "21b45ed16b4a519"
45+
"token": "d175bd9d34b9c4e0b3d9864a07ccee37f043b9df1e77ca20c78bc5878a537dc6",
46+
"invitation_code": "21b45ed16b4a5195cfe24cd31fc3f3"
4747
},
4848
{
4949
"id": "01JDJ322S0KH01ENA31X2QB60M",
5050
"username": "Goldner6682",
5151
"firstname": "倖寧",
5252
"lastname": "金子",
5353
"date_of_birth": "1990-07-04",
54-
"token": "d1c9df78002d6829f32f1d676c472de1",
55-
"invitation_code": "ee6d417477d556f"
54+
"token": "d1c9df78002d6829f32f1d676c472de1e2f2ce23d8c949979316060e55124205",
55+
"invitation_code": "ee6d417477d556ff0193873b14754b"
5656
}
5757
],
5858
"chair": {
5959
"id": "01JDFEF7MGXXCJKW1MNJXPA77A",
6060
"owner_id": "01JDFEDF008NTA922W12FS7800",
6161
"name": "QC-L13-8361",
6262
"model": "クエストチェア Lite",
63-
"token": "3013d5ec84e1b230f913a17d71ef27c8"
63+
"token": "3013d5ec84e1b230f913a17d71ef27c8d09d777b1cce7a3c1e2ffd4040848411"
6464
}
6565
}

‎webapp/sql/3-initial-data.sql.gz‎

26.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)