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

Ajouter et implémenter certaines responses #118

Merged
vlbeaudoin merged 4 commits from fix/bucket_list_response into main 2023-08-20 18:04:54 -04:00
Conversation 0 Commits 4 Files changed 5 +23 -9
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d736d53a43 - Show all commits

32
api_handlers/api_handlers.go
View file

@ -61,19 +61,24 @@ func HandleV1Seed(c echo.Context) error {
// HandleV1BucketList affiche les buckets permis par server.documents.buckets, qui existent. // HandleV1BucketList affiche les buckets permis par server.documents.buckets, qui existent.
func HandleV1BucketList(c echo.Context) error { func HandleV1BucketList(c echo.Context) error {
var response models.V1BucketListResponse
var cfg config.Config var cfg config.Config
if err := viper.Unmarshal(&cfg); err != nil { if err := viper.Unmarshal(&cfg); err != nil {
return c.JSON(http.StatusInternalServerError, map[string]string{ response.StatusCode = http.StatusInternalServerError
"error": err.Error(), response.Message = "Error during viper.Unmarshal"
}) // response.Error = err.Error()
return c.JSON(response.StatusCode, response)
} }
mediaClient, err := media.NewMediaClientFromViper() mediaClient, err := media.NewMediaClientFromViper()
if err != nil { if err != nil {
return c.JSON(http.StatusInternalServerError, map[string]string{ response.StatusCode = http.StatusInternalServerError
"message": "Error during media.NewMediaClientFromViper()", response.Message = "Error during media.NewMediaClientFromViper()"
"error": err.Error(), // response.Error = err.Error()
})
return c.JSON(response.StatusCode, response)
} }
var buckets = make(map[string]string) var buckets = make(map[string]string)
@ -81,7 +86,11 @@ func HandleV1BucketList(c echo.Context) error {
for bucket_name, bucket_display_name := range cfg.Server.Documents.Buckets { for bucket_name, bucket_display_name := range cfg.Server.Documents.Buckets {
exists, err := mediaClient.MinioClient.BucketExists(context.Background(), bucket_name) exists, err := mediaClient.MinioClient.BucketExists(context.Background(), bucket_name)
if err != nil { if err != nil {
return c.JSON(http.StatusInternalServerError, "Error during minio#BucketExists") response.StatusCode = http.StatusInternalServerError
response.Message = "Error during minio#BucketExists"
// response.Error = err.Error()
return c.JSON(response.StatusCode, response)
} }
if exists { if exists {
@ -89,7 +98,12 @@ func HandleV1BucketList(c echo.Context) error {
} }
} }
return c.JSON(http.StatusOK, buckets) response.StatusCode = http.StatusOK
response.Message = "Buckets list successful"
response.Data.Buckets = buckets
return c.JSON(response.StatusCode, response)
//return c.JSON(response.StatusCode, response.Data.Buckets)
} }
func HandleV1BucketRead(c echo.Context) error { func HandleV1BucketRead(c echo.Context) error {