Fix INF-346 and INF-347 subscription filter

[pti/o2.git] / o2ims / views / alarm_view.py

diff --git a/o2ims/views/alarm_view.py b/o2ims/views/alarm_view.py
index b3a9e4a..bb238be 100644 (file)
--- a/o2ims/views/alarm_view.py
+++ b/o2ims/views/alarm_view.py
@@ -16,7 +16,7 @@ import uuid as uuid
 
 from o2common.service import unit_of_work
 from o2common.views.pagination_view import Pagination
-from o2common.views.view import gen_filter
+from o2common.views.view import gen_filter, check_filter
 from o2ims.views.alarm_dto import SubscriptionDTO
 from o2ims.domain.alarm_obj import AlarmSubscription, AlarmEventRecord
 
@@ -61,12 +61,15 @@ def subscription_one(subscriptionId: str,
 
 def subscription_create(subscriptionDto: SubscriptionDTO.subscription_create,
                         uow: unit_of_work.AbstractUnitOfWork):
+    filter = subscriptionDto.get('filter', '')
+    consumer_subs_id = subscriptionDto.get('consumerSubscriptionId', '')
+
+    check_filter(AlarmEventRecord, filter)
 
     sub_uuid = str(uuid.uuid4())
     subscription = AlarmSubscription(
         sub_uuid, subscriptionDto['callback'],
-        subscriptionDto['consumerSubscriptionId'],
-        subscriptionDto['filter'])
+        consumer_subs_id, filter)
     with uow:
         uow.alarm_subscriptions.add(subscription)
         uow.commit()