初期データのトークン類の長さが実装と異なっていたのを修正

isucon · Dec 7, 2024 · 9afcb05 · 9afcb05
1 parent b2bbef0
commit 9afcb05
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 36 deletions.
diff --git a/bench/benchmarker/scenario/data.go b/bench/benchmarker/scenario/data.go
@@ -11,23 +11,23 @@ import (
 var data embed.FS
 
 type ValidateData struct {
-	// 01JDFEDF00B09BNMV8MP0RB34G,匠椅子製作所,0811617de5c97aea5ddb433f085c3d1e,cd8a581e44c8cc269ce9f1484b96f534,2024-11-24 16:00:00.000000,2024-11-24 16:00:00.000000
+	// 01JDFEDF00B09BNMV8MP0RB34G,匠椅子製作所,0811617de5c97aea5ddb433f085c3d1ef2598ab71531ab3492ebb8629f0598d2,cd8a581e44c8cc269ce9f1484b96f5346258d3790eab576c224e3b347f852245,2024-11-24 16:00:00.000000,2024-11-24 16:00:00.000000
 	Owner01JDFEDF00B09BNMV8MP0RB34G struct {
 		Sales                             api.OwnerGetSalesOK
 		Sales1732579200000to1732622400000 api.OwnerGetSalesOK
 		Chairs                            api.OwnerGetChairsOK
 	}
-	// 01JDM0N9W89PK57C7XEVGD5C80,Runolfsdottir6120,冬深,宇野,1978-01-20,21e9562de048ee9b34da840296509fa9,775a18ee413f42d,2024-11-26 10:35:49.000000,2024-11-26 10:35:49.000000
+	// 01JDM0N9W89PK57C7XEVGD5C80,Runolfsdottir6120,冬深,宇野,1978-01-20,21e9562de048ee9b34da840296509fa913bc34d804b3aab4dc4db77f3f6995e4,775a18ee413f42da826c77e8a85244,2024-11-26 10:35:49.000000,2024-11-26 10:35:49.000000
 	User01JDM0N9W89PK57C7XEVGD5C80 struct {
 		Rides api.AppGetRidesOK
 	}
-	// 01JDK5EFNGT8ZHMTQXQ4BNH8NQ,Block5589,良太,森田,1963-12-10,c9e15fd57545f43105ace9088f1c467e,04d0b8f306231f6,2024-11-26 02:40:14.000000,2024-11-26 02:40:14.000000
+	// 01JDK5EFNGT8ZHMTQXQ4BNH8NQ,Block5589,良太,森田,1963-12-10,c9e15fd57545f43105ace9088f1c467eb3ddd232b49ac1ce6b6c52f5fb4d59e3,04d0b8f306231f6a63dc9164d4ce04,2024-11-26 02:40:14.000000,2024-11-26 02:40:14.000000
 	User01JDK5EFNGT8ZHMTQXQ4BNH8NQ struct {
 		Rides            api.AppGetRidesOK
 		Estimated_3_10   api.AppPostRidesEstimatedFareOK
 		Estimated_m11_10 api.AppPostRidesEstimatedFareOK
 	}
-	// 01JDJ4XN10E2CRZ37RNZ5GAFW6,Sauer4603,宇里,早川,1961-04-06,a8b21d78f143c3facdece4dffba964cc,e9620e1cf137d53,2024-11-25 17:11:48.000000,2024-11-25 17:11:48.000000
+	// 01JDJ4XN10E2CRZ37RNZ5GAFW6,Sauer4603,宇里,早川,1961-04-06,a8b21d78f143c3facdece4dffba964cc5120a341e383b1077e308be5cc67a8eb,e9620e1cf137d538374a96a2c1054d,2024-11-25 17:11:48.000000,2024-11-25 17:11:48.000000
 	User01JDJ4XN10E2CRZ37RNZ5GAFW6 struct {
 		Rides            api.AppGetRidesOK
 		Estimated_3_10   api.AppPostRidesEstimatedFareOK

diff --git a/bench/benchmarker/scenario/prevalidation.go b/bench/benchmarker/scenario/prevalidation.go
@@ -104,7 +104,7 @@ func validateInitialData(ctx context.Context, clientConfig webapp.ClientConfig)
 		if err != nil {
 			return err
 		}
-		ownerClient.SetCookie(&http.Cookie{Name: "owner_session", Value: "0811617de5c97aea5ddb433f085c3d1e"})
+		ownerClient.SetCookie(&http.Cookie{Name: "owner_session", Value: "0811617de5c97aea5ddb433f085c3d1ef2598ab71531ab3492ebb8629f0598d2"})
 
 		chairs, err := ownerClient.OwnerGetChairs(ctx)
 		if err != nil {
@@ -135,7 +135,7 @@ func validateInitialData(ctx context.Context, clientConfig webapp.ClientConfig)
 		if err != nil {
 			return err
 		}
-		userClient.SetCookie(&http.Cookie{Name: "app_session", Value: "21e9562de048ee9b34da840296509fa9"})
+		userClient.SetCookie(&http.Cookie{Name: "app_session", Value: "21e9562de048ee9b34da840296509fa913bc34d804b3aab4dc4db77f3f6995e4"})
 
 		rides, err := userClient.AppGetRequests(ctx)
 		if err != nil {
@@ -150,7 +150,7 @@ func validateInitialData(ctx context.Context, clientConfig webapp.ClientConfig)
 		if err != nil {
 			return err
 		}
-		userClient.SetCookie(&http.Cookie{Name: "app_session", Value: "c9e15fd57545f43105ace9088f1c467e"})
+		userClient.SetCookie(&http.Cookie{Name: "app_session", Value: "c9e15fd57545f43105ace9088f1c467eb3ddd232b49ac1ce6b6c52f5fb4d59e3"})
 
 		rides, err := userClient.AppGetRequests(ctx)
 		if err != nil {
@@ -187,7 +187,7 @@ func validateInitialData(ctx context.Context, clientConfig webapp.ClientConfig)
 		if err != nil {
 			return err
 		}
-		userClient.SetCookie(&http.Cookie{Name: "app_session", Value: "a8b21d78f143c3facdece4dffba964cc"})
+		userClient.SetCookie(&http.Cookie{Name: "app_session", Value: "a8b21d78f143c3facdece4dffba964cc5120a341e383b1077e308be5cc67a8eb"})
 
 		rides, err := userClient.AppGetRequests(ctx)
 		if err != nil {

diff --git a/bench/cmd/generate_init_data.go b/bench/cmd/generate_init_data.go
@@ -148,8 +148,8 @@ $ mysqldump --skip-create-options --skip-add-drop-table --disable-keys --no-crea
 			owner := &Owner{
 				ID:                 makeULIDFromTime(registeredAt),
 				Name:               random.GenerateOwnerName(),
-				AccessToken:        random.GenerateHexString(32),
-				ChairRegisterToken: random.GenerateHexString(32),
+				AccessToken:        random.GenerateHexString(64),
+				ChairRegisterToken: random.GenerateHexString(64),
 				CreatedAt:          registeredAt,
 				UpdatedAt:          registeredAt,
 			}
@@ -164,7 +164,7 @@ $ mysqldump --skip-create-options --skip-add-drop-table --disable-keys --no-crea
 					Name:                 model.GenerateName(),
 					Model:                model.Name,
 					IsActive:             false,
-					AccessToken:          random.GenerateHexString(32),
+					AccessToken:          random.GenerateHexString(64),
 					CreatedAt:            createdAt,
 					UpdatedAt:            createdAt,
 					modelData:            model,
@@ -182,8 +182,8 @@ $ mysqldump --skip-create-options --skip-add-drop-table --disable-keys --no-crea
 				FirstName:      random.GenerateFirstName(),
 				LastName:       random.GenerateLastName(),
 				DateOfBirth:    random.GenerateDateOfBirth(),
-				AccessToken:    random.GenerateHexString(32),
-				InvitationCode: random.GenerateHexString(15),
+				AccessToken:    random.GenerateHexString(64),
+				InvitationCode: random.GenerateHexString(30),
 				CreatedAt:      registeredAt,
 				UpdatedAt:      registeredAt,
 			}
@@ -197,8 +197,8 @@ $ mysqldump --skip-create-options --skip-add-drop-table --disable-keys --no-crea
 						FirstName:      random.GenerateFirstName(),
 						LastName:       random.GenerateLastName(),
 						DateOfBirth:    random.GenerateDateOfBirth(),
-						AccessToken:    random.GenerateHexString(32),
-						InvitationCode: random.GenerateHexString(15),
+						AccessToken:    random.GenerateHexString(64),
+						InvitationCode: random.GenerateHexString(30),
 						CreatedAt:      registeredAt,
 						UpdatedAt:      registeredAt,
 					}

diff --git a/docs/manual.md b/docs/manual.md
@@ -169,25 +169,25 @@ ISURIDEでは、利用者が使用するクライアントアプリケーショ
 
 | 利用者名    | sessionToken                     |
 | ----------- | -------------------------------- |
-| Collier6283 | 34ea320039fc61ae2558176607a2e12c |
-| Miller6106  | d175bd9d34b9c4e0b3d9864a07ccee37 |
-| Goldner6682 | d1c9df78002d6829f32f1d676c472de1 |
+| Collier6283 | 34ea320039fc61ae2558176607a2e12ca402cbba22ea21e8c28a46df63f4fd25 |
+| Miller6106  | d175bd9d34b9c4e0b3d9864a07ccee37f043b9df1e77ca20c78bc5878a537dc6 |
+| Goldner6682 | d1c9df78002d6829f32f1d676c472de1e2f2ce23d8c949979316060e55124205 |
 
 #### オーナー一覧
 
 | オーナー名         | sessionToken                     |
 | ------------------ | -------------------------------- |
-| Seat Revival       | 7188f2fb45c7d81a6ba30d1572cfff37 |
-| 快座製作所         | 001d0876c1197819935c6f2e32eb0320 |
-| 匠椅子製作所       | 0811617de5c97aea5ddb433f085c3d1e |
-| つくる椅子株式会社 | c3eb38a254ca73e84b4d01158870a06d |
-| NextStep Cab       | 3585ccc78c507660a4802973d269849e |
+| Seat Revival       | 7188f2fb45c7d81a6ba30d1572cfff37b3857e66f7b50513bbf89eb2c4bc0ac7 |
+| 快座製作所         | 001d0876c1197819935c6f2e32eb03209c2a874ee6e6463fadffc9d6b14c1ef6 |
+| 匠椅子製作所       | 0811617de5c97aea5ddb433f085c3d1ef2598ab71531ab3492ebb8629f0598d2 |
+| つくる椅子株式会社 | c3eb38a254ca73e84b4d01158870a06d16aefa44f2db7d077a3c82dd8a9c17c2 |
+| NextStep Cab       | 3585ccc78c507660a4802973d269849e111d2b983b844fbcf63e0c6b1ca94f68 |
 
 #### シミュレーターで利用する椅子
 
 | 椅子名      | モデル名            | オーナー名 | sessionToken                     |
 | ----------- | ------------------- | ---------- | -------------------------------- |
-| QC-L13-8361 | クエストチェア Lite | 快座製作所 | 3013d5ec84e1b230f913a17d71ef27c8 |
+| QC-L13-8361 | クエストチェア Lite | 快座製作所 | 3013d5ec84e1b230f913a17d71ef27c8d09d777b1cce7a3c1e2ffd4040848411 |
 
 ## 競技環境について
 

diff --git a/frontend/initial-data.json b/frontend/initial-data.json
@@ -3,27 +3,27 @@
     {
       "id": "01JDFEDF0032PVQ8C193WGKKPB",
       "name": "Seat Revival",
-      "token": "7188f2fb45c7d81a6ba30d1572cfff37"
+      "token": "7188f2fb45c7d81a6ba30d1572cfff37b3857e66f7b50513bbf89eb2c4bc0ac7"
     },
     {
       "id": "01JDFEDF008NTA922W12FS7800",
       "name": "快座製作所",
-      "token": "001d0876c1197819935c6f2e32eb0320"
+      "token": "001d0876c1197819935c6f2e32eb03209c2a874ee6e6463fadffc9d6b14c1ef6"
     },
     {
       "id": "01JDFEDF00B09BNMV8MP0RB34G",
       "name": "匠椅子製作所",
-      "token": "0811617de5c97aea5ddb433f085c3d1e"
+      "token": "0811617de5c97aea5ddb433f085c3d1ef2598ab71531ab3492ebb8629f0598d2"
     },
     {
       "id": "01JDFEDF00RBY5VSY7C18K3NVF",
       "name": "つくる椅子株式会社",
-      "token": "c3eb38a254ca73e84b4d01158870a06d"
+      "token": "c3eb38a254ca73e84b4d01158870a06d16aefa44f2db7d077a3c82dd8a9c17c2"
     },
     {
       "id": "01JDFEDF00YK9SN2RGHVCC8JAY",
       "name": "NextStep Cab",
-      "token": "3585ccc78c507660a4802973d269849e"
+      "token": "3585ccc78c507660a4802973d269849e111d2b983b844fbcf63e0c6b1ca94f68"
     }
   ],
   "users": [
@@ -33,33 +33,33 @@
       "firstname": "和治",
       "lastname": "大森",
       "date_of_birth": "1972-01-20",
-      "token": "34ea320039fc61ae2558176607a2e12c",
-      "invitation_code": "5c4a695f66d598e"
+      "token": "34ea320039fc61ae2558176607a2e12ca402cbba22ea21e8c28a46df63f4fd25",
+      "invitation_code": "5c4a695f66d598eac2a1da230f39d4"
     },
     {
       "id": "01JDJ23EA0C0P2KFPTXEJNC8TE",
       "username": "Miller6106",
       "firstname": "寿英",
       "lastname": "緒方",
       "date_of_birth": "1963-12-13",
-      "token": "d175bd9d34b9c4e0b3d9864a07ccee37",
-      "invitation_code": "21b45ed16b4a519"
+      "token": "d175bd9d34b9c4e0b3d9864a07ccee37f043b9df1e77ca20c78bc5878a537dc6",
+      "invitation_code": "21b45ed16b4a5195cfe24cd31fc3f3"
     },
     {
       "id": "01JDJ322S0KH01ENA31X2QB60M",
       "username": "Goldner6682",
       "firstname": "倖寧",
       "lastname": "金子",
       "date_of_birth": "1990-07-04",
-      "token": "d1c9df78002d6829f32f1d676c472de1",
-      "invitation_code": "ee6d417477d556f"
+      "token": "d1c9df78002d6829f32f1d676c472de1e2f2ce23d8c949979316060e55124205",
+      "invitation_code": "ee6d417477d556ff0193873b14754b"
     }
   ],
   "chair": {
     "id": "01JDFEF7MGXXCJKW1MNJXPA77A",
     "owner_id": "01JDFEDF008NTA922W12FS7800",
     "name": "QC-L13-8361",
     "model": "クエストチェア Lite",
-    "token": "3013d5ec84e1b230f913a17d71ef27c8"
+    "token": "3013d5ec84e1b230f913a17d71ef27c8d09d777b1cce7a3c1e2ffd4040848411"
   }
 }
diff --git a/webapp/sql/3-initial-data.sql.gz b/webapp/sql/3-initial-data.sql.gz