agecem/agecem-org
4
1
Fork 0
Code Issues 31 Pull requests 2 Activity

Ajouter fonction de renom de document #186

Merged
vlbeaudoin merged 2 commits from feature/document-rename into main 2024-02-01 17:58:42 -05:00
Conversation 0 Commits 2 Files changed 4 +39 -10
2 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ef75eb29fa - Show all commits

47
apihandler/document.go
View file

@ -285,7 +285,15 @@ func (h *V1Handler) V1DocumentKeyPUT(c echo.Context) (err error) {
bucket := c.Param("bucket") bucket := c.Param("bucket")
document := c.Param("document") document := c.Param("document")
newKey := c.Bind(
var newKey string
err = c.Bind(&newKey)
if err != nil {
response.StatusCode = http.StatusBadRequest
response.Message = err.Error()
return c.JSON(response.StatusCode, response)
}
request, err = apirequest.NewV1DocumentKeyPUT(bucket, document, newKey) request, err = apirequest.NewV1DocumentKeyPUT(bucket, document, newKey)
if err != nil { if err != nil {
@ -316,7 +324,7 @@ func (h *V1Handler) V1DocumentKeyPUT(c echo.Context) (err error) {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
bucketExists, err := h.MediaClient.MinioClient.BucketExists(ctx, bucket) bucketExists, err := h.MediaClient.MinioClient.BucketExists(ctx, request.Params.Bucket)
if err != nil { if err != nil {
return c.JSON(http.StatusInternalServerError, "Could not validate bucket exists") return c.JSON(http.StatusInternalServerError, "Could not validate bucket exists")
} }
@ -325,33 +333,54 @@ func (h *V1Handler) V1DocumentKeyPUT(c echo.Context) (err error) {
return c.JSON(apiresponse.NotFoundResponse()) return c.JSON(apiresponse.NotFoundResponse())
} }
if _, err := h.MediaClient.MinioClient.StatObject(ctx, bucket, document, minio.StatObjectOptions{}); err != nil { // Check source object exists
if _, err := h.MediaClient.MinioClient.StatObject(ctx, request.Params.Bucket, request.Params.Document, minio.StatObjectOptions{}); err != nil {
if err.Error() == "The specified key does not exist." { if err.Error() == "The specified key does not exist." {
return c.JSON(apiresponse.NotFoundResponse()) return c.JSON(apiresponse.NotFoundResponse())
} }
response.Message = fmt.Sprintf("Could not obtain information on %s/%s", bucket, document) response.Message = fmt.Sprintf("Could not obtain information on %s/%s", request.Params.Bucket, request.Params.Document)
response.StatusCode = http.StatusInternalServerError response.StatusCode = http.StatusInternalServerError
return c.JSON(response.StatusCode, response) return c.JSON(response.StatusCode, response)
} }
// Copy object to newKey
if _, err := h.MediaClient.MinioClient.CopyObject(ctx, if _, err := h.MediaClient.MinioClient.CopyObject(ctx,
minio.CopyDestOptions{Bucket: bucket, Object: newKey}, minio.CopyDestOptions{Bucket: request.Params.Bucket, Object: request.Data.NewKey},
minio.CopySrcOptions{Bucket: bucket, Object: document}, minio.CopySrcOptions{Bucket: request.Params.Bucket, Object: request.Params.Document},
); err != nil { ); err != nil {
response.StatusCode = http.StatusInternalServerError response.StatusCode = http.StatusInternalServerError
response.Message = "Impossible de copier un document pour le renommer" response.Message = "Impossible de copier un document pour le renommer"
return c.JSON(response.StatusCode, response) return c.JSON(response.StatusCode, response)
} }
//TODO verify copy was successful // Verify copy was successful
if _, err := h.MediaClient.MinioClient.StatObject(ctx,
request.Params.Bucket, request.Data.NewKey, minio.GetObjectOptions{}); err != nil {
response.StatusCode = http.StatusInternalServerError
response.Message = "Copie de document ne semble pas avoir fonctionnée"
return c.JSON(response.StatusCode, response)
}
//TODO delete old file // Delete old file
if err := h.MediaClient.MinioClient.RemoveObject(ctx,
request.Params.Bucket, request.Params.Document, minio.RemoveObjectOptions{}); err != nil {
response.StatusCode = http.StatusInternalServerError
response.Message = "Erreur pendant tentative de supprimer document source"
return c.JSON(response.StatusCode, response)
}
//TODO cleanup //TODO cleanup
//TODO return result // Return result
response.StatusCode = http.StatusOK
response.Message = "Document renommé avec succès"
response.Data.Bucket = request.Params.Bucket
response.Data.Key = request.Data.NewKey
return c.JSON(response.StatusCode, response)
} }

2
cmd/server.go
View file

@ -226,7 +226,7 @@ func RunServer() {
if err := pave.EchoRegister[ if err := pave.EchoRegister[
apirequest.V1DocumentKeyPUT, apirequest.V1DocumentKeyPUT,
apiresponse.V1DocumentKeyPUT](groupV1, &p, "/v1", http.MethodPut, "/:bucket/:document", "Renommer un document", "V1DocumentKeyPUT", v1Handler.V1DocumentKeyPUT); err != nil { apiresponse.V1DocumentKeyPUT](groupV1, &p, "/v1", http.MethodPut, "/bucket/:bucket/:document/key", "Renommer un document", "V1DocumentKeyPUT", v1Handler.V1DocumentKeyPUT); err != nil {
log.Fatal(err) log.Fatal(err)
} }