X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Finternal%2Feventservice%2Feventservice.go;h=1d63a453ab63608e4888374e3082ae65f4203ec8;hb=refs%2Ftags%2F1.0.1;hp=0f7a8e8c0f1915fc73e047a95183e9cc32797242;hpb=f20cbf73ae51762b728bd1f0c97b664b0598e02d;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/internal/eventservice/eventservice.go b/capifcore/internal/eventservice/eventservice.go
index 0f7a8e8..1d63a45 100644
--- a/capifcore/internal/eventservice/eventservice.go
+++ b/capifcore/internal/eventservice/eventservice.go
@@ -74,6 +74,11 @@ func (es *EventService) PostSubscriberIdSubscriptions(ctx echo.Context, subscrib
 	if err != nil {
 		return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
 	}
+
+	if err := newSubscription.Validate(); err != nil {
+		return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
+	}
+
 	uri := ctx.Request().Host + ctx.Request().URL.String()
 	subId := es.getSubscriptionId(subscriberId)
 	es.addSubscription(subId, newSubscription)
@@ -88,18 +93,22 @@ func (es *EventService) PostSubscriberIdSubscriptions(ctx echo.Context, subscrib
 }
 
 func (es *EventService) DeleteSubscriberIdSubscriptionsSubscriptionId(ctx echo.Context, subscriberId string, subscriptionId string) error {
-	es.lock.Lock()
-	defer es.lock.Unlock()
 
 	log.Debug(es.subscriptions)
 	if _, ok := es.subscriptions[subscriptionId]; ok {
-		log.Debug("Deleting subscription", subscriptionId)
-		delete(es.subscriptions, subscriptionId)
+		es.deleteSubscription(subscriptionId)
 	}
 
 	return ctx.NoContent(http.StatusNoContent)
 }
 
+func (es *EventService) deleteSubscription(subscriptionId string) {
+	log.Debug("Deleting subscription", subscriptionId)
+	es.lock.Lock()
+	defer es.lock.Unlock()
+	delete(es.subscriptions, subscriptionId)
+}
+
 func getEventSubscriptionFromRequest(ctx echo.Context) (eventsapi.EventSubscription, error) {
 	var subscription eventsapi.EventSubscription
 	err := ctx.Bind(&subscription)
@@ -162,8 +171,9 @@ func matchesFilters(eventIds *[]string, filters []eventsapi.CAPIFEventFilter, ge
 		filterIds := getIds(filter)
 		if filterIds == nil || len(*filterIds) == 0 {
 			return matchesFilters(eventIds, filters[1:], getIds)
+		} else {
+			return slices.Contains(*getIds(filter), id) && matchesFilters(eventIds, filters[1:], getIds)
 		}
-		return slices.Contains(*getIds(filter), id) && matchesFilters(eventIds, filters[1:], getIds)
 	}
 	return true
 }
@@ -211,8 +221,8 @@ func (es *EventService) getSubscriptionId(subscriberId string) string {
 
 func (es *EventService) addSubscription(subId string, subscription eventsapi.EventSubscription) {
 	es.lock.Lock()
+	defer es.lock.Unlock()
 	es.subscriptions[subId] = subscription
-	es.lock.Unlock()
 }
 
 func (es *EventService) getSubscription(subId string) *eventsapi.EventSubscription {