add to amoDal account repo, and add value to query

dal/dal.go

@@ -116,6 +116,7 @@ type AmoDal struct {
 	QuestionRepo *question.QuestionRepository
 	AnswerRepo   *answer.AnswerRepository
 	QuizRepo     *quiz.QuizRepository
+	AccountRepo  *account.AccountRepository
 }
 
 func NewAmoDal(ctx context.Context, cred string) (*AmoDal, error) {
@@ -153,6 +154,11 @@ func NewAmoDal(ctx context.Context, cred string) (*AmoDal, error) {
 		Pool:    pool,
 	})
 
+	accountRepo := account.NewAccountRepository(account.Deps{
+		Queries: queries,
+		Pool:    pool,
+	})
+
 	return &AmoDal{
 		conn:         pool,
 		queries:      queries,
@@ -160,6 +166,7 @@ func NewAmoDal(ctx context.Context, cred string) (*AmoDal, error) {
 		QuestionRepo: questionRepo,
 		AnswerRepo:   answerRepo,
 		QuizRepo:     quizRepo,
+		AccountRepo:  accountRepo,
 	}, nil
 }
 

dal/db_query/queries.sql

@@ -993,7 +993,7 @@ SELECT a.quiz_id,a.id,a.result,a.question_id,a.content,a.session,
       FROM answer a2
       WHERE a2.start = true AND a2.session = a.session
       LIMIT 1) AS utm
-,t.accesstoken,r.accountid,r.fieldsrule,r.tagstoadd,r.performerid,r.stepid,r.pipelineid,(SELECT u.name FROM users u WHERE u.amoid = r.performerid) AS performer_name,u.subdomain
+,t.accesstoken,r.accountid,r.fieldsrule,r.tagstoadd,r.performerid,r.stepid,r.pipelineid,(SELECT u.name FROM users u WHERE u.amoid = r.performerid) AS performer_name,u.subdomain,u.accountid
 FROM answer a
          INNER JOIN quiz q ON a.quiz_id = q.id
          LEFT JOIN amoCRMStatuses s ON a.id = s.AnswerID