Moved SQL queries from model to separate queries file.

This commit is contained in:
Stanislav Nikitin 2018-04-30 23:07:07 +05:00
parent ba33016b92
commit 79c7d39759
3 changed files with 76 additions and 49 deletions

View File

@ -57,8 +57,7 @@ func pasteGET(ec echo.Context) error {
c.Logger.Debug().Msgf("Requesting paste #%+v", pasteID) c.Logger.Debug().Msgf("Requesting paste #%+v", pasteID)
// Get paste. // Get paste.
paste := &Paste{ID: pasteID} paste, err1 := GetByID(pasteID)
err1 := paste.GetByID(c.Database.GetDatabaseConnection())
if err1 != nil { if err1 != nil {
c.Logger.Error().Msgf("Failed to get paste #%d from database: %s", pasteID, err1.Error()) c.Logger.Error().Msgf("Failed to get paste #%d from database: %s", pasteID, err1.Error())
return ec.HTML(http.StatusBadRequest, string(errhtml)) return ec.HTML(http.StatusBadRequest, string(errhtml))
@ -120,7 +119,7 @@ func pastePOST(ec echo.Context) error {
keepForUnit := PASTE_KEEPS_CORELLATION[keepForUnitRaw] keepForUnit := PASTE_KEEPS_CORELLATION[keepForUnitRaw]
paste.KeepForUnitType = keepForUnit paste.KeepForUnitType = keepForUnit
id, err2 := paste.Save(c.Database.GetDatabaseConnection()) id, err2 := Save(paste)
if err2 != nil { if err2 != nil {
c.Logger.Debug().Msgf("Failed to save paste: %s", err2.Error()) c.Logger.Debug().Msgf("Failed to save paste: %s", err2.Error())
return ec.HTML(http.StatusBadRequest, string(errhtml)) return ec.HTML(http.StatusBadRequest, string(errhtml))
@ -152,9 +151,8 @@ func pastesGET(ec echo.Context) error {
c.Logger.Debug().Msgf("Requested page #%d", page) c.Logger.Debug().Msgf("Requested page #%d", page)
p := &Paste{}
// Get pastes IDs. // Get pastes IDs.
pastes, err3 := p.GetPagedPastes(c.Database.GetDatabaseConnection(), page) pastes, err3 := GetPagedPastes(page)
c.Logger.Debug().Msgf("Got %d pastes", len(pastes)) c.Logger.Debug().Msgf("Got %d pastes", len(pastes))
var pastesString = "No pastes to show." var pastesString = "No pastes to show."

View File

@ -27,9 +27,6 @@ package pastes
import ( import (
// stdlib // stdlib
"time" "time"
// other
"github.com/jmoiron/sqlx"
) )
const ( const (
@ -57,44 +54,3 @@ type Paste struct {
KeepFor int `db:"keep_for"` KeepFor int `db:"keep_for"`
KeepForUnitType int `db:"keep_for_unit_type"` KeepForUnitType int `db:"keep_for_unit_type"`
} }
func (p *Paste) GetByID(db *sqlx.DB) error {
err := db.Get(p, db.Rebind("SELECT * FROM `pastes` WHERE id=?"), p.ID)
if err != nil {
return err
}
return nil
}
func (p *Paste) GetPagedPastes(db *sqlx.DB, page int) ([]Paste, error) {
var pastes []Paste
// Pagination - 30 pastes on page.
var startPagination = 0
if page > 1 {
startPagination = (page - 1) * 30
}
err := db.Select(&pastes, db.Rebind("SELECT * FROM `pastes` ORDER BY id DESC LIMIT 30 OFFSET ?"), startPagination)
if err != nil {
return nil, err
}
return pastes, nil
}
func (p *Paste) Save(db *sqlx.DB) (int64, error) {
result, err := db.NamedExec("INSERT INTO `pastes` (title, data, created_at, keep_for, keep_for_unit_type) VALUES (:title, :data, :created_at, :keep_for, :keep_for_unit_type)", p)
if err != nil {
return 0, err
}
ID, err1 := result.LastInsertId()
if err1 != nil {
return 0, err
}
return ID, nil
}

73
pastes/queries.go Normal file
View File

@ -0,0 +1,73 @@
// Fast Paste Bin - uberfast and easy-to-use pastebin.
//
// Copyright (c) 2018, Stanislav N. aka pztrn and Fast Paste Bin
// developers.
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject
// to the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
// OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
package pastes
// GetByID returns a single paste by ID.
func GetByID(id int) (*Paste, error) {
p := &Paste{}
dbConn := c.Database.GetDatabaseConnection()
err := dbConn.Get(p, dbConn.Rebind("SELECT * FROM `pastes` WHERE id=?"), id)
if err != nil {
return nil, err
}
return p, nil
}
// GetPagedPastes returns a paged slice of pastes.
func GetPagedPastes(page int) ([]Paste, error) {
var pastes []Paste
dbConn := c.Database.GetDatabaseConnection()
// Pagination - 30 pastes on page.
var startPagination = 0
if page > 1 {
startPagination = (page - 1) * 30
}
err := dbConn.Select(&pastes, dbConn.Rebind("SELECT * FROM `pastes` ORDER BY id DESC LIMIT 30 OFFSET ?"), startPagination)
if err != nil {
return nil, err
}
return pastes, nil
}
// Save saves paste to database and returns it's ID.
func Save(p *Paste) (int64, error) {
dbConn := c.Database.GetDatabaseConnection()
result, err := dbConn.NamedExec("INSERT INTO `pastes` (title, data, created_at, keep_for, keep_for_unit_type) VALUES (:title, :data, :created_at, :keep_for, :keep_for_unit_type)", p)
if err != nil {
return 0, err
}
ID, err1 := result.LastInsertId()
if err1 != nil {
return 0, err
}
return ID, nil
}