clear

internal/services/pdf_service/service.go

@@ -40,10 +40,6 @@ func CreateTeamsPdf(teams []*models.Team) ([]byte, error) {
 		y := (padding + 15) + yDelta*float64(i%countOnPage/3)
 		x := padding + xDelta*float64(i%3)
 
-		url, err := team.GetTeamUrl()
-		if err != nil {
-			return nil, err
-		}
 		if err := printTextCenter(pdf, "Подключите Wi-Fi", xDelta-6, x+3, y); err != nil {
 			return nil, err
 		}
@@ -53,7 +49,7 @@ func CreateTeamsPdf(teams []*models.Team) ([]byte, error) {
 		if err := printTextCenter(pdf, "Пароль: 12345678", xDelta-6, x+3, 30+y); err != nil {
 			return nil, err
 		}
-		if err := printQR(pdf, url, x+21, 65+y); err != nil {
+		if err := printQR(pdf, team.Link, x+21, 65+y); err != nil {
 			return nil, err
 		}
 		if err := printTextCenter(pdf, "Войдите в приложение по qr", xDelta-6, x+3, 55+y); err != nil {

internal/services/services.go

@@ -5,6 +5,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"evening_detective/internal/models"
+	"evening_detective/internal/modules/link"
 	"evening_detective/internal/modules/password"
 	"evening_detective/internal/services/pdf_service"
 	"evening_detective/internal/services/story_service"
@@ -20,15 +21,18 @@ import (
 type Services struct {
 	repository   *Repository
 	storyService *story_service.StoryService
+	linkService  link.ILinkService
 }
 
 func NewServices(
 	repository *Repository,
 	storyService *story_service.StoryService,
+	linkService link.ILinkService,
 ) *Services {
 	return &Services{
 		repository:   repository,
 		storyService: storyService,
+		linkService:  linkService,
 	}
 }
 
@@ -153,7 +157,7 @@ func (s *Services) GetTeams(ctx context.Context, _ *proto.GetTeamsReq) (*proto.G
 		if err != nil {
 			return nil, err
 		}
-		newTeam.Url, err = team.GetTeamUrl()
+		newTeam.Url, err = s.linkService.GetTeamClientLink(team.Name, team.Password)
 		if err != nil {
 			return nil, err
 		}
@@ -193,6 +197,12 @@ func (s *Services) DownloadTeamsQrCodesFile(ctx context.Context, req *proto.Down
 	if err != nil {
 		return nil, err
 	}
+	for _, team := range teams {
+		team.Link, err = s.linkService.GetTeamClientLink(team.Name, team.Password)
+		if err != nil {
+			return nil, err
+		}
+	}
 	b, err := pdf_service.CreateTeamsPdf(teams)
 	if err != nil {
 		return nil, err