32bitcafe/guestbook
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects 1 Releases Wiki Activity

14-cleanup #15

Merged
yequari merged 6 commits from 14-cleanup into dev 2025-03-23 22:16:51 +00:00
Conversation 0 Commits 6 Files Changed 23 +8 -8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fa5507e719 - Show all commits

2
db/create-tables-sqlite.sql
View File

@ -3,7 +3,7 @@ CREATE TABLE users (
ShortId integer UNIQUE NOT NULL, ShortId integer UNIQUE NOT NULL,
Username varchar(32) NOT NULL, Username varchar(32) NOT NULL,
Email varchar(256) UNIQUE NOT NULL, Email varchar(256) UNIQUE NOT NULL,
IsDeleted boolean NOT NULL DEFAULT FALSE, Deleted datetime,
IsBanned boolean NOT NULL DEFAULT FALSE, IsBanned boolean NOT NULL DEFAULT FALSE,
HashedPassword char(60) NOT NULL, HashedPassword char(60) NOT NULL,
Created datetime NOT NULL Created datetime NOT NULL

14
internal/models/user.go
View File

@ -15,7 +15,7 @@ type User struct {
ShortId uint64 ShortId uint64
Username string Username string
Email string Email string
IsDeleted bool Deleted bool
IsBanned bool IsBanned bool
HashedPassword []byte HashedPassword []byte
Created time.Time Created time.Time
@ -30,8 +30,8 @@ func (m *UserModel) Insert(shortId uint64, username string, email string, passwo
if err != nil { if err != nil {
return err return err
} }
stmt := `INSERT INTO users (ShortId, Username, Email, IsDeleted, IsBanned, HashedPassword, Created) stmt := `INSERT INTO users (ShortId, Username, Email, IsBanned, HashedPassword, Created)
VALUES (?, ?, ?, FALSE, FALSE, ?, ?)` VALUES (?, ?, ?, FALSE, ?, ?)`
_, err = m.DB.Exec(stmt, shortId, username, email, hashedPassword, time.Now().UTC()) _, err = m.DB.Exec(stmt, shortId, username, email, hashedPassword, time.Now().UTC())
if err != nil { if err != nil {
if sqliteError, ok := err.(sqlite3.Error); ok { if sqliteError, ok := err.(sqlite3.Error); ok {
@ -45,7 +45,7 @@ func (m *UserModel) Insert(shortId uint64, username string, email string, passwo
} }
func (m *UserModel) Get(id uint64) (User, error) { func (m *UserModel) Get(id uint64) (User, error) {
stmt := `SELECT Id, ShortId, Username, Email, Created FROM users WHERE ShortId = ? AND IsDeleted = FALSE` stmt := `SELECT Id, ShortId, Username, Email, Created FROM users WHERE ShortId = ? AND Deleted IS NULL`
row := m.DB.QueryRow(stmt, id) row := m.DB.QueryRow(stmt, id)
var u User var u User
err := row.Scan(&u.ID, &u.ShortId, &u.Username, &u.Email, &u.Created) err := row.Scan(&u.ID, &u.ShortId, &u.Username, &u.Email, &u.Created)
@ -59,7 +59,7 @@ func (m *UserModel) Get(id uint64) (User, error) {
} }
func (m *UserModel) GetById(id int64) (User, error) { func (m *UserModel) GetById(id int64) (User, error) {
stmt := `SELECT Id, ShortId, Username, Email, Created FROM users WHERE Id = ? AND IsDeleted = FALSE` stmt := `SELECT Id, ShortId, Username, Email, Created FROM users WHERE Id = ? AND Deleted IS NULL`
row := m.DB.QueryRow(stmt, id) row := m.DB.QueryRow(stmt, id)
var u User var u User
err := row.Scan(&u.ID, &u.ShortId, &u.Username, &u.Email, &u.Created) err := row.Scan(&u.ID, &u.ShortId, &u.Username, &u.Email, &u.Created)
@ -73,7 +73,7 @@ func (m *UserModel) GetById(id int64) (User, error) {
} }
func (m *UserModel) GetAll() ([]User, error) { func (m *UserModel) GetAll() ([]User, error) {
stmt := `SELECT Id, ShortId, Username, Email, Created FROM users WHERE IsDeleted = FALSE` stmt := `SELECT Id, ShortId, Username, Email, Created FROM users WHERE DELETED IS NULL`
rows, err := m.DB.Query(stmt) rows, err := m.DB.Query(stmt)
if err != nil { if err != nil {
return nil, err return nil, err
@ -121,7 +121,7 @@ func (m *UserModel) Authenticate(email, password string) (int64, error) {
func (m *UserModel) Exists(id int64) (bool, error) { func (m *UserModel) Exists(id int64) (bool, error) {
var exists bool var exists bool
stmt := `SELECT EXISTS(SELECT true FROM users WHERE Id = ? AND IsDeleted = False)` stmt := `SELECT EXISTS(SELECT true FROM users WHERE Id = ? AND DELETED IS NULL)`
err := m.DB.QueryRow(stmt, id).Scan(&exists) err := m.DB.QueryRow(stmt, id).Scan(&exists)
return exists, err return exists, err
} }