add version and translate all pages
This commit is contained in:
@@ -2,13 +2,13 @@ package service
|
||||
|
||||
import "github.com/vaultdrop/backend/models"
|
||||
|
||||
func (s *Services) CreateFolder(folderName string, destination *models.Document) (error, *models.Document) {
|
||||
func (s *Services) CreateFolder(folderName string, destination *models.Document) (*models.Document, error) {
|
||||
|
||||
err, directory := models.NewDocument(folderName, models.DIRECTORY, 1)
|
||||
directory, err := models.NewDocument(folderName, models.DIRECTORY, 1)
|
||||
if err != nil {
|
||||
return err, nil
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return nil, directory
|
||||
return directory, nil
|
||||
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/vaultdrop/backend/models"
|
||||
@@ -9,19 +10,19 @@ import (
|
||||
func (s *Services) MoveDocumentIntoDocument(from *models.Document, to *models.Document) error {
|
||||
|
||||
if from.UUID == nil {
|
||||
return fmt.Errorf(models.ERROR_DOCUMENT_NOT_PERCISTED)
|
||||
return errors.New(models.ERROR_DOCUMENT_NOT_PERCISTED)
|
||||
}
|
||||
|
||||
if to.Type != models.DIRECTORY {
|
||||
return fmt.Errorf("The destination document must be a directory")
|
||||
return errors.New("the destination document must be a directory")
|
||||
}
|
||||
|
||||
if canEdit, _ := UserCanEditDocument(s.ConnectedUser, from); canEdit == false {
|
||||
return fmt.Errorf("You can not edit this folder")
|
||||
if canEdit, _ := UserCanEditDocument(s.ConnectedUser, from); !canEdit {
|
||||
return errors.New("you cannot edit this folder")
|
||||
}
|
||||
|
||||
if canEdit, _ := UserCanEditDocument(s.ConnectedUser, to); canEdit == false {
|
||||
return fmt.Errorf("You can not edit this folder")
|
||||
if canEdit, _ := UserCanEditDocument(s.ConnectedUser, to); !canEdit {
|
||||
return errors.New("you cannot edit this folder")
|
||||
}
|
||||
|
||||
// Check if document exist and move the document into document if is directory
|
||||
|
||||
@@ -8,23 +8,27 @@ import (
|
||||
|
||||
func TestMoveDocument(t *testing.T) {
|
||||
|
||||
err, userAntoine := models.NewUser("antoine")
|
||||
userAntoine, err := models.NewUser("antoine")
|
||||
if err != nil {
|
||||
t.Errorf(`Error creating antoine user %v`, err)
|
||||
t.Fatalf("creating antoine user: %v", err)
|
||||
}
|
||||
|
||||
fakeUUID := "dsqdsq"
|
||||
err, document := models.NewDocument("test.pdf", models.FILE, 1)
|
||||
document, err := models.NewDocument("test.pdf", models.FILE, 1)
|
||||
if err != nil {
|
||||
t.Fatalf("creating document: %v", err)
|
||||
}
|
||||
document.UUID = &fakeUUID
|
||||
|
||||
err, folder := models.NewDocument("orga", models.DIRECTORY, 1)
|
||||
folder, err := models.NewDocument("orga", models.DIRECTORY, 1)
|
||||
if err != nil {
|
||||
t.Fatalf("creating folder: %v", err)
|
||||
}
|
||||
folder.UUID = &fakeUUID
|
||||
|
||||
service := New(userAntoine)
|
||||
|
||||
err = service.MoveDocumentIntoDocument(document, folder)
|
||||
|
||||
if err != nil {
|
||||
if err := service.MoveDocumentIntoDocument(document, folder); err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
@@ -32,14 +36,20 @@ func TestMoveDocument(t *testing.T) {
|
||||
|
||||
func TestMoveDocumentToAFile(t *testing.T) {
|
||||
|
||||
err, userAntoine := models.NewUser("antoine")
|
||||
userAntoine, err := models.NewUser("antoine")
|
||||
if err != nil {
|
||||
t.Errorf(`Error creating antoine user %v`, err)
|
||||
t.Fatalf("creating antoine user: %v", err)
|
||||
}
|
||||
|
||||
err, document := models.NewDocument("test.pdf", models.FILE, 1)
|
||||
document, err := models.NewDocument("test.pdf", models.FILE, 1)
|
||||
if err != nil {
|
||||
t.Fatalf("creating document: %v", err)
|
||||
}
|
||||
|
||||
err, notAFolder := models.NewDocument("orga", models.FILE, 1)
|
||||
notAFolder, err := models.NewDocument("orga", models.FILE, 1)
|
||||
if err != nil {
|
||||
t.Fatalf("creating file: %v", err)
|
||||
}
|
||||
|
||||
service := New(userAntoine)
|
||||
|
||||
@@ -49,4 +59,4 @@ func TestMoveDocumentToAFile(t *testing.T) {
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -13,8 +13,8 @@ import (
|
||||
"github.com/vaultdrop/backend/repository"
|
||||
)
|
||||
|
||||
// FileTooLargeError signals an upload above MaxFileSize.
|
||||
var FileTooLargeError = errors.New("file too large")
|
||||
// ErrFileTooLarge signals an upload above MaxFileSize.
|
||||
var ErrFileTooLarge = errors.New("file too large")
|
||||
|
||||
// FileDTO serializes exactly as mobile/api/types.ts FileDto.
|
||||
type FileDTO struct {
|
||||
@@ -106,7 +106,7 @@ func (s *Resources) SearchFiles(ownerID, q string, page, pageSize int) ([]FileDT
|
||||
// if metadata persistence fails (e.g. name conflict).
|
||||
func (s *Resources) Upload(ownerID string, file *multipart.FileHeader, folderID string) (FileDTO, error) {
|
||||
if file.Size > s.MaxFileSize {
|
||||
return FileDTO{}, FileTooLargeError
|
||||
return FileDTO{}, ErrFileTooLarge
|
||||
}
|
||||
|
||||
id := repository.NewID()
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
func (s *Services) UploadDocument(file *string, destination *models.Document) error {
|
||||
|
||||
if canEdit, _ := UserCanEditDocument(s.ConnectedUser, destination); !canEdit {
|
||||
return fmt.Errorf("Can not edit")
|
||||
return fmt.Errorf("cannot edit document")
|
||||
}
|
||||
|
||||
models.NewDocument("test", models.FILE, 1)
|
||||
|
||||
Reference in New Issue
Block a user