From fa5507e71916d48287007f2df884773ff942c970 Mon Sep 17 00:00:00 2001 From: yequari Date: Sun, 23 Mar 2025 14:39:31 -0700 Subject: [PATCH] convert user deleted field --- db/create-tables-sqlite.sql | 2 +- internal/models/user.go | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/db/create-tables-sqlite.sql b/db/create-tables-sqlite.sql index ebeabcb..cf7dc9a 100644 --- a/db/create-tables-sqlite.sql +++ b/db/create-tables-sqlite.sql @@ -3,7 +3,7 @@ CREATE TABLE users ( ShortId integer UNIQUE NOT NULL, Username varchar(32) NOT NULL, Email varchar(256) UNIQUE NOT NULL, - IsDeleted boolean NOT NULL DEFAULT FALSE, + Deleted datetime, IsBanned boolean NOT NULL DEFAULT FALSE, HashedPassword char(60) NOT NULL, Created datetime NOT NULL diff --git a/internal/models/user.go b/internal/models/user.go index 2a1124d..e4dfbe2 100644 --- a/internal/models/user.go +++ b/internal/models/user.go @@ -15,7 +15,7 @@ type User struct { ShortId uint64 Username string Email string - IsDeleted bool + Deleted bool IsBanned bool HashedPassword []byte Created time.Time @@ -30,8 +30,8 @@ func (m *UserModel) Insert(shortId uint64, username string, email string, passwo if err != nil { return err } - stmt := `INSERT INTO users (ShortId, Username, Email, IsDeleted, IsBanned, HashedPassword, Created) - VALUES (?, ?, ?, FALSE, FALSE, ?, ?)` + stmt := `INSERT INTO users (ShortId, Username, Email, IsBanned, HashedPassword, Created) + VALUES (?, ?, ?, FALSE, ?, ?)` _, err = m.DB.Exec(stmt, shortId, username, email, hashedPassword, time.Now().UTC()) if err != nil { 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) { - 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) var u User 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) { - 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) var u User 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) { - 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) if err != nil { return nil, err @@ -121,7 +121,7 @@ func (m *UserModel) Authenticate(email, password string) (int64, error) { func (m *UserModel) Exists(id int64) (bool, error) { 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) return exists, err }