[RICPLT-2157] Restructure handlers and converters.......

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

diff --git a/E2Manager/controllers/controller.go b/E2Manager/controllers/controller.go
index 4f785da..6c86816 100644 (file)
--- a/E2Manager/controllers/controller.go
+++ b/E2Manager/controllers/controller.go
@@ -27,7 +27,7 @@ import (
        "e2mgr/services"
        "encoding/json"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
-       "github.com/julienschmidt/httprouter"
+       "github.com/gorilla/mux"
        "net/http"
 )
 
@@ -35,6 +35,11 @@ const (
        ParamRanName = "ranName"
 )
 
+type IController interface {
+       ShutdownHandler(writer http.ResponseWriter, r *http.Request)
+       X2ResetHandler(writer http.ResponseWriter, r *http.Request)
+}
+
 type Controller struct {
        logger          *logger.Logger
        handlerProvider *httpmsghandlerprovider.IncomingRequestHandlerProvider
@@ -50,15 +55,16 @@ func NewController(logger *logger.Logger, rmrService *services.RmrService, rNibR
        }
 }
 
-func (c *Controller) ShutdownHandler(writer http.ResponseWriter, r *http.Request, params httprouter.Params) {
+func (c *Controller) ShutdownHandler(writer http.ResponseWriter, r *http.Request) {
        c.logger.Infof("[Client -> E2 Manager] #controller.ShutdownHandler - request: %v", prettifyRequest(r))
        c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ShutdownRequest, nil, false, http.StatusNoContent)
 }
 
-func (c *Controller) X2ResetHandler(writer http.ResponseWriter, r *http.Request, params httprouter.Params) {
+func (c *Controller) X2ResetHandler(writer http.ResponseWriter, r *http.Request) {
        c.logger.Infof("[Client -> E2 Manager] #controller.X2ResetHandler - request: %v", prettifyRequest(r))
        request := models.ResetRequest{}
-       ranName := params.ByName(ParamRanName)
+       vars := mux.Vars(r)
+       ranName := vars[ParamRanName]
 
        if !c.extractJsonBody(r, &request, writer) {
                return
@@ -73,12 +79,13 @@ func (c *Controller) extractJsonBody(r *http.Request, request models.Request, wr
        }
 
        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.NewInvalidJsonError(), writer)
-                       return false
-               }
+
+       err := decoder.Decode(request)
+
+       if err != nil {
+               c.logger.Errorf("[Client -> E2 Manager] #controller.extractJsonBody - unable to extract json body - error: %s", err)
+               c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer)
+               return false
        }
 
        return true
@@ -97,6 +104,7 @@ func (c *Controller) handleRequest(writer http.ResponseWriter, header *http.Head
        }
 
        handler, err := c.handlerProvider.GetHandler(requestName)
+
        if err != nil {
                c.handleErrorResponse(err, writer)
                return
@@ -132,40 +140,40 @@ func (c *Controller) handleErrorResponse(err error, writer http.ResponseWriter)
                switch err.(type) {
                case *e2managererrors.RnibDbError:
                        e2Error, _ := err.(*e2managererrors.RnibDbError)
-                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
                        httpError = http.StatusInternalServerError
                case *e2managererrors.CommandAlreadyInProgressError:
                        e2Error, _ := err.(*e2managererrors.CommandAlreadyInProgressError)
-                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
                        httpError = http.StatusMethodNotAllowed
                case *e2managererrors.HeaderValidationError:
                        e2Error, _ := err.(*e2managererrors.HeaderValidationError)
-                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
                        httpError = http.StatusUnsupportedMediaType
                case *e2managererrors.WrongStateError:
                        e2Error, _ := err.(*e2managererrors.WrongStateError)
-                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
                        httpError = http.StatusBadRequest
                case *e2managererrors.RequestValidationError:
                        e2Error, _ := err.(*e2managererrors.RequestValidationError)
-                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
                        httpError = http.StatusBadRequest
                case *e2managererrors.InvalidJsonError:
                        e2Error, _ := err.(*e2managererrors.InvalidJsonError)
-                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
                        httpError = http.StatusBadRequest
                case *e2managererrors.RmrError:
                        e2Error, _ := err.(*e2managererrors.RmrError)
-                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
                        httpError = http.StatusInternalServerError
                case *e2managererrors.ResourceNotFoundError:
                        e2Error, _ := err.(*e2managererrors.ResourceNotFoundError)
-                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
                        httpError = http.StatusNotFound
 
                default:
                        e2Error := e2managererrors.NewInternalError()
-                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message}
+                       errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}
                        httpError = http.StatusInternalServerError
                }
        }