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

Merge pull request 'Implémenter models.NotFoundResponse()' (#134) from refactor/not-found-response into main

Browse source 
Reviewed-on: #134
This commit is contained in:
Victor Lacasse-Beaudoin 2023-08-22 14:26:56 -05:00
commit bea6c06668
3 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
api_handlers/api_handlers.go
View file

@ -127,13 +127,7 @@ func HandleV1BucketRead(c echo.Context) error {
}
if !allowed {
/* TODO models.NotFoundResponse
response.StatusCode = http.StatusNotFound
response.Message = "Not Found"
return c.JSON(response.StatusCode, response)
*/
return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"})
return c.JSON(http.StatusNotFound, models.NotFoundResponse())
}
ctx, cancel := context.WithCancel(context.Background())
@ -159,8 +153,7 @@ func HandleV1BucketRead(c echo.Context) error {
}
if !exists {
// TODO models.NotFoundResponse
return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"})
return c.JSON(http.StatusNotFound, models.NotFoundResponse())
}
objectCh := mediaClient.MinioClient.ListObjects(ctx, bucket, minio.ListObjectsOptions{})
@ -210,7 +203,7 @@ func HandleV1DocumentCreate(c echo.Context) error {
}
if !allowed {
return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"})
return c.JSON(http.StatusNotFound, models.NotFoundResponse())
}
ctx, cancel := context.WithCancel(context.Background())
@ -279,7 +272,7 @@ func HandleV1DocumentRead(c echo.Context) error {
}
if !allowed {
return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"})
return c.JSON(http.StatusNotFound, models.NotFoundResponse())
}
ctx, cancel := context.WithCancel(context.Background())
@ -300,7 +293,7 @@ func HandleV1DocumentRead(c echo.Context) error {
}
if !bucket_exists {
return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"})
return c.JSON(http.StatusNotFound, models.NotFoundResponse())
}
document_info, err := mediaClient.MinioClient.StatObject(ctx, bucket, document, minio.StatObjectOptions{})
@ -308,7 +301,7 @@ func HandleV1DocumentRead(c echo.Context) error {
if err != nil {
if err.Error() == "The specified key does not exist." {
return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"})
return c.JSON(http.StatusNotFound, models.NotFoundResponse())
}
return c.JSON(http.StatusInternalServerError, map[string]interface{}{
@ -356,12 +349,7 @@ func HandleV1DocumentDelete(c echo.Context) error {
}
if !allowed {
/*
return c.JSON(http.StatusBadRequest, map[string]string{
"message": "Bucket is not allowed in server.documents.buckets",
})
*/
return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"})
return c.JSON(http.StatusNotFound, models.NotFoundResponse())
}
ctx, cancel := context.WithCancel(context.Background())
@ -382,14 +370,14 @@ func HandleV1DocumentDelete(c echo.Context) error {
}
if !bucket_exists {
return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"})
return c.JSON(http.StatusNotFound, models.NotFoundResponse())
}
document_info, err := mediaClient.MinioClient.StatObject(ctx, bucket, document, minio.StatObjectOptions{})
if err != nil {
if err.Error() == "The specified key does not exist." {
return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"})
return c.JSON(http.StatusNotFound, models.NotFoundResponse())
}
return c.JSON(http.StatusInternalServerError, map[string]interface{}{

14
models/responses.go
View file

@ -14,6 +14,20 @@ func (r Response) Respond() Responder {
return r
}
type SimpleResponse struct {
Message string
}
func (r SimpleResponse) Respond() Responder {
return r
}
func NotFoundResponse() SimpleResponse {
return SimpleResponse{
Message: "Not Found",
}
}
type HandleAdminDocumentsUploadResponse struct {
Response
Data struct {

4
web_handlers/web_handlers.go
View file

@ -130,7 +130,7 @@ func HandleFormulaires(c echo.Context) error {
func HandlePublicDocumentation(c echo.Context) error {
client, err := api.NewApiClientFromViper()
if err != nil {
return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"})
return c.JSON(http.StatusNotFound, models.NotFoundResponse())
}
bucket := c.Param("bucket")
@ -138,7 +138,7 @@ func HandlePublicDocumentation(c echo.Context) error {
result, err := client.Call(http.MethodGet, fmt.Sprintf("/v1/bucket/%s/%s", bucket, document))
if err != nil {
return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"})
return c.JSON(http.StatusNotFound, models.NotFoundResponse())
}
// Check if result can fit inside a map containing a message