Code Review
/
nonrtric
/
plt
/
sme.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Roll versions after J-Relase (master branch)
[nonrtric/plt/sme.git]
/
capifcore
/
internal
/
eventservice
/
eventservice.go
diff --git
a/capifcore/internal/eventservice/eventservice.go
b/capifcore/internal/eventservice/eventservice.go
index
0f7a8e8
..
1d63a45
100644
(file)
--- 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 != 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)
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 {
}
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(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)
}
}
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)
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)
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
}
}
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()
func (es *EventService) addSubscription(subId string, subscription eventsapi.EventSubscription) {
es.lock.Lock()
+ defer es.lock.Unlock()
es.subscriptions[subId] = subscription
es.subscriptions[subId] = subscription
- es.lock.Unlock()
}
func (es *EventService) getSubscription(subId string) *eventsapi.EventSubscription {
}
func (es *EventService) getSubscription(subId string) *eventsapi.EventSubscription {