feat: Adding url in the event for upload and delete

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Dec 14, 2021 · 7da926b · 7da926b
1 parent 3d69e9c
commit 7da926b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/pkg/crud/delete.go b/pkg/crud/delete.go
@@ -39,7 +39,7 @@ func (a App) Delete(w http.ResponseWriter, r *http.Request, request provider.Req
 		provider.SetPrefsCookie(w, deletePreferences(request, pathname))
 	}
 
-	go a.notify(provider.NewDeleteEvent(info))
+	go a.notify(provider.NewDeleteEvent(request, info))
 
 	a.rendererApp.Redirect(w, r, fmt.Sprintf("%s/?d=%s", request.URL(""), request.Layout("")), renderer.NewSuccessMessage("%s successfully deleted", info.Name))
 }

diff --git a/pkg/crud/upload.go b/pkg/crud/upload.go
@@ -64,7 +64,7 @@ func (a App) saveUploadedFile(request provider.Request, part *multipart.Part) (f
 		if info, infoErr := a.storageApp.Info(filePath); infoErr != nil {
 			logger.Error("unable to get info for upload event: %s", infoErr)
 		} else {
-			a.notify(provider.NewUploadEvent(info))
+			a.notify(provider.NewUploadEvent(request, info))
 		}
 	}()
 

diff --git a/pkg/provider/event.go b/pkg/provider/event.go
@@ -83,17 +83,19 @@ func (et *EventType) UnmarshalJSON(b []byte) error {
 type Event struct {
 	Time     time.Time         `json:"time"`
 	New      *StorageItem      `json:"new,omitempty"`
-	Metadata map[string]string `json:"metadata"`
+	Metadata map[string]string `json:"metadata,omitempty"`
 	Item     StorageItem       `json:"item"`
 	Type     EventType         `json:"type"`
+	URL      string            `json:"url,omitempty"`
 }
 
 // NewUploadEvent creates a new upload event
-func NewUploadEvent(item StorageItem) Event {
+func NewUploadEvent(request Request, item StorageItem) Event {
 	return Event{
 		Time: time.Now(),
 		Type: UploadEvent,
 		Item: item,
+		URL:  request.URL(item.Name),
 	}
 }
 
@@ -108,11 +110,12 @@ func NewRenameEvent(old, new StorageItem) Event {
 }
 
 // NewDeleteEvent creates a new delete event
-func NewDeleteEvent(item StorageItem) Event {
+func NewDeleteEvent(request Request, item StorageItem) Event {
 	return Event{
 		Time: time.Now(),
 		Type: DeleteEvent,
 		Item: item,
+		URL:  request.URL(""),
 	}
 }
 
@@ -144,6 +147,7 @@ func NewAccessEvent(item StorageItem, r *http.Request) Event {
 		Type:     AccessEvent,
 		Item:     item,
 		Metadata: metadata,
+		URL:      r.URL.RawPath,
 	}
 }