make it compile

database/database.go

@@ -3,7 +3,7 @@ package database
 import (
 	"github.com/ewhal/nyaa/common"
 	"github.com/ewhal/nyaa/config"
-	"github.com/ewhal/nyaa/db/postgres"
+	"github.com/ewhal/nyaa/database/postgres"
 	//"github.com/ewhal/nyaa/db/sqlite"
 	"github.com/ewhal/nyaa/model"
 	"github.com/ewhal/nyaa/util/log"
@@ -67,12 +67,13 @@ type Database interface {
 	// delete user A following B
 	DeleteUserFollowing(a, b uint32) (bool, error)
 
-	// delete torrents by given parameters
-	DeleteTorrentsWhere(param *common.TorrentParam) (uint32, error)
-
 	// insert/update torrent
 	UpsertTorrent(t *model.Torrent) error
 
+	// delete torrents by given parameters
+	// DeleteTorrentsWhere(param *common.TorrentParam) (uint32, error)
+
+
 	// DO NOT USE ME kthnx
 	Query(query string, params ...interface{}) (*sql.Rows, error)
 }

database/postgres/report.go

@@ -9,7 +9,7 @@ import (
 )
 
 func (db *Database) InsertTorrentReport(report *model.TorrentReport) (err error) {
-	_, err = db.getPrepared(queryInsertTorrentReport).Exec(report.Type, report.TorrentID, report.UserID, report.CreatedAt)
+	_, err = db.getPrepared(queryInsertTorrentReport).Exec(report.Description, report.TorrentID, report.UserID, report.CreatedAt)
 	return
 }
 

database/postgres/statements.go

@@ -41,13 +41,13 @@ func scanCommentColumnsFull(rows *sql.Rows, c *model.Comment) {
 const torrentReportSelectColumnsFull = `torrent_report_id, type, torrent_id, user_id, created_at`
 
 func scanTorrentReportColumnsFull(rows *sql.Rows, r *model.TorrentReport) {
-	rows.Scan(&r.ID, &r.Type, &r.TorrentID, &r.UserID, &r.CreatedAt)
+	rows.Scan(&r.ID, &r.Description, &r.TorrentID, &r.UserID, &r.CreatedAt)
 }
 
-const userSelectColumnsFull = `user_id, username, password, email, status, created_at, updated_at, last_login_at, last_login_ip, api_token, api_token_expires, language, md5`
+const userSelectColumnsFull = `user_id, username, password, email, status, created_at, updated_at, api_token, api_token_expiry, language, md5`
 
 func scanUserColumnsFull(rows *sql.Rows, u *model.User) {
-	rows.Scan(&u.ID, &u.Username, &u.Password, &u.Email, &u.Status, &u.CreatedAt, &u.UpdatedAt, &u.LastLoginAt, &u.LastLoginIP, &u.Token, &u.TokenExpiration, &u.Language, &u.MD5)
+	rows.Scan(&u.ID, &u.Username, &u.Password, &u.Email, &u.Status, &u.CreatedAt, &u.UpdatedAt, &u.ApiToken, &u.ApiTokenExpiry, &u.Language, &u.MD5)
 
 }
 

database/postgres/user.go

@@ -82,12 +82,12 @@ func (db *Database) GetUserByID(id uint32) (user model.User, has bool, err error
 }
 
 func (db *Database) InsertUser(u *model.User) (err error) {
-	_, err = db.getPrepared(queryInsertUser).Exec(u.Username, u.Password, u.Email, u.Status, u.CreatedAt, u.UpdatedAt, u.LastLoginAt, u.LastLoginIP, u.Token, u.TokenExpiration, u.Language, u.MD5)
+	_, err = db.getPrepared(queryInsertUser).Exec(u.Username, u.Password, u.Email, u.Status, u.CreatedAt, u.UpdatedAt, u.ApiToken, u.ApiTokenExpiry, u.Language, u.MD5)
 	return
 }
 
 func (db *Database) UpdateUser(u *model.User) (err error) {
-	_, err = db.getPrepared(queryUpdateUser).Exec(u.ID, u.Username, u.Password, u.Email, u.Status, u.UpdatedAt, u.LastLoginAt, u.LastLoginIP, u.Token, u.TokenExpiration, u.Language, u.MD5)
+	_, err = db.getPrepared(queryUpdateUser).Exec(u.ID, u.Username, u.Password, u.Email, u.Status, u.UpdatedAt, u.ApiToken, u.ApiTokenExpiry, u.Language, u.MD5)
 	return
 }