@@ -10,16 +10,16 @@ import (
1010 redis "github.com/go-redis/redis/v8"
1111)
1212
13- //same as client mappings, but separated for type safety
13+ // same as client mappings, but separated for type safety
1414type RoomMappings struct {
1515 Conn * redis.Client
1616}
1717
1818func InitialiseRoomMappings (addr string , db_num int ) * RoomMappings {
1919 conn := redis .NewClient (& redis.Options {
20- Addr :addr ,
21- DB : db_num ,
22- })
20+ Addr : addr ,
21+ DB : db_num ,
22+ })
2323
2424 return & RoomMappings {
2525 Conn : conn ,
@@ -40,61 +40,59 @@ func (db *RoomMappings) SendToStorageBlob(room *models.Room) error {
4040 return fmt .Errorf ("error marshling topics: %s" , err .Error ())
4141 }
4242
43-
4443 user1_info := map [string ]interface {}{
45- "roomId" : room .RoomId ,
46- "otherUser" : room .User2 ,
44+ "roomId" : room .RoomId ,
45+ "otherUser" : room .User2 ,
4746 "requestTime" : room .RequestTime ,
4847
49- "title" : room .Title ,
50- "titleSlug" : room .TitleSlug ,
48+ "title" : room .Title ,
49+ "titleSlug" : room .TitleSlug ,
5150 "difficulty" : room .Difficulty ,
52- "topicTags" : topics_json ,
53- "content" : room .Content ,
54- "schemas" : schema_json ,
55- "id" : room .QuestionId ,
51+ "topicTags" : topics_json ,
52+ "content" : room .Content ,
53+ "schemas" : schema_json ,
54+ "id" : room .QuestionId ,
5655 }
5756
5857 user2_info := map [string ]interface {}{
59- "roomId" : room .RoomId ,
60- "otherUser" : room .User1 ,
58+ "roomId" : room .RoomId ,
59+ "otherUser" : room .User1 ,
6160 "requestTime" : room .RequestTime ,
6261
63- "title" : room .Title ,
64- "titleSlug" : room .TitleSlug ,
62+ "title" : room .Title ,
63+ "titleSlug" : room .TitleSlug ,
6564 "difficulty" : room .Difficulty ,
66- "topicTags" : topics_json ,
67- "content" : room .Content ,
68- "schemas" : schema_json ,
69- "id" : room .QuestionId ,
65+ "topicTags" : topics_json ,
66+ "content" : room .Content ,
67+ "schemas" : schema_json ,
68+ "id" : room .QuestionId ,
7069 }
7170
72-
73- if err1 := db .Conn .HSet (ctx , room .User1 , user1_info ).Err (); err1 != nil {
71+ if err1 := db .Conn .HSet (ctx , room .User1 , user1_info ).Err (); err1 != nil {
7472 return fmt .Errorf ("error setting user1's room to storage: %s" , err1 .Error ())
7573 }
7674
77-
78- if err2 := db .Conn .HSet (ctx , room .User2 , user2_info ).Err (); err2 != nil {
75+ if err2 := db .Conn .HSet (ctx , room .User2 , user2_info ).Err (); err2 != nil {
7976 return fmt .Errorf ("error setting user2's room to storage: %s" , err2 .Error ())
8077 }
81-
78+
8279 requestTime , err := time .Parse ("2006-01-02 15-04-05" , room .RequestTime )
8380
8481 if err != nil {
8582 return fmt .Errorf ("error parsing the time: %s" , err .Error ())
8683 }
8784
88- expiryTime := requestTime .Add (30 * time .Second )
85+ expiryTime := requestTime .Add (30 * time .Second ).Add (- 8 * time .Hour )
86+
8987 diff := int (time .Until (expiryTime ).Seconds ())
90-
91- if err1 := db .Conn .Expire (ctx , room .User1 , time .Duration (diff ) * time .Second ).Err (); err1 != nil {
88+
89+ if err1 := db .Conn .Expire (ctx , room .User1 , time .Duration (diff )* time .Second ).Err (); err1 != nil {
9290 return fmt .Errorf ("error setting expiry time on room data: %s" , err1 .Error ())
9391 }
94-
95- if err2 := db .Conn .Expire (ctx , room .User2 , time .Duration (diff ) * time .Second ).Err (); err2 != nil {
92+
93+ if err2 := db .Conn .Expire (ctx , room .User2 , time .Duration (diff )* time .Second ).Err (); err2 != nil {
9694 return fmt .Errorf ("error setting expiry time on room data: %s" , err2 .Error ())
97- }
98-
95+ }
96+
9997 return nil
100- }
98+ }
0 commit comments