babariviere/short
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: return URL if it already exists

Browse source
This commit is contained in:
Bastien Riviere 2024-01-29 21:37:27 +01:00
parent 38f29e147f
commit a3dc0b646b
Signed by: babariviere
GPG key ID: 4E5F0839249F162E
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/api/handler.go
View file

@ -50,12 +50,6 @@ func (h *handler) CreateShortURL(ctx context.Context, req *oas.CreateShortURLReq
LongUrl: req.URL,
})
if err != nil {
// No row == conflict since we do a "ON CONFLICT DO NOTHING"
if errors.Is(err, pgx.ErrNoRows) {
return &oas.CreateShortURLBadRequest{
Message: oas.NewOptString("URL already exist."),
}, nil
}
return nil, fmt.Errorf("failed to insert url: %w", err)
}

2
internal/db/query.sql.go
View file

@ -24,7 +24,7 @@ func (q *Queries) GetURLByHash(ctx context.Context, hash string) (Url, error) {
const insertURL = `-- name: InsertURL :one
INSERT INTO urls (hash, long_url)
VALUES ($1, $2)
ON CONFLICT (hash) DO NOTHING
ON CONFLICT (hash) DO UPDATE SET hash = EXCLUDED.hash -- force row to be returned
RETURNING id, hash, long_url
`

2
sql/query.sql
View file

@ -5,5 +5,5 @@ WHERE hash = $1;
-- name: InsertURL :one
INSERT INTO urls (hash, long_url)
VALUES ($1, $2)
ON CONFLICT (hash) DO NOTHING
ON CONFLICT (hash) DO UPDATE SET hash = EXCLUDED.hash -- force row to be returned
RETURNING *;