From 8982e961973b78a30e90b5dbeddf2ae1ee49cdfa Mon Sep 17 00:00:00 2001 From: m Date: Thu, 3 Sep 2026 20:57:27 +0200 Subject: [PATCH] move --- backend/entities/documents.go | 25 +++++++++++++++++++++---- backend/main.go | 14 ++++++++++---- backend/services/move.go | 4 ++++ backend/services/move_test.go | 30 +++++++++++++++++++++++++++++- 4 files changed, 64 insertions(+), 9 deletions(-) diff --git a/backend/entities/documents.go b/backend/entities/documents.go index 8d2985c..162585c 100644 --- a/backend/entities/documents.go +++ b/backend/entities/documents.go @@ -5,9 +5,10 @@ import ( ) type Document struct { - DocumentUUID *string - DocumentName string - DocumentType int + DocumentUUID *string + DocumentType int + DocumentName *string + DocumentOriginalName string } const ( @@ -44,8 +45,24 @@ func NewDocument(documentName string, documentType int) (error, *Document) { } return nil, &Document{ - DocumentName: documentName, + DocumentName: &documentName, DocumentType: documentType, } } + +func (d *Document) GetOriginalName() *string { + + return &d.DocumentOriginalName + +} + +func (d *Document) GetName() *string { + + if d.DocumentName == nil { + return d.GetOriginalName() + } + + return d.DocumentName + +} diff --git a/backend/main.go b/backend/main.go index 30cbdd2..9b829f0 100644 --- a/backend/main.go +++ b/backend/main.go @@ -1,11 +1,17 @@ package main +import ( + "log" + + "github.com/vaultdrop/backend/config" +) + func main() { - // err, config := config.LoadApplicationConfig() + err, config := config.LoadApplicationConfig() - // if err != nil { - // log.Fatalln(err) - // } + if err != nil { + log.Fatalln(err) + } } diff --git a/backend/services/move.go b/backend/services/move.go index 5b4807a..383c386 100644 --- a/backend/services/move.go +++ b/backend/services/move.go @@ -12,6 +12,10 @@ func (s *Services) MoveDocumentIntoDocument(from *entities.Document, to *entitie return fmt.Errorf(entities.ERROR_DOCUMENT_NOT_PERCISTED) } + if to.DocumentType != entities.DIRECTORY { + return fmt.Errorf("The destination document must be a directory") + } + if canEdit, _ := UserCanEditDocument(s.ConnectedUser, from); canEdit == false { return fmt.Errorf("You can not edit this folder") } diff --git a/backend/services/move_test.go b/backend/services/move_test.go index c084d75..3c0e4ab 100644 --- a/backend/services/move_test.go +++ b/backend/services/move_test.go @@ -13,12 +13,40 @@ func TestMoveDocument(t *testing.T) { t.Errorf(`Error creating antoine user %v`, err) } + fakeUUID := "dsqdsq" err, document := entities.NewDocument("test.pdf", entities.FILE) + document.DocumentUUID = &fakeUUID err, folder := entities.NewDocument("orga", entities.DIRECTORY) + folder.DocumentUUID = &fakeUUID service := New(userAntoine) - err := service.MoveDocumentIntoDocument(document, folder) + err = service.MoveDocumentIntoDocument(document, folder) + + if err != nil { + t.Error(err) + } + +} + +func TestMoveDocumentToAFile(t *testing.T) { + + err, userAntoine := entities.NewUser("antoine") + if err != nil { + t.Errorf(`Error creating antoine user %v`, err) + } + + err, document := entities.NewDocument("test.pdf", entities.FILE) + + err, notAFolder := entities.NewDocument("orga", entities.FILE) + + service := New(userAntoine) + + err = service.MoveDocumentIntoDocument(document, notAFolder) + + if err == nil { + t.Error(err) + } }