X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fnotification_manager.go;h=5533c52e2dedb273d6f56006ebd696c5649abc7a;hb=70a1adcdcf3ba61d0e17e89cd0b6f34f812ec878;hp=72b42a90847d494c7e433061804daa6f843afc30;hpb=07ef76dd471a0892a893c90e0ab06713aee34be1;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/notification_manager.go b/E2Manager/managers/notification_manager.go
index 72b42a9..5533c52 100644
--- a/E2Manager/managers/notification_manager.go
+++ b/E2Manager/managers/notification_manager.go
@@ -29,30 +29,28 @@ import (
 	"time"
 )
 
-type NotificationManager struct{
-	rnibReaderProvider func() reader.RNibReader
-	rnibWriterProvider func() rNibWriter.RNibWriter
+type NotificationManager struct {
+	notificationHandlerProvider *providers.NotificationHandlerProvider
 }
 
 func NewNotificationManager(rnibReaderProvider func() reader.RNibReader, rnibWriterProvider func() rNibWriter.RNibWriter) *NotificationManager {
+	notificationHandlerProvider := providers.NewNotificationHandlerProvider(rnibReaderProvider, rnibWriterProvider)
+
 	return &NotificationManager{
-		rnibReaderProvider: rnibReaderProvider,
-		rnibWriterProvider: rnibWriterProvider,
+		notificationHandlerProvider: notificationHandlerProvider,
 	}
 }
+
 //TODO add NEWHandler with log
-func (m NotificationManager) HandleMessage(logger *logger.Logger, e2Sessions sessions.E2Sessions, mbuf *rmrCgo.MBuf, responseChannel chan<- *models.NotificationResponse){
+func (m NotificationManager) HandleMessage(logger *logger.Logger, e2Sessions sessions.E2Sessions, mbuf *rmrCgo.MBuf, responseChannel chan<- *models.NotificationResponse) {
 
-	provider := providers.NewNotificationHandlerProvider(m.rnibReaderProvider, m.rnibWriterProvider)
-	notificationHandler, err := provider.GetNotificationHandler(mbuf.MType)
+	notificationHandler, err := m.notificationHandlerProvider.GetNotificationHandler(mbuf.MType)
 
 	if err != nil {
 		logger.Errorf(fmt.Sprintf("%s", err))
 		return
 	}
 
-	notificationRequest := models.NotificationRequest{RanName: mbuf.Meid, Len: mbuf.Len, Payload: *mbuf.Payload,
-		StartTime: time.Now(), TransactionId: string(*mbuf.XAction)}
-
-	go notificationHandler.Handle(logger, e2Sessions, &notificationRequest, responseChannel)
-}
\ No newline at end of file
+	notificationRequest := models.NewNotificationRequest(mbuf.Meid, *mbuf.Payload, time.Now(), string(*mbuf.XAction))
+	go notificationHandler.Handle(logger, e2Sessions, notificationRequest, responseChannel)
+}