[RICPLT-1703] - Reset Request - after acceptance

[ric-plt/e2mgr.git] / E2Manager / controllers / controller.go

diff --git a/E2Manager/controllers/controller.go b/E2Manager/controllers/controller.go
index a0c7a15..6d638c4 100644 (file)
--- a/E2Manager/controllers/controller.go
+++ b/E2Manager/controllers/controller.go
@@ -28,9 +28,7 @@ import (
        "encoding/json"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
        "github.com/julienschmidt/httprouter"
-       "io"
        "net/http"
-       "time"
 )
 
 const (
@@ -39,54 +37,55 @@ const (
 type Controller struct {
        logger         *logger.Logger
        handlerProvider *providers.IncomingRequestHandlerProvider
-       rmrResponseChannel chan<- *models.NotificationResponse
 }
 
 func NewController(logger *logger.Logger, rmrService *services.RmrService, rNibReaderProvider func() reader.RNibReader, rNibWriterProvider func() rNibWriter.RNibWriter,
-       config *configuration.Configuration, rmrResponseChannel chan<- *models.NotificationResponse) *Controller {
+       config *configuration.Configuration) *Controller {
 
        provider := providers.NewIncomingRequestHandlerProvider(logger, rmrService, config, rNibWriterProvider, rNibReaderProvider)
        return &Controller{
                logger: logger,
                handlerProvider: provider,
-               rmrResponseChannel: rmrResponseChannel,
        }
 }
 
 func (c *Controller)ShutdownHandler(writer http.ResponseWriter, r *http.Request, params httprouter.Params){
-
+       c.logger.Infof("[Client -> E2 Manager] #controller.ShutdownHandler - request: %v", prettifyRequest(r))
        c.handleRequest(writer, &r.Header, providers.ShutdownRequest,nil, false, http.StatusNoContent)
 }
 
 func (c *Controller) X2ResetHandler(writer http.ResponseWriter, r *http.Request, params httprouter.Params){
-       startTime := time.Now()
+       c.logger.Infof("[Client -> E2 Manager] #controller.X2ResetHandler - request: %v", prettifyRequest(r))
        request:= models.ResetRequest{}
        ranName:= params.ByName(ParamRanName)
-       if !c.extractJsonBody(r.Body, &request, writer){
+
+       if !c.extractJsonBody(r, &request, writer){
                return
        }
        request.RanName = ranName
-       request.StartTime = startTime
        c.handleRequest(writer, &r.Header, providers.ResetRequest, request, false, http.StatusNoContent)
 }
 
-func (c *Controller) extractJsonBody(body io.Reader, request models.Request, writer http.ResponseWriter) bool{
-       decoder := json.NewDecoder(body)
-       if err:= decoder.Decode(request); err != nil {
+func (c *Controller) extractJsonBody(r *http.Request, request models.Request, writer http.ResponseWriter) bool{
+       if r.ContentLength <= 0 {
+               return true
+       }
+
+       decoder := json.NewDecoder(r.Body)
+       if err := decoder.Decode(request); err != nil {
                if err != nil {
                        c.logger.Errorf("[Client -> E2 Manager] #controller.extractJsonBody - unable to extract json body - error: %s", err)
-                       c.handleErrorResponse(e2managererrors.NewRequestValidationError(), writer)
+                       c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer)
                        return false
                }
        }
+
        return true
 }
 
 func (c *Controller) handleRequest(writer http.ResponseWriter, header *http.Header, requestName providers.IncomingRequest,
        request models.Request, validateHeader bool, httpStatusResponse int) {
 
-       c.logger.Infof("[Client -> E2 Manager] #controller.handleRequest - request: %v", requestName) //TODO print request if exist
-
        if validateHeader {
 
                err := c.validateRequestHeader(header)
@@ -102,7 +101,7 @@ func (c *Controller) handleRequest(writer http.ResponseWriter, header *http.Head
                return
        }
 
-       err = handler.Handle(c.logger, request, c.rmrResponseChannel)
+       err = handler.Handle(c.logger, request)
 
        if err != nil {
                c.handleErrorResponse(err, writer)
@@ -150,13 +149,21 @@ func (c *Controller) handleErrorResponse(err error, writer http.ResponseWriter){
                        e2Error, _ := err.(*e2managererrors.RequestValidationError)
                        errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
                        httpError = http.StatusBadRequest
+               case *e2managererrors.InvalidJsonError:
+                       e2Error, _ := err.(*e2managererrors.InvalidJsonError)
+                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+                       httpError = http.StatusBadRequest
                case *e2managererrors.RmrError:
                        e2Error, _ := err.(*e2managererrors.RmrError)
                        errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
                        httpError = http.StatusInternalServerError
+               case *e2managererrors.ResourceNotFoundError:
+                       e2Error, _ := err.(*e2managererrors.ResourceNotFoundError)
+                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+                       httpError = http.StatusNotFound
 
                default:
-                       e2Error, _ := err.(*e2managererrors.InternalError)
+                       e2Error := e2managererrors.NewInternalError()
                        errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
                        httpError = http.StatusInternalServerError
                }