X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Finternal%2Feventservice%2Feventservice.go;h=1d63a453ab63608e4888374e3082ae65f4203ec8;hb=5493b0faf67fc5b58b575880db528eb2b663d45a;hp=fd3cce7a26140fb31969f589c9f71c0d3c914d38;hpb=6edc6544f698b8f5d923f3b2717ab103b7473dfe;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/internal/eventservice/eventservice.go b/capifcore/internal/eventservice/eventservice.go
index fd3cce7..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)
@@ -166,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
 }