working commit
This commit is contained in:
@@ -1,12 +0,0 @@
|
||||
package database
|
||||
|
||||
type DatabaseParams struct {
|
||||
}
|
||||
|
||||
type Database struct {
|
||||
}
|
||||
|
||||
func NewDatabase(params *DatabaseParams) (*Database, error) {
|
||||
var err error
|
||||
return &Database{}, err
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package descr
|
||||
|
||||
type File struct {
|
||||
ID string `db:"id" json:"id,omitempty" yaml:"id,omitempty"`
|
||||
Collection string `db:"collection" json:"collection,omitempty" yaml:"collection,omitempty"`
|
||||
Name string `db:"name" json:"name,omitempty" yaml:"name,omitempty"`
|
||||
Checksum string `db:"checksum" json:"checksum,omitempty" yaml:"checksum,omitempty"`
|
||||
Size int64 `db:"size" json:"size,omitempty" yaml:"size,omitempty"`
|
||||
CreatedAt string `db:"created_at" json:"createdAt,omitempty" yaml:"createdAt,omitempty"`
|
||||
UpdatedAt string `db:"updated_at" json:"updatedAt,omitempty" yaml:"updatedAt,omitempty"`
|
||||
CreatedBy string `db:"created_by" json:"createdBy,omitempty" yaml:"createdBy,omitempty"`
|
||||
UpdatedBy string `db:"updated_by" json:"updatedBy,omitempty" yaml:"updatedBy,omitempty"`
|
||||
}
|
||||
|
||||
@@ -14,6 +14,8 @@ func (hand *Handler) FileExists(rctx *router.Context) {
|
||||
}
|
||||
hand.logg.Debugf("filepath: %s", filepath)
|
||||
|
||||
|
||||
|
||||
code, _, _ := hand.oper.FileExists(params)
|
||||
rctx.SetStatus(code)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
package maindb
|
||||
|
||||
import (
|
||||
"mstore/app/descr"
|
||||
)
|
||||
|
||||
func (db *Database) InsertFile(file *descr.File) error {
|
||||
var err error
|
||||
request := `INSERT INTO file(id, collection, name, checksum, size, created_at, updated_at, created_by, updated_by)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`
|
||||
_, err = db.db.Exec(request, file.ID, file.Collection, file.Name, file.Checksum, file.Size,
|
||||
file.CreatedAt, file.UpdatedAt, file.CreatedBy, file.UpdatedBy)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (db *Database) UpdateFileByID(fileID string, file *descr.File) error {
|
||||
var err error
|
||||
request := `UPDATE file SET id = $1, collection = $2, name = $3, checksum = $4,
|
||||
size = $5, updated_at = $6, created_by = $7, updated_by = $8
|
||||
WHERE id = $9`
|
||||
_, err = db.db.Exec(request, file.ID, file.Collection, file.Name, file.Checksum,
|
||||
file.Size, file.UpdatedAt, file.CreatedBy, file.UpdatedBy, fileID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (db *Database) ListFilesByCollection(collection string) ([]descr.File, error) {
|
||||
var err error
|
||||
request := `SELECT * FROM file WHERE collection = $1 ORDER BY collection, name`
|
||||
res := make([]descr.File, 0)
|
||||
err = db.db.Select(&res, request, collection)
|
||||
if err != nil {
|
||||
return res, err
|
||||
}
|
||||
return res, err
|
||||
}
|
||||
|
||||
func (db *Database) ListAllFiles() ([]descr.File, error) {
|
||||
var err error
|
||||
request := `SELECT * FROM file ORDER BY collection, name`
|
||||
res := make([]descr.File, 0)
|
||||
err = db.db.Select(&res, request)
|
||||
if err != nil {
|
||||
return res, err
|
||||
}
|
||||
return res, err
|
||||
}
|
||||
|
||||
func (db *Database) GetFileByID(fileID int64) (bool, *descr.File, error) {
|
||||
var err error
|
||||
var res *descr.File
|
||||
var exists bool
|
||||
request := `SELECT * FROM file WHERE id = $1 LiMIT 1`
|
||||
dbRes := make([]descr.File, 0)
|
||||
err = db.db.Select(&dbRes, request, fileID)
|
||||
if err != nil {
|
||||
return exists, res, err
|
||||
}
|
||||
if len(dbRes) == 0 {
|
||||
return exists, res, err
|
||||
}
|
||||
exists = true
|
||||
res = &dbRes[0]
|
||||
return exists, res, err
|
||||
}
|
||||
|
||||
func (db *Database) GetFileByCollection(collection, name string) (bool, *descr.File, error) {
|
||||
var err error
|
||||
var res *descr.File
|
||||
var exists bool
|
||||
request := `SELECT * FROM file
|
||||
WHERE collection = $1 AND name = $2 LIMIT 1`
|
||||
dbRes := make([]descr.File, 0)
|
||||
err = db.db.Select(&dbRes, request, collection, name)
|
||||
if err != nil {
|
||||
return exists, res, err
|
||||
}
|
||||
|
||||
if len(dbRes) == 0 {
|
||||
return false, res, err
|
||||
}
|
||||
exists = true
|
||||
res = &dbRes[0]
|
||||
return exists, res, err
|
||||
}
|
||||
|
||||
func (db *Database) DeleteFileByCollection(collection, name string) error {
|
||||
var err error
|
||||
|
||||
request := `DELETE FROM file WHERE collection = $1 AND name = $2`
|
||||
_, err = db.db.Exec(request, collection, name)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return err
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package maindb
|
||||
|
||||
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"mstore/app/descr"
|
||||
"mstore/pkg/auxtool"
|
||||
"mstore/pkg/auxuuid"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestFile(t *testing.T) {
|
||||
var err error
|
||||
|
||||
dbDir := t.TempDir()
|
||||
db := NewDatabase(dbDir)
|
||||
|
||||
err = db.OpenDatabase()
|
||||
require.NoError(t, err)
|
||||
|
||||
err = db.InitDatabase()
|
||||
require.NoError(t, err)
|
||||
|
||||
id := auxuuid.NewUUID()
|
||||
timenow := auxtool.TimeNow()
|
||||
creator := "some"
|
||||
collection := "foo"
|
||||
newFile := &descr.File{
|
||||
ID: id,
|
||||
Collection: "foo" ,
|
||||
Name: "bare",
|
||||
CreatedAt: timenow,
|
||||
UpdatedAt: timenow,
|
||||
CreatedBy: creator,
|
||||
UpdatedBy: creator,
|
||||
}
|
||||
|
||||
err = db.InsertFile(newFile)
|
||||
require.NoError(t, err)
|
||||
|
||||
files, err := db.ListFilesByCollection(collection)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, len(files), 1)
|
||||
require.Equal(t, files[0].ID, id)
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package maindb
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"path/filepath"
|
||||
|
||||
"mstore/app/logger"
|
||||
|
||||
"github.com/jmoiron/sqlx"
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
)
|
||||
|
||||
|
||||
type Database struct {
|
||||
datapath string
|
||||
log *logger.Logger
|
||||
db *sqlx.DB
|
||||
}
|
||||
|
||||
func NewDatabase(datapath string) *Database {
|
||||
return &Database{
|
||||
datapath: datapath,
|
||||
log: logger.NewLogger("maindb"),
|
||||
}
|
||||
}
|
||||
|
||||
func (db *Database) OpenDatabase() error {
|
||||
var err error
|
||||
dbPath := filepath.Join(db.datapath, "mstore.db")
|
||||
db.db, err = sqlx.Open("sqlite3", fmt.Sprintf("%s?cache=shared&mode=rwc&_journal_mode=WAL", dbPath))
|
||||
if err != nil {
|
||||
return fmt.Errorf("Open database error: %v", err)
|
||||
}
|
||||
err = db.db.Ping()
|
||||
if err != nil {
|
||||
return fmt.Errorf("Ping database error: %v", err)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (db *Database) InitDatabase() error {
|
||||
var err error
|
||||
_, err = db.db.Exec(schema)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Init database error: %v", err)
|
||||
}
|
||||
return err
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package maindb
|
||||
|
||||
const schema = `
|
||||
CREATE TABLE IF NOT EXISTS file (
|
||||
id VARCHAR(255) NOT NULL,
|
||||
collection VARCHAR(255) NOT NULL,
|
||||
name VARCHAR(255) NOT NULL,
|
||||
checksum VARCHAR(255) NOT NULL,
|
||||
size INTEGER,
|
||||
created_at VARCHAR(255) NOT NULL,
|
||||
updated_at VARCHAR(255) NOT NULL,
|
||||
created_by VARCHAR(255) NOT NULL,
|
||||
updated_by VARCHAR(255) NOT NULL
|
||||
);
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS file_index
|
||||
ON file(collection, name);
|
||||
`
|
||||
@@ -3,6 +3,7 @@ package operator
|
||||
import (
|
||||
"io"
|
||||
"net/http"
|
||||
"path"
|
||||
)
|
||||
|
||||
// File exists
|
||||
@@ -15,6 +16,10 @@ type FileExistsResult struct{}
|
||||
|
||||
func (oper *Operator) FileExists(param *FileExistsParams) (int, *FileExistsResult, error) {
|
||||
var err error
|
||||
|
||||
filename := path.Base(param.Filepath)
|
||||
dirname := path.Dir(filepath)
|
||||
|
||||
res := &FileExistsResult{}
|
||||
code := http.StatusOK
|
||||
return code, res, err
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
package operator
|
||||
|
||||
import (
|
||||
"mstore/app/database"
|
||||
"mstore/app/maindb"
|
||||
)
|
||||
|
||||
type OperatorParams struct {
|
||||
Database *database.Database
|
||||
MainDB *database.Database
|
||||
}
|
||||
|
||||
type Operator struct {
|
||||
db *database.Database
|
||||
maindb *main.Database
|
||||
}
|
||||
|
||||
func NewOperator(params *OperatorParams) (*Operator, error) {
|
||||
var err error
|
||||
oper := &Operator{
|
||||
db: params.Database,
|
||||
db: params.MainDB,
|
||||
}
|
||||
return oper, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user