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
def alarm_event_records(uow: unit_of_work.AbstractUnitOfWork, **kwargs):
pagination = Pagination(**kwargs)
- filter_kwargs = pagination.get_filter()
+ query_kwargs = pagination.get_pagination()
args = gen_filter(AlarmEventRecord,
kwargs['filter']) if 'filter' in kwargs else []
with uow:
- li = uow.alarm_event_records.list_with_count(*args, **filter_kwargs)
+ li = uow.alarm_event_records.list_with_count(*args, **query_kwargs)
return pagination.get_result(li)
def subscriptions(uow: unit_of_work.AbstractUnitOfWork, **kwargs):
pagination = Pagination(**kwargs)
- filter_kwargs = pagination.get_filter()
+ query_kwargs = pagination.get_pagination()
args = gen_filter(AlarmSubscription,
kwargs['filter']) if 'filter' in kwargs else []
with uow:
- li = uow.alarm_subscriptions.list_with_count(*args, **filter_kwargs)
+ li = uow.alarm_subscriptions.list_with_count(*args, **query_kwargs)
return pagination.get_result(li)
return first.serialize() if first is not None else None
-def subscription_create(subscriptionDto: SubscriptionDTO.subscription,
+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()
- return {"alarmSubscriptionId": sub_uuid}
+ first = uow.alarm_subscriptions.get(sub_uuid)
+ return first.serialize()
def subscription_delete(subscriptionId: str,