UPDATE: Try fix bug
All checks were successful
Build and Release / release (push) Successful in 1m8s
All checks were successful
Build and Release / release (push) Successful in 1m8s
This commit is contained in:
@@ -66,34 +66,38 @@ UPDATE submissions
|
|||||||
SET
|
SET
|
||||||
status = COALESCE(sqlc.narg('status'), status),
|
status = COALESCE(sqlc.narg('status'), status),
|
||||||
reviewed_by = COALESCE(sqlc.narg('reviewed_by'), reviewed_by),
|
reviewed_by = COALESCE(sqlc.narg('reviewed_by'), reviewed_by),
|
||||||
|
reviewed_at = CASE WHEN sqlc.narg('status') IS NOT NULL THEN NOW() ELSE reviewed_at END,
|
||||||
review_note = COALESCE(sqlc.narg('review_note'), review_note),
|
review_note = COALESCE(sqlc.narg('review_note'), review_note),
|
||||||
content = COALESCE(sqlc.narg('content'), content)
|
content = COALESCE(sqlc.narg('content'), content)
|
||||||
FROM projects p, users u
|
|
||||||
LEFT JOIN user_profiles up ON u.id = up.user_id
|
|
||||||
LEFT JOIN users ru ON submissions.reviewed_by = ru.id
|
|
||||||
LEFT JOIN user_profiles rup ON ru.id = rup.user_id
|
|
||||||
WHERE submissions.id = sqlc.arg('id')
|
WHERE submissions.id = sqlc.arg('id')
|
||||||
AND submissions.project_id = p.id
|
|
||||||
AND submissions.user_id = u.id
|
|
||||||
RETURNING
|
RETURNING
|
||||||
submissions.id, submissions.project_id, submissions.commit_id, submissions.user_id, submissions.created_at, submissions.status, submissions.reviewed_by, submissions.reviewed_at, submissions.review_note, submissions.content, submissions.is_deleted,
|
submissions.id, submissions.project_id, submissions.commit_id, submissions.user_id, submissions.created_at, submissions.status, submissions.reviewed_by, submissions.reviewed_at, submissions.review_note, submissions.content, submissions.is_deleted,
|
||||||
p.title AS project_title, p.description AS project_description,
|
(SELECT title FROM projects WHERE id = submissions.project_id) AS project_title,
|
||||||
json_build_object(
|
(SELECT description FROM projects WHERE id = submissions.project_id) AS project_description,
|
||||||
|
(
|
||||||
|
SELECT json_build_object(
|
||||||
'id', u.id,
|
'id', u.id,
|
||||||
'email', u.email,
|
'email', u.email,
|
||||||
'display_name', up.display_name,
|
'display_name', up.display_name,
|
||||||
'full_name', up.full_name,
|
'full_name', up.full_name,
|
||||||
'avatar_url', up.avatar_url
|
'avatar_url', up.avatar_url
|
||||||
|
)
|
||||||
|
FROM users u
|
||||||
|
LEFT JOIN user_profiles up ON u.id = up.user_id
|
||||||
|
WHERE u.id = submissions.user_id
|
||||||
)::json AS user,
|
)::json AS user,
|
||||||
CASE WHEN submissions.reviewed_by IS NOT NULL THEN
|
(
|
||||||
json_build_object(
|
SELECT json_build_object(
|
||||||
'id', ru.id,
|
'id', ru.id,
|
||||||
'email', ru.email,
|
'email', ru.email,
|
||||||
'display_name', rup.display_name,
|
'display_name', rup.display_name,
|
||||||
'full_name', rup.full_name,
|
'full_name', rup.full_name,
|
||||||
'avatar_url', rup.avatar_url
|
'avatar_url', rup.avatar_url
|
||||||
)::json
|
)
|
||||||
ELSE NULL::json END AS reviewer;
|
FROM users ru
|
||||||
|
LEFT JOIN user_profiles rup ON ru.id = rup.user_id
|
||||||
|
WHERE ru.id = submissions.reviewed_by
|
||||||
|
)::json AS reviewer;
|
||||||
|
|
||||||
-- name: DeleteSubmission :exec
|
-- name: DeleteSubmission :exec
|
||||||
UPDATE submissions
|
UPDATE submissions
|
||||||
|
|||||||
@@ -451,34 +451,38 @@ UPDATE submissions
|
|||||||
SET
|
SET
|
||||||
status = COALESCE($1, status),
|
status = COALESCE($1, status),
|
||||||
reviewed_by = COALESCE($2, reviewed_by),
|
reviewed_by = COALESCE($2, reviewed_by),
|
||||||
|
reviewed_at = CASE WHEN $1 IS NOT NULL THEN NOW() ELSE reviewed_at END,
|
||||||
review_note = COALESCE($3, review_note),
|
review_note = COALESCE($3, review_note),
|
||||||
content = COALESCE($4, content)
|
content = COALESCE($4, content)
|
||||||
FROM projects p, users u
|
|
||||||
LEFT JOIN user_profiles up ON u.id = up.user_id
|
|
||||||
LEFT JOIN users ru ON submissions.reviewed_by = ru.id
|
|
||||||
LEFT JOIN user_profiles rup ON ru.id = rup.user_id
|
|
||||||
WHERE submissions.id = $5
|
WHERE submissions.id = $5
|
||||||
AND submissions.project_id = p.id
|
|
||||||
AND submissions.user_id = u.id
|
|
||||||
RETURNING
|
RETURNING
|
||||||
submissions.id, submissions.project_id, submissions.commit_id, submissions.user_id, submissions.created_at, submissions.status, submissions.reviewed_by, submissions.reviewed_at, submissions.review_note, submissions.content, submissions.is_deleted,
|
submissions.id, submissions.project_id, submissions.commit_id, submissions.user_id, submissions.created_at, submissions.status, submissions.reviewed_by, submissions.reviewed_at, submissions.review_note, submissions.content, submissions.is_deleted,
|
||||||
p.title AS project_title, p.description AS project_description,
|
(SELECT title FROM projects WHERE id = submissions.project_id) AS project_title,
|
||||||
json_build_object(
|
(SELECT description FROM projects WHERE id = submissions.project_id) AS project_description,
|
||||||
|
(
|
||||||
|
SELECT json_build_object(
|
||||||
'id', u.id,
|
'id', u.id,
|
||||||
'email', u.email,
|
'email', u.email,
|
||||||
'display_name', up.display_name,
|
'display_name', up.display_name,
|
||||||
'full_name', up.full_name,
|
'full_name', up.full_name,
|
||||||
'avatar_url', up.avatar_url
|
'avatar_url', up.avatar_url
|
||||||
|
)
|
||||||
|
FROM users u
|
||||||
|
LEFT JOIN user_profiles up ON u.id = up.user_id
|
||||||
|
WHERE u.id = submissions.user_id
|
||||||
)::json AS user,
|
)::json AS user,
|
||||||
CASE WHEN submissions.reviewed_by IS NOT NULL THEN
|
(
|
||||||
json_build_object(
|
SELECT json_build_object(
|
||||||
'id', ru.id,
|
'id', ru.id,
|
||||||
'email', ru.email,
|
'email', ru.email,
|
||||||
'display_name', rup.display_name,
|
'display_name', rup.display_name,
|
||||||
'full_name', rup.full_name,
|
'full_name', rup.full_name,
|
||||||
'avatar_url', rup.avatar_url
|
'avatar_url', rup.avatar_url
|
||||||
)::json
|
)
|
||||||
ELSE NULL::json END AS reviewer
|
FROM users ru
|
||||||
|
LEFT JOIN user_profiles rup ON ru.id = rup.user_id
|
||||||
|
WHERE ru.id = submissions.reviewed_by
|
||||||
|
)::json AS reviewer
|
||||||
`
|
`
|
||||||
|
|
||||||
type UpdateSubmissionParams struct {
|
type UpdateSubmissionParams struct {
|
||||||
|
|||||||
@@ -558,14 +558,13 @@ func (s *submissionService) UpdateSubmissionStatus(ctx context.Context, reviewer
|
|||||||
}
|
}
|
||||||
|
|
||||||
updatedSubmission, err := submissionRepo.Update(ctx, arg)
|
updatedSubmission, err := submissionRepo.Update(ctx, arg)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to update submission status")
|
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to update submission status: " + err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
err = tx.Commit(ctx)
|
err = tx.Commit(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to commit transaction")
|
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to commit transaction: " + err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
if status == constants.StatusTypeApproved {
|
if status == constants.StatusTypeApproved {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ const (
|
|||||||
TokenExpirationDuration = 20 * time.Minute
|
TokenExpirationDuration = 20 * time.Minute
|
||||||
NormalCacheDuration = 15 * time.Minute
|
NormalCacheDuration = 15 * time.Minute
|
||||||
ListCacheDuration = 10 * time.Minute
|
ListCacheDuration = 10 * time.Minute
|
||||||
AccessTokenDuration = 15 * time.Minute
|
AccessTokenDuration = 30 * time.Minute
|
||||||
RefreshTokenDuration = 7 * 24 * time.Hour
|
RefreshTokenDuration = 7 * 24 * time.Hour
|
||||||
TokenVerifiedDuration = 10 * time.Minute
|
TokenVerifiedDuration = 10 * time.Minute
|
||||||
PreSignedURLDuration = 15 * time.Minute
|
PreSignedURLDuration = 15 * time.Minute
|
||||||
|
|||||||
Reference in New Issue
Block a user