kratisto/hamster-tycoon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forget what i did

Browse Source
This commit is contained in:
Jeffrey Duroyon
2020-05-06 01:23:40 +02:00
parent f982922ef3
commit f00db120f2
6 changed files with 49 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
storage/dao/postgresql/database_postgresql_user.go
View File

@@ -10,7 +10,7 @@ import (
func (db *DatabasePostgreSQL) GetAllUsers() ([]*model.User, error) {
q := `
SELECT u.id, u.email, u.created_at, u.updated_at, u.nickname
SELECT u.id, u.created_at, u.updated_at, u.nickname
FROM public.user u
`
rows, err := db.session.Query(q)
@@ -22,7 +22,7 @@ func (db *DatabasePostgreSQL) GetAllUsers() ([]*model.User, error) {
us := make([]*model.User, 0)
for rows.Next() {
u := model.User{}
err := rows.Scan(&u.ID, &u.Email, &u.CreatedAt, &u.UpdatedAt, &u.Nickname)
err := rows.Scan(&u.ID, &u.CreatedAt, &u.UpdatedAt, &u.Nickname)
if err != nil {
return nil, err
}
@@ -33,14 +33,14 @@ func (db *DatabasePostgreSQL) GetAllUsers() ([]*model.User, error) {
func (db *DatabasePostgreSQL) GetUsersByID(id string) (*model.User, error) {
q := `
SELECT u.id, u.email, u.created_at, u.updated_at, u.nickname
SELECT u.id, u.created_at, u.updated_at, u.nickname
FROM public.user u
WHERE u.id = $1
`
row := db.session.QueryRow(q, id)
u := model.User{}
err := row.Scan(&u.ID, &u.Email, &u.CreatedAt, &u.UpdatedAt, &u.Nickname)
err := row.Scan(&u.ID, &u.CreatedAt, &u.UpdatedAt, &u.Nickname)
if errPq, ok := err.(*pq.Error); ok {
return nil, handlePgError(errPq)
}
@@ -53,14 +53,14 @@ func (db *DatabasePostgreSQL) GetUsersByID(id string) (*model.User, error) {
func (db *DatabasePostgreSQL) CreateUser(user *model.User) error {
q := `
INSERT INTO public.user
(email, nickname, google_id)
(nickname, google_id)
VALUES
($1, $2, $3)
RETURNING id, created_at
`
err := db.session.
QueryRow(q, user.Email, user.Nickname, user.GoogleId).
QueryRow(q, user.Nickname, user.GoogleId).
Scan(&user.ID, &user.CreatedAt)
if errPq, ok := err.(*pq.Error); ok {
return handlePgError(errPq)
@@ -82,33 +82,19 @@ func (db *DatabasePostgreSQL) DeleteUser(id string) error {
}
func (db *DatabasePostgreSQL) UpdateUser(user *model.User) error {
q := `
UPDATE public.user
SET
email = $2
WHERE id = $1
RETURNING updated_at
`
err := db.session.
QueryRow(q, user.ID, user.Email).
Scan(&user.UpdatedAt)
if errPq, ok := err.(*pq.Error); ok {
return handlePgError(errPq)
}
return err
return nil
}
func (db *DatabasePostgreSQL) GetUsersByGoogleID(id string) (*model.User, error) {
q := `
SELECT u.id, u.email, u.created_at, u.updated_at, u.nickname, u.google_id
SELECT u.id, u.created_at, u.updated_at, u.nickname, u.google_id
FROM public.user u
WHERE u.google_id = $1
`
row := db.session.QueryRow(q, id)
u := model.User{}
err := row.Scan(&u.ID, &u.Email, &u.CreatedAt, &u.UpdatedAt, &u.Nickname, &u.GoogleId)
err := row.Scan(&u.ID, &u.CreatedAt, &u.UpdatedAt, &u.Nickname, &u.GoogleId)
if errPq, ok := err.(*pq.Error); ok {
return nil, handlePgError(errPq)
}