fix mail
This commit is contained in:
parent
dcd683ee28
commit
076a5b5b79
@ -140,12 +140,13 @@ func (w *SendToClient) processPendingAnswer(ctx context.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
allAnswers, err := w.dal.AnswerRepo.GetAllAnswersByQuizID(ctx, answer.Session)
|
||||
allAnswersDirty, err := w.dal.AnswerRepo.GetAllAnswersByQuizID(ctx, answer.Session)
|
||||
fmt.Println("ANS4", err)
|
||||
if err != nil {
|
||||
w.reportError(err, "Error getting all answers by quizID")
|
||||
return
|
||||
}
|
||||
allAnswers := wctools.CleanNullContent(allAnswersDirty)
|
||||
|
||||
questionsMap, sortedallAnswers, err := w.dal.QuestionRepo.GetMapQuestions(ctx, allAnswers)
|
||||
fmt.Println("ANS5", err)
|
||||
|
@ -3,12 +3,12 @@ package wctools
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/golang/protobuf/proto"
|
||||
"penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model"
|
||||
"penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model/tariff"
|
||||
"strings"
|
||||
"time"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
var DaysOfWeek = map[string]string{
|
||||
@ -53,7 +53,7 @@ func IsValidMessage(message []byte, expectedServiceKey string) ([]model.Privileg
|
||||
|
||||
var validPrivileges []model.PrivilegeMessage
|
||||
for _, privilege := range privileges {
|
||||
fmt.Println("IVM1", privilege.ServiceKey, privilege)
|
||||
fmt.Println("IVM1", privilege.ServiceKey, privilege)
|
||||
if IsServiceKeyValid(privilege.ServiceKey, expectedServiceKey) {
|
||||
validPrivileges = append(validPrivileges, model.PrivilegeMessage{
|
||||
PrivilegeID: privilege.PrivilegeID,
|
||||
@ -143,3 +143,13 @@ func ToJSON(data interface{}) (string, error) {
|
||||
}
|
||||
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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user