Skip to content

Commit 4dc02f5

Browse files
DistractedCatDistractedCat
committed
Finish up v1 of user matching
1 parent 376783d commit 4dc02f5

File tree

19 files changed

+417
-35
lines changed

19 files changed

+417
-35
lines changed

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,22 @@ time="2024-10-13T12:54:45+08:00" level=info msg="Server started at time: 2024-10
1414
time="2024-10-13T12:55:54+08:00" level=info msg="Server started at time: 2024-10-13 12:55:54.7209082 +0800 +08 m=+0.017350501"
1515
time="2024-10-13T12:55:59+08:00" level=info msg="request from user hello successfully published"
1616
time="2024-10-13T12:56:13+08:00" level=info msg="request from user hello successfully published"
17+
time="2024-10-15T21:16:09+08:00" level=info msg="Server started at time: 2024-10-15 21:16:09.5830829 +0800 +08 m=+0.018717201"
18+
time="2024-10-15T21:19:11+08:00" level=info msg="request from user user1 successfully published"
19+
time="2024-10-15T21:24:05+08:00" level=info msg="request from user user1 successfully published"
20+
time="2024-10-15T21:24:19+08:00" level=info msg="request from user user1 successfully published"
21+
time="2024-10-15T21:27:07+08:00" level=info msg="request from user user1 successfully published"
22+
time="2024-10-15T21:27:16+08:00" level=info msg="request from user user2 successfully published"
23+
time="2024-10-15T21:34:56+08:00" level=info msg="request from user user2 successfully published"
24+
time="2024-10-15T21:35:04+08:00" level=info msg="request from user user1 successfully published"
25+
time="2024-10-16T11:47:58+08:00" level=info msg="Server started at time: 2024-10-16 11:47:58.9097737 +0800 +08 m=+0.018180201"
26+
time="2024-10-16T11:58:13+08:00" level=info msg="request from user user1 successfully published"
27+
time="2024-10-16T11:58:19+08:00" level=info msg="request from user user2 successfully published"
28+
time="2024-10-16T12:04:09+08:00" level=info msg="request from user user1 successfully published"
29+
time="2024-10-16T12:04:12+08:00" level=info msg="request from user user2 successfully published"
30+
time="2024-10-16T12:06:43+08:00" level=info msg="request from user user2 successfully published"
31+
time="2024-10-16T12:06:47+08:00" level=info msg="request from user user1 successfully published"
32+
time="2024-10-16T12:12:09+08:00" level=info msg="request from user user1 successfully published"
33+
time="2024-10-16T12:12:14+08:00" level=info msg="request from user user2 successfully published"
34+
time="2024-10-16T12:16:10+08:00" level=info msg="request from user user1 successfully published"
35+
time="2024-10-16T12:16:15+08:00" level=info msg="request from user user2 successfully published"

‎matching-service-api/transport/endpoints.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,24 @@ package transport
22

33
import (
44
"matching-service-api/models"
5-
"github.com/gin-gonic/gin"
6-
"github.com/gin-contrib/cors"
75
"time"
6+
7+
"github.com/gin-contrib/cors"
8+
"github.com/gin-gonic/gin"
89
)
910

1011
func SetAllEndpoints(router *gin.Engine, producerQueue *models.ProducerQueue, logger *models.Logger) {
11-
router.POST("/request", HandleRquest(producerQueue, logger))
12+
router.POST("/request", HandleRequest(producerQueue, logger))
1213

1314
}
1415

1516
func SetCors(router *gin.Engine, origin string) {
1617
router.Use(cors.New(cors.Config{
1718
AllowOrigins: []string{origin},
18-
AllowMethods: []string{"POST","OPTIONS"},
19+
AllowMethods: []string{"POST", "OPTIONS"},
1920
AllowHeaders: []string{"Origin", "Content-Type", "Content-Length", "Authorization"},
2021
ExposeHeaders: []string{"Content-Length"},
2122
AllowCredentials: true,
2223
MaxAge: 2 * time.Minute,
2324
}))
24-
}
25+
}

‎matching-service-api/transport/request_handler.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/streadway/amqp"
1212
)
1313

14-
func HandleRquest(channel *models.ProducerQueue, logger *models.Logger) gin.HandlerFunc {
14+
func HandleRequest(channel *models.ProducerQueue, logger *models.Logger) gin.HandlerFunc {
1515
return func(ctx *gin.Context) {
1616
var req models.Request
1717

@@ -54,10 +54,9 @@ func HandleRquest(channel *models.ProducerQueue, logger *models.Logger) gin.Hand
5454
ContentType: "text/plain",
5555
Body: []byte(message),
5656
}); err != nil {
57-
logger.Log.Error("error publishing message:", err.Error())
58-
return
59-
}
60-
57+
logger.Log.Error("error publishing message:", err.Error())
58+
return
59+
}
6160

6261
logger.Log.Info(fmt.Sprintf("request from user %s successfully published", req.UserId))
6362
ctx.JSON(http.StatusOK, "processing request")

‎matching-service/consumer/begin_consuming.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func BeginConsuming(mq *models.MessageQueue, logger *models.Logger, clientMappin
2727
go func() {
2828
for req := range msgs {
2929
if err := Process(req, clientMappings, roomMappings); err != nil {
30-
logger.Log.Error("Unable to convert request from JSON:" + err.Error())
30+
logger.Log.Error(err.Error())
3131
}
3232
}
3333
}()

‎matching-service/consumer/process_request.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package consumer
77

88
import (
9+
"context"
910
"encoding/json"
1011
"fmt"
1112
"matching-service/models"
@@ -36,6 +37,11 @@ func Process(msg rabbit.Delivery, clientMappings *db.ClientMappings, roomMapping
3637
}
3738

3839
fmt.Println("success sending to storage blob")
40+
keys, _ := roomMappings.Conn.Keys(context.Background(), "*").Result()
41+
fmt.Println(keys)
42+
result, _ := roomMappings.Conn.HGetAll(context.Background(), "user1").Result()
43+
44+
fmt.Println(len(result))
3945
}
4046

4147
return nil

‎matching-service/log/matching_service.log‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
time="2024-10-13T11:38:29+08:00" level=info msg="Begin processing requests"
2-
time="2024-10-13T11:39:11+08:00" level=info msg="Beginning consumption from message queue"
3-
time="2024-10-13T11:39:11+08:00" level=info msg="Begin processing requests"
4-
time="2024-10-13T12:56:34+08:00" level=info msg="Beginning consumption from message queue"
5-
time="2024-10-13T12:56:34+08:00" level=info msg="Begin processing requests"
1+
time="2024-10-15T21:34:37+08:00" level=info msg="Beginning consumption from message queue"
2+
time="2024-10-15T21:34:37+08:00" level=info msg="Begin processing requests"
3+
time="2024-10-16T11:47:46+08:00" level=info msg="Beginning consumption from message queue"
4+
time="2024-10-16T11:47:46+08:00" level=info msg="Begin processing requests"
5+
time="2024-10-16T12:06:22+08:00" level=info msg="Beginning consumption from message queue"
6+
time="2024-10-16T12:06:22+08:00" level=info msg="Begin processing requests"
7+
time="2024-10-16T12:11:53+08:00" level=info msg="Beginning consumption from message queue"
8+
time="2024-10-16T12:11:53+08:00" level=info msg="Begin processing requests"

‎matching-service/main.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ func main() {
9393
logger, logFile := initialiseLogger()
9494

9595
defer logFile.Close()
96-
//TODO: remove this
97-
//deprecatedStorage := mappings.CreateMappings()
98-
9996

10097
REDIS_URI := os.Getenv("REDIS_URI")
10198

‎matching-service/models/question.go‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎matching-service/storage/room_mappings.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,13 @@ func (db *RoomMappings) SendToStorageBlob(room *models.Room) error {
7070
}
7171

7272

73-
err = db.Conn.HSet(ctx, room.User1, user1_info, room.User2, user2_info).Err()
73+
if err1 := db.Conn.HSet(ctx, room.User1, user1_info).Err(); err1 != nil {
74+
return fmt.Errorf("error setting user1's room to storage: %s", err1.Error())
75+
}
7476

75-
if err != nil {
76-
return fmt.Errorf("error setting rooms to storage: %s", err.Error())
77+
78+
if err2 := db.Conn.HSet(ctx, room.User2, user2_info).Err(); err2 != nil {
79+
return fmt.Errorf("error setting user2's room to storage: %s", err2.Error())
7780
}
7881

7982
requestTime, err := time.Parse("2006-01-02 15-04-05", room.RequestTime)

‎question_api/log/question_api.log‎

Whitespace-only changes.

0 commit comments

Comments
 (0)