From e67a5d1c26c1b0d0badb73cfb443c32dbf1574ec Mon Sep 17 00:00:00 2001 From: Brendan Burkhart Date: Sun, 5 Jun 2022 20:49:42 -0700 Subject: [PATCH] Check report ID when detecting editing conflicts --- internal/store/reports.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/store/reports.go b/internal/store/reports.go index 929c077..b12e3c8 100644 --- a/internal/store/reports.go +++ b/internal/store/reports.go @@ -164,10 +164,11 @@ func (s *Service) UpdateReportTx(ctx context.Context, tx *sqlx.Tx, r Report, rep SELECT id FROM reports WHERE - event_key = $1 AND - match_key = $2 AND - team_key = $3 AND - reporter_id = $4`, r.EventKey, r.MatchKey, r.TeamKey, r.ReporterID) + id != $1 AND + event_key = $2 AND + match_key = $3 AND + team_key = $4 AND + reporter_id = $5`, r.ID, r.EventKey, r.MatchKey, r.TeamKey, r.ReporterID) if err != nil && err != sql.ErrNoRows { return fmt.Errorf("unable to check if report exists: %w", err) } else if err == nil && !replace {