SQuiz/worker
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix mail

Browse Source
This commit is contained in:
Pavel 2024-09-24 11:45:32 +03:00
parent dcd683ee28
commit 076a5b5b79
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
answerwc/to_client.go
View File

@ -140,12 +140,13 @@ func (w *SendToClient) processPendingAnswer(ctx context.Context) {
return return
} }
allAnswers, err := w.dal.AnswerRepo.GetAllAnswersByQuizID(ctx, answer.Session) allAnswersDirty, err := w.dal.AnswerRepo.GetAllAnswersByQuizID(ctx, answer.Session)
fmt.Println("ANS4", err) fmt.Println("ANS4", err)
if err != nil { if err != nil {
w.reportError(err, "Error getting all answers by quizID") w.reportError(err, "Error getting all answers by quizID")
return return
} }
allAnswers := wctools.CleanNullContent(allAnswersDirty)
questionsMap, sortedallAnswers, err := w.dal.QuestionRepo.GetMapQuestions(ctx, allAnswers) questionsMap, sortedallAnswers, err := w.dal.QuestionRepo.GetMapQuestions(ctx, allAnswers)
fmt.Println("ANS5", err) fmt.Println("ANS5", err)

14
wctools/tools.go
View File

@ -3,12 +3,12 @@ package wctools
import ( import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model" "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model"
"penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model/tariff" "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model/tariff"
"strings" "strings"
"time" "time"
"fmt"
) )
var DaysOfWeek = map[string]string{ var DaysOfWeek = map[string]string{
@ -53,7 +53,7 @@ func IsValidMessage(message []byte, expectedServiceKey string) ([]model.Privileg
var validPrivileges []model.PrivilegeMessage var validPrivileges []model.PrivilegeMessage
for _, privilege := range privileges { for _, privilege := range privileges {
fmt.Println("IVM1", privilege.ServiceKey, privilege) fmt.Println("IVM1", privilege.ServiceKey, privilege)
if IsServiceKeyValid(privilege.ServiceKey, expectedServiceKey) { if IsServiceKeyValid(privilege.ServiceKey, expectedServiceKey) {
validPrivileges = append(validPrivileges, model.PrivilegeMessage{ validPrivileges = append(validPrivileges, model.PrivilegeMessage{
PrivilegeID: privilege.PrivilegeID, PrivilegeID: privilege.PrivilegeID,
@ -143,3 +143,13 @@ func ToJSON(data interface{}) (string, error) {
} }
return string(result), nil return string(result), nil
} }
func CleanNullContent(answers []model.ResultAnswer) []model.ResultAnswer {
var results []model.ResultAnswer
for _, answer := range answers {
if answer.Content != "" {
results = append(results, answer)
}
}
return results
}