sp

nkonev · Jan 12, 2024 · 2521d40 · 2521d40
1 parent 537b28a
commit 2521d40
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/video/handlers/invite.go b/video/handlers/invite.go
@@ -327,7 +327,7 @@ func (vh *InviteHandler) ProcessAsOwnerLeave(c echo.Context) error {
 		return c.NoContent(http.StatusInternalServerError)
 	}
 
-	vh.dialRedisRepository.RemoveAllDials(c.Request().Context(), chatId, usersToDial)
+	vh.dialRedisRepository.RemoveAllDials(c.Request().Context(), chatId)
 
 	err = vh.dialStatusPublisher.Publish(chatId, usersToDial, false, ownerId)
 

diff --git a/video/services/dial_repository.go b/video/services/dial_repository.go
@@ -99,7 +99,7 @@ func chatIdFromKey(key string) (int64, error) {
 	return parseInt64, nil
 }
 
-// TODO here and in RemoveAllDials() not to remove immediately, but switch status and set expiration equal to room is closing timeout
+// TODO here and in RemoveAllDials() not to remove immediately, but switch status and set expiration on user_call_status key equal to "room is closing" timeout
 func (s *DialRedisRepository) RemoveFromDialList(ctx context.Context, userId, chatId int64) error {
 	_, err := s.redisClient.SRem(ctx, dialChatMembersKey(chatId), userId).Result()
 	if err != nil {
@@ -112,7 +112,7 @@ func (s *DialRedisRepository) RemoveFromDialList(ctx context.Context, userId, ch
 		logger.GetLogEntry(ctx).Errorf("Error during performing SCARD %v", err)
 		return err
 	}
-	if card == 0 {
+	if card == 0 { // TODO paraphrase this logic (most probably put it in scheduler) to run periodically, and if all the clients were removed - then run...
 		// remove "dialchat" on zero members
 		err = s.redisClient.Del(ctx, dialChatMembersKey(chatId)).Err()
 		if err != nil {
@@ -139,9 +139,15 @@ func (s *DialRedisRepository) RemoveFromDialList(ctx context.Context, userId, ch
 }
 
 // aka remove all dials or close call
-func (s *DialRedisRepository) RemoveAllDials(ctx context.Context, chatId int64, usersOfDial []int64) {
+func (s *DialRedisRepository) RemoveAllDials(ctx context.Context, chatId int64) {
+	usersOfDial, err := s.GetUsersToDial(ctx, chatId)
+	if err != nil {
+		logger.GetLogEntry(ctx).Errorf("Error %v", err)
+		return
+	}
+
 	// remove "dialchat"
-	err := s.redisClient.Del(ctx, dialChatMembersKey(chatId)).Err()
+	err = s.redisClient.Del(ctx, dialChatMembersKey(chatId)).Err()
 	if err != nil {
 		logger.GetLogEntry(ctx).Errorf("Error during performing SREM %v", err)
 		return