Updates for G Maintenance release

[nonrtric/plt/sme.git] / capifcore / internal / eventservice / eventservice.go

diff --git a/capifcore/internal/eventservice/eventservice.go b/capifcore/internal/eventservice/eventservice.go
index 1bc910b..1d63a45 100644 (file)
--- a/capifcore/internal/eventservice/eventservice.go
+++ b/capifcore/internal/eventservice/eventservice.go
@@ -33,6 +33,7 @@ import (
        "k8s.io/utils/strings/slices"
        "oransc.org/nonrtric/capifcore/internal/common29122"
        "oransc.org/nonrtric/capifcore/internal/eventsapi"
+       "oransc.org/nonrtric/capifcore/internal/publishserviceapi"
        "oransc.org/nonrtric/capifcore/internal/restclient"
 )
 
@@ -73,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)
@@ -87,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)
@@ -132,9 +142,9 @@ func (es *EventService) getMatchingSubs(event eventsapi.EventNotification) []str
                subscription := es.subscriptions[subId]
                if subscription.EventFilters == nil || event.EventDetail == nil {
                        matchingSubs = append(matchingSubs, subId)
-                       break
-               }
-               if matchesApiIds(*event.EventDetail.ApiIds, *subscription.EventFilters) {
+               } else if matchesFilters(event.EventDetail.ApiIds, *subscription.EventFilters, getApiIdsFromFilter) &&
+                       matchesFilters(event.EventDetail.ApiInvokerIds, *subscription.EventFilters, getInvokerIdsFromFilter) &&
+                       matchesFilters(getAefIdsFromEvent(event.EventDetail.ServiceAPIDescriptions), *subscription.EventFilters, getAefIdsFromFilter) {
                        matchingSubs = append(matchingSubs, subId)
                }
        }
@@ -152,20 +162,50 @@ func (es *EventService) filterOnEventType(event eventsapi.EventNotification) []s
        return matchingSubs
 }
 
-func matchesApiIds(eventIds []string, filters []eventsapi.CAPIFEventFilter) bool {
-       if len(filters) == 0 {
+func matchesFilters(eventIds *[]string, filters []eventsapi.CAPIFEventFilter, getIds func(eventsapi.CAPIFEventFilter) *[]string) bool {
+       if len(filters) == 0 || eventIds == nil {
                return true
        }
-       for _, apiId := range eventIds {
+       for _, id := range *eventIds {
                filter := filters[0]
-               if filter.ApiIds == nil {
-                       return true && matchesApiIds(eventIds, filters[1:])
+               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(*filter.ApiIds, apiId) && matchesApiIds(eventIds, filters[1:])
        }
        return true
 }
 
+func getApiIdsFromFilter(filter eventsapi.CAPIFEventFilter) *[]string {
+       return filter.ApiIds
+}
+
+func getInvokerIdsFromFilter(filter eventsapi.CAPIFEventFilter) *[]string {
+       return filter.ApiInvokerIds
+}
+
+func getAefIdsFromEvent(serviceAPIDescriptions *[]publishserviceapi.ServiceAPIDescription) *[]string {
+       aefIds := []string{}
+       if serviceAPIDescriptions == nil {
+               return &aefIds
+       }
+       for _, serviceDescription := range *serviceAPIDescriptions {
+               if serviceDescription.AefProfiles == nil {
+                       return &aefIds
+               }
+               for _, profile := range *serviceDescription.AefProfiles {
+                       aefIds = append(aefIds, profile.AefId)
+               }
+       }
+       return &aefIds
+}
+
+func getAefIdsFromFilter(filter eventsapi.CAPIFEventFilter) *[]string {
+       return filter.AefIds
+}
+
 func asStrings(events []eventsapi.CAPIFEvent) []string {
        asStrings := make([]string, len(events))
        for i, event := range events {
@@ -181,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 {