--

dal/db_query/queries.sql

@@ -581,7 +581,7 @@ WHERE
                  quiz as q
              WHERE
                  q.qid = $1
-             RETURNING id,qid;  
+             RETURNING (select id from quiz where qid = $2),id, qid;  
     
 -- name: CopyQuestionQuizID :exec
 INSERT INTO question (

dal/sqlcgen/queries.sql.go

@@ -1762,7 +1762,7 @@ const quizCopyQid = `-- name: QuizCopyQid :one
                  quiz as q
              WHERE
                  q.qid = $1
-             RETURNING id,qid
+             RETURNING (select id from quiz where qid = $2),id, qid
 `
 
 type QuizCopyQidParams struct {
@@ -1771,14 +1771,15 @@ type QuizCopyQidParams struct {
 }
 
 type QuizCopyQidRow struct {
-	ID  int64         `db:"id" json:"id"`
-	Qid uuid.NullUUID `db:"qid" json:"qid"`
+	ID   int64         `db:"id" json:"id"`
+	ID_2 int64         `db:"id_2" json:"id_2"`
+	Qid  uuid.NullUUID `db:"qid" json:"qid"`
 }
 
 func (q *Queries) QuizCopyQid(ctx context.Context, arg QuizCopyQidParams) (QuizCopyQidRow, error) {
 	row := q.db.QueryRowContext(ctx, quizCopyQid, arg.Qid, arg.Accountid)
 	var i QuizCopyQidRow
-	err := row.Scan(&i.ID, &i.Qid)
+	err := row.Scan(&i.ID, &i.ID_2, &i.Qid)
 	return i, err
 }
 

repository/quiz/quiz.go

@@ -596,13 +596,13 @@ func (r *QuizRepository) QuizMove(ctx context.Context, qID, accountID string) (s
 	}
 
 	err = r.queries.CopyQuestionQuizID(ctx, sqlcgen.CopyQuestionQuizIDParams{
-		QuizID:   data.OriginalQuizID,
-		QuizID_2: data.NewQuizID,
+		QuizID:   data.ID,
+		QuizID_2: data.ID_2,
 	})
 
 	if err != nil {
 		return "", err
 	}
 
-	return data.OriginalQid.UUID.String(), err
+	return data.Qid.UUID.String(), err
 }