Feature/weos 1378

api.yaml

@@ -71,6 +71,9 @@ components:
           type: string
         description:
           type: string
+          x-upload:
+            folder: ./files
+            limit: 10000
         active:
           type: boolean
         status:
@@ -759,3 +762,25 @@ paths:
       responses:
         200:
           description: Delete author
+
+  /files:
+    get:
+      operationId: getFiles
+      responses:
+        200:
+          description: Files
+          x-folder: "./files"
+    post:
+      operationId: uploadFile
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: string
+              format: binary
+              x-upload:
+                folder: "./files"
+                limit: 1000
+      responses:
+        201:
+          description: File successfully uploaded

context/context.go

@@ -37,6 +37,7 @@ const AUTHORIZATION string = "Authorization"
 const ACCEPT string = "Accept"
 const CONTENT_TYPE_RESPONSE string = "_content_type_response"
 const BASIC_RESPONSE string = "_basic_response"
+const UPLOAD_RESPONSE string = "_upload_response"
 
 //Path initializers are run per path and can be used to configure routes that are not defined in the open api spec
 const METHODS_FOUND ContextKey = "_methods_found"

controllers/rest/controller_standard.go

@@ -32,6 +32,17 @@ func CreateMiddleware(api *RESTAPI, projection projections.Projection, commandDi
 		return func(ctxt echo.Context) error {
 			//look up the schema for the content type so that we could identify the rules
 			newContext := ctxt.Request().Context()
+
+			uploadResponse := newContext.Value(weoscontext.UPLOAD_RESPONSE)
+			if uploadResponse != nil {
+				if uploadErr, ok := uploadResponse.(*echo.HTTPError); ok {
+					if uploadErr.Error() != "" {
+						ctxt.Logger().Error(uploadErr)
+						return uploadErr
+					}
+				}
+			}
+
 			if entityFactory != nil {
 				newContext = context.WithValue(newContext, weoscontext.ENTITY_FACTORY, entityFactory)
 			} else {
@@ -689,6 +700,8 @@ func DefaultResponseMiddleware(api *RESTAPI, projection projections.Projection,
 	}
 
 	fileName := ""
+	folderFound := true
+	folderErr := ""
 	var templates []string
 
 	if api.Swagger != nil {
@@ -703,7 +716,9 @@ func DefaultResponseMiddleware(api *RESTAPI, projection projections.Projection,
 						} else {
 							_, err = os.Stat(folderPath)
 							if os.IsNotExist(err) {
-								api.e.Logger.Warnf("error finding folder: '%s' specified on path: '%s'", folderPath, pathName)
+								folderFound = false
+								folderErr = "error finding folder: " + folderPath + " specified on path: " + pathName
+								api.e.Logger.Errorf(folderErr)
 							} else if err != nil {
 								api.e.Logger.Error(err)
 							} else {
@@ -743,6 +758,10 @@ func DefaultResponseMiddleware(api *RESTAPI, projection projections.Projection,
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(ctxt echo.Context) error {
+			if !folderFound {
+				api.e.Logger.Errorf(folderErr)
+				return NewControllerError(folderErr, nil, http.StatusNotFound)
+			}
 			ctx := ctxt.Request().Context()
 			if activatedResponse {
 				var responseType *CResponseType
@@ -886,10 +905,20 @@ func DefaultResponseController(api *RESTAPI, projection projections.Projection,
 	return func(context echo.Context) error {
 		newContext := context.Request().Context()
 		value := newContext.Value(weoscontext.BASIC_RESPONSE)
-		if value == nil {
-			return nil
+		uploadResponse := newContext.Value(weoscontext.UPLOAD_RESPONSE)
+
+		if uploadResponse == nil {
+			if value == nil {
+				return nil
+			}
+			return NewControllerError(value.(error).Error(), value.(error), http.StatusBadRequest)
+		} else {
+			if err, ok := uploadResponse.(*echo.HTTPError); ok {
+				return err
+			}
+			return context.JSON(http.StatusCreated, "File successfully Uploaded")
 		}
-		return value.(error)
+
 	}
 }
 

controllers/rest/fixtures/blog-integration.yaml

@@ -104,8 +104,6 @@ components:
           type: string
         description:
           type: string
-        author:
-          $ref: "#/components/schemas/Author"
         created:
           type: string
           format: date-time