230 allow empty subscriptions (#231)

* fix(subscriptions): allow showing empty subscriptions

* fix(subscriptions): add error handling for validation

Author: djs0109

app/Entirety/subscriptions/views/list.py

@@ -53,16 +53,21 @@ def get_queryset(self):
                 sub.description = sub_cb.description
                 sub.status = sub_cb.status
                 sub.project = self.project
-                if sub_cb.subject.entities[0].id:
-                    sub.entity_id = sub_cb.subject.entities[0].id
-                if sub_cb.subject.entities[0].idPattern:
-                    sub.entity_id_pattern = sub_cb.subject.entities[0].idPattern.pattern
-                if sub_cb.subject.entities[0].type:
-                    sub.entity_type = sub_cb.subject.entities[0].type
-                if sub_cb.subject.entities[0].typePattern:
-                    sub.entity_type_pattern = sub_cb.subject.entities[
-                        0
-                    ].typePattern.pattern
+                if not sub_cb.subject.entities:
+                    pass  # add nothing if no entities
+                else:
+                    if sub_cb.subject.entities[0].id:
+                        sub.entity_id = sub_cb.subject.entities[0].id
+                    if sub_cb.subject.entities[0].idPattern:
+                        sub.entity_id_pattern = sub_cb.subject.entities[
+                            0
+                        ].idPattern.pattern
+                    if sub_cb.subject.entities[0].type:
+                        sub.entity_type = sub_cb.subject.entities[0].type
+                    if sub_cb.subject.entities[0].typePattern:
+                        sub.entity_type_pattern = sub_cb.subject.entities[
+                            0
+                        ].typePattern.pattern
                 # get url
                 url = self.get_notification_url(sub_cb)
                 sub.notification_endpoint = url

app/Entirety/subscriptions/views/update.py

@@ -213,13 +213,15 @@ def post(self, request, *args, **kwargs):
                                 id=(
                                     entity_form.cleaned_data["entity_id"]
                                     if entity_selector == "id"
+                                    and entity_form.cleaned_data["entity_id"]
                                     else None
                                 ),
                                 idPattern=(
                                     utils.safe_compile(
                                         entity_form.cleaned_data["entity_id"]
                                     )
                                     if entity_selector == "id_pattern"
+                                    and entity_form.cleaned_data["entity_id"]
                                     else None
                                 ),
                                 type=(
@@ -233,6 +235,7 @@ def post(self, request, *args, **kwargs):
                                         entity_form.cleaned_data["entity_type"]
                                     )
                                     if type_selector == "type_pattern"
+                                    and entity_form.cleaned_data["entity_type"]
                                     else None
                                 ),
                             )
@@ -251,6 +254,21 @@ def post(self, request, *args, **kwargs):
                 )
                 messages.error(request, e)
                 return self.form_invalid(form)
+            except ValueError as e:
+                logger.error(
+                    str(
+                        self.request.user.first_name
+                        if self.request.user.first_name
+                        else self.request.user.username
+                    )
+                    + " tried updating the subscription with name "
+                    + self.object.uuid
+                    + " but failed "
+                    f" in project {self.project.name}"
+                )
+                messages.error(request, e)
+                return self.form_invalid(form)
+
             with ContextBrokerClient(
                 url=settings.CB_URL,
                 fiware_header=FiwareHeader(