Skip to content

Commit 371f27f

Browse files
modembccmodembcc
committed
Fix questionID invalid
1 parent 416e7c9 commit 371f27f

File tree

6 files changed

+116
-6
lines changed

6 files changed

+116
-6
lines changed

‎collab/main.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@ var upgrader = websocket.Upgrader{
1616
},
1717
}
1818

19-
// Client represents a WebSocket client
2019
type Client struct {
2120
conn *websocket.Conn
2221
roomID string
2322
authenticated bool
2423
}
2524

26-
// Hub maintains the set of active clients, broadcasts messages, and stores the current workspace per roomID
2725
type Hub struct {
2826
clients map[*Client]bool
2927
workspaces map[string]string
@@ -33,7 +31,6 @@ type Hub struct {
3331
mutex sync.Mutex
3432
}
3533

36-
// Message represents a message with the associated roomID
3734
type Message struct {
3835
roomID string
3936
content []byte

‎matching-service-api/log/matching_service_api.log‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,37 @@ time="2024-10-16T12:16:10+08:00" level=info msg="request from user user1 success
3535
time="2024-10-16T12:16:15+08:00" level=info msg="request from user user2 successfully published"
3636
time="2024-10-25T22:40:44+08:00" level=info msg="Server started at time: 2024-10-25 22:40:44.6771508 +0800 +08 m=+0.090065801"
3737
time="2024-10-25T23:25:28+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
38+
time="2024-10-27T15:25:31+08:00" level=info msg="Server started at time: 2024-10-27 15:25:31.7266589 +0800 +08 m=+0.095761501"
39+
time="2024-10-27T15:26:55+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
40+
time="2024-10-27T15:26:55+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
41+
time="2024-10-27T15:29:09+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
42+
time="2024-10-27T15:29:10+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
43+
time="2024-10-27T16:08:08+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
44+
time="2024-10-27T16:08:10+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
45+
time="2024-10-27T16:16:30+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
46+
time="2024-10-27T16:16:33+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
47+
time="2024-10-27T16:19:10+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
48+
time="2024-10-27T16:19:10+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
49+
time="2024-10-27T16:19:41+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
50+
time="2024-10-27T16:19:41+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
51+
time="2024-10-27T16:21:10+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
52+
time="2024-10-27T16:21:11+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
53+
time="2024-10-27T16:21:12+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
54+
time="2024-10-27T16:21:23+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
55+
time="2024-10-27T16:21:24+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
56+
time="2024-10-27T16:22:44+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
57+
time="2024-10-27T16:22:44+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
58+
time="2024-10-27T16:27:03+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
59+
time="2024-10-27T16:27:05+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
60+
time="2024-10-27T16:27:48+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
61+
time="2024-10-27T16:27:50+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
62+
time="2024-10-27T16:28:28+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
63+
time="2024-10-27T16:28:28+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
64+
time="2024-10-27T16:29:33+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
65+
time="2024-10-27T16:29:33+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
66+
time="2024-10-27T16:34:11+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
67+
time="2024-10-27T16:34:12+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
68+
time="2024-10-27T16:35:54+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"
69+
time="2024-10-27T16:35:56+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
70+
time="2024-10-27T16:36:54+08:00" level=info msg="request from user 67188e6ebe7127ec5d472f15 successfully published"
71+
time="2024-10-27T16:36:55+08:00" level=info msg="request from user 6702c9a3f1217a1b2123575b successfully published"

‎matching-service/log/matching_service.log‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,13 @@ time="2024-10-17T22:51:23+08:00" level=info msg="Begin processing requests"
2626
time="2024-10-25T22:40:12+08:00" level=info msg="Beginning consumption from message queue"
2727
time="2024-10-25T22:40:12+08:00" level=info msg="Begin processing requests"
2828
time="2024-10-25T23:25:28+08:00" level=error msg="error handling incoming request: dial tcp [::1]:6379: connectex: No connection could be made because the target machine actively refused it."
29+
time="2024-10-27T15:25:08+08:00" level=info msg="Beginning consumption from message queue"
30+
time="2024-10-27T15:25:08+08:00" level=info msg="Begin processing requests"
31+
time="2024-10-27T15:26:55+08:00" level=error msg="error handling incoming request: dial tcp [::1]:6379: connectex: No connection could be made because the target machine actively refused it."
32+
time="2024-10-27T15:26:56+08:00" level=error msg="error handling incoming request: dial tcp [::1]:6379: connectex: No connection could be made because the target machine actively refused it."
33+
time="2024-10-27T15:28:11+08:00" level=info msg="Beginning consumption from message queue"
34+
time="2024-10-27T15:28:11+08:00" level=info msg="Begin processing requests"
35+
time="2024-10-27T15:29:09+08:00" level=error msg="error handling incoming request: WRONGTYPE Operation against a key holding the wrong kind of value"
36+
time="2024-10-27T15:29:10+08:00" level=error msg="error handling incoming request: WRONGTYPE Operation against a key holding the wrong kind of value"
37+
time="2024-10-27T16:08:08+08:00" level=error msg="error handling incoming request: WRONGTYPE Operation against a key holding the wrong kind of value"
38+
time="2024-10-27T16:08:10+08:00" level=error msg="error handling incoming request: WRONGTYPE Operation against a key holding the wrong kind of value"

‎peerprep/api/structs.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export interface MatchData {
5959
roomId: string;
6060
user1: string;
6161
user2: string;
62-
QuestionId: string
62+
questionId: string;
6363
}
6464

6565
export interface MatchResponse {

‎peerprep/components/questionpage/Matchmaking.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,13 @@ const Matchmaking = () => {
131131
// display in a popup for now
132132
const message = `Room ID: ${matchRes.data.roomId}
133133
User1: ${matchRes.data.user1}
134-
User2: ${matchRes.data.user2}`;
134+
User2: ${matchRes.data.user2}
135+
Question: ${matchRes.data.questionId}
136+
`;
135137
window.alert(message);
136138
// redirect to question page
137139
router.push(
138-
`/questions/${matchRes.data.QuestionId}/${matchRes.data.roomId}`
140+
`/questions/${matchRes.data.questionId}/${matchRes.data.roomId}`
139141
);
140142
};
141143

‎storage-blob-api/log/matching_service_api.log‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,70 @@ time="2024-10-25T23:25:43+08:00" level=error msg="error retrieving userId from d
1515
time="2024-10-25T23:25:48+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
1616
time="2024-10-25T23:25:53+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
1717
time="2024-10-25T23:25:58+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
18+
time="2024-10-27T15:26:25+08:00" level=info msg="Server started running successfully"
19+
time="2024-10-27T15:27:00+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
20+
time="2024-10-27T15:27:01+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
21+
time="2024-10-27T15:27:05+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
22+
time="2024-10-27T15:27:06+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
23+
time="2024-10-27T15:27:10+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
24+
time="2024-10-27T15:27:11+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
25+
time="2024-10-27T15:27:15+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
26+
time="2024-10-27T15:27:16+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
27+
time="2024-10-27T15:27:20+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
28+
time="2024-10-27T15:27:21+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
29+
time="2024-10-27T15:27:25+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
30+
time="2024-10-27T15:27:26+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
31+
time="2024-10-27T15:29:12+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
32+
time="2024-10-27T15:29:15+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
33+
time="2024-10-27T15:29:17+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
34+
time="2024-10-27T15:29:20+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
35+
time="2024-10-27T15:29:22+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
36+
time="2024-10-27T15:29:25+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
37+
time="2024-10-27T15:29:27+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
38+
time="2024-10-27T15:29:30+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
39+
time="2024-10-27T15:29:32+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
40+
time="2024-10-27T15:29:35+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
41+
time="2024-10-27T15:29:37+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
42+
time="2024-10-27T15:29:40+08:00" level=error msg="error retrieving userId from database: dial tcp 127.0.0.1:6379: connectex: No connection could be made because the target machine actively refused it."
43+
time="2024-10-27T16:07:41+08:00" level=info msg="Server started running successfully"
44+
time="2024-10-27T16:16:35+08:00" level=info msg="Request handled successfully"
45+
time="2024-10-27T16:16:39+08:00" level=info msg="Request handled successfully"
46+
time="2024-10-27T16:19:15+08:00" level=info msg="Request handled successfully"
47+
time="2024-10-27T16:19:15+08:00" level=info msg="Request handled successfully"
48+
time="2024-10-27T16:19:46+08:00" level=info msg="Request handled successfully"
49+
time="2024-10-27T16:19:47+08:00" level=info msg="Request handled successfully"
50+
time="2024-10-27T16:21:16+08:00" level=info msg="Request handled successfully"
51+
time="2024-10-27T16:21:17+08:00" level=info msg="Request handled successfully"
52+
time="2024-10-27T16:21:29+08:00" level=info msg="Request handled successfully"
53+
time="2024-10-27T16:21:29+08:00" level=info msg="Request handled successfully"
54+
time="2024-10-27T16:22:49+08:00" level=info msg="Request handled successfully"
55+
time="2024-10-27T16:22:49+08:00" level=info msg="Request handled successfully"
56+
time="2024-10-27T16:27:08+08:00" level=info msg="Request handled successfully"
57+
time="2024-10-27T16:27:11+08:00" level=info msg="Request handled successfully"
58+
time="2024-10-27T16:27:53+08:00" level=info msg="Request handled successfully"
59+
time="2024-10-27T16:27:55+08:00" level=info msg="Request handled successfully"
60+
time="2024-10-27T16:28:34+08:00" level=info msg="Request handled successfully"
61+
time="2024-10-27T16:28:34+08:00" level=info msg="Request handled successfully"
62+
time="2024-10-27T16:29:38+08:00" level=info msg="Request handled successfully"
63+
time="2024-10-27T16:29:39+08:00" level=info msg="Request handled successfully"
64+
time="2024-10-27T16:34:17+08:00" level=info msg="Request handled successfully"
65+
time="2024-10-27T16:34:17+08:00" level=info msg="Request handled successfully"
66+
time="2024-10-27T16:34:22+08:00" level=info msg="Request handled successfully"
67+
time="2024-10-27T16:34:22+08:00" level=info msg="Request handled successfully"
68+
time="2024-10-27T16:34:27+08:00" level=info msg="Request handled successfully"
69+
time="2024-10-27T16:34:27+08:00" level=info msg="Request handled successfully"
70+
time="2024-10-27T16:34:32+08:00" level=info msg="Request handled successfully"
71+
time="2024-10-27T16:34:32+08:00" level=info msg="Request handled successfully"
72+
time="2024-10-27T16:34:37+08:00" level=info msg="Request handled successfully"
73+
time="2024-10-27T16:34:37+08:00" level=info msg="Request handled successfully"
74+
time="2024-10-27T16:35:59+08:00" level=info msg="Request handled successfully"
75+
time="2024-10-27T16:36:01+08:00" level=info msg="Request handled successfully"
76+
time="2024-10-27T16:36:04+08:00" level=info msg="Request handled successfully"
77+
time="2024-10-27T16:36:06+08:00" level=info msg="Request handled successfully"
78+
time="2024-10-27T16:36:10+08:00" level=info msg="Request handled successfully"
79+
time="2024-10-27T16:36:12+08:00" level=info msg="Request handled successfully"
80+
time="2024-10-27T16:36:15+08:00" level=info msg="Request handled successfully"
81+
time="2024-10-27T16:36:18+08:00" level=info msg="Request handled successfully"
82+
time="2024-10-27T16:36:23+08:00" level=info msg="Request handled successfully"
83+
time="2024-10-27T16:36:59+08:00" level=info msg="Request handled successfully"
84+
time="2024-10-27T16:37:01+08:00" level=info msg="Request handled successfully"

0 commit comments

Comments
 (0)