From 76e040054fa988d3b0968e9f7a998e9a298d6f11 Mon Sep 17 00:00:00 2001
From: bayusamudra5502 <bayusamudra.55.02.com@gmail.com>
Date: Fri, 5 May 2023 00:21:07 +0700
Subject: [PATCH] fix: finish all quiz
---
repository/quiz/impl.go | 10 +++++-----
repository/quiz/type.go | 4 ++--
service/admin/addUser.go | 8 ++++----
service/quiz/impl.go | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/repository/quiz/impl.go b/repository/quiz/impl.go
index 8f593bc..d9dfa01 100644
--- a/repository/quiz/impl.go
+++ b/repository/quiz/impl.go
@@ -40,10 +40,10 @@ func (q *QuizRepositoryImpl) GetQuizDetail(quizId uuid.UUID) (*quiz.Quiz, error)
return result, nil
}
-func (q *QuizRepositoryImpl) UpdateScore(takeId uuid.UUID, score int) error {
+func (q *QuizRepositoryImpl) UpdateScore(quizId uuid.UUID, score int) error {
return q.db.
Model(&quiz.QuizTake{}).
- Where("id = ?", takeId).
+ Where("quiz_id = ?", quizId).
Updates(quiz.QuizTake{
Score: score,
IsFinished: true,
@@ -76,15 +76,15 @@ func (q *QuizRepositoryImpl) IsUserContributor(id string, email string) (bool, e
return true, nil
}
-func(q *QuizRepositoryImpl) NewQuiz(quiz quiz.Quiz) error {
+func (q *QuizRepositoryImpl) NewQuiz(quiz quiz.Quiz) error {
return q.db.Create(&quiz).Error
}
-func(q *QuizRepositoryImpl) UpdateQuiz(quiz quiz.Quiz) error {
+func (q *QuizRepositoryImpl) UpdateQuiz(quiz quiz.Quiz) error {
return q.db.Save(quiz).Error
}
-func(q *QuizRepositoryImpl) Delete(quizId uuid.UUID) error {
+func (q *QuizRepositoryImpl) Delete(quizId uuid.UUID) error {
return q.db.Delete(&quiz.Quiz{}, quizId).Error
}
diff --git a/repository/quiz/type.go b/repository/quiz/type.go
index 72d7e0f..00c42ab 100644
--- a/repository/quiz/type.go
+++ b/repository/quiz/type.go
@@ -8,12 +8,12 @@ import (
type QuizRepository interface {
GetQuizes(courseId string) ([]quiz.Quiz, error)
GetQuizDetail(quizId uuid.UUID) (*quiz.Quiz, error)
- UpdateScore(takeId uuid.UUID, score int) error
+ UpdateScore(quizId uuid.UUID, score int) error
NewTake(quizId uuid.UUID, userEmail string) (uuid.UUID, error)
IsUserContributor(id string, email string) (bool, error)
NewQuiz(quiz quiz.Quiz) error
UpdateQuiz(quiz quiz.Quiz) error
- Delete(quizId uuid.UUID) error
+ Delete(quizId uuid.UUID) error
IsActiveTake(quizId uuid.UUID, userEmail string) (bool, error)
GetAllTake(quizId uuid.UUID, userEmail string) ([]quiz.QuizTake, error)
GetLastTake(quizId uuid.UUID, userEmail string) (*quiz.QuizTake, error)
diff --git a/service/admin/addUser.go b/service/admin/addUser.go
index 93e53b0..8bcf120 100644
--- a/service/admin/addUser.go
+++ b/service/admin/addUser.go
@@ -10,11 +10,11 @@ func (as AdminServiceImpl) AddUser(payload req.AdminAddUserPayload) error {
var role user.UserRole
// TODO: move this
- if (payload.Role == "admin") {
+ if payload.Role == "admin" {
role = user.Admin
- } else if (payload.Role == "contributor") {
+ } else if payload.Role == "contributor" {
role = user.Contributor
- } else if (payload.Role == "member") {
+ } else if payload.Role == "member" {
role = user.Student
}
@@ -26,4 +26,4 @@ func (as AdminServiceImpl) AddUser(payload req.AdminAddUserPayload) error {
})
return err
-}
\ No newline at end of file
+}
diff --git a/service/quiz/impl.go b/service/quiz/impl.go
index 52befa2..cd04b0e 100644
--- a/service/quiz/impl.go
+++ b/service/quiz/impl.go
@@ -180,7 +180,7 @@ func (q QuizServiceImpl) DoFinishQuiz(ctx context.Context, quizId uuid.UUID, ema
return nil, err
}
- err = q.QuizRepository.UpdateScore(data.Id, int(score))
+ err = q.QuizRepository.UpdateScore(quizId, int(score))
if err != nil {
return nil, err
--
GitLab