From 2b4010418060b124af8e50bc75df9969a1ea8911 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 14 Oct 2024 17:43:32 +0200 Subject: [PATCH] change response from api/snapshots --- api/views.py | 23 ++++++++++++++++++++++- device/models.py | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/api/views.py b/api/views.py index cfb7d6e..62477ff 100644 --- a/api/views.py +++ b/api/views.py @@ -1,5 +1,6 @@ import json +from django.conf import settings from django.urls import reverse_lazy from django.shortcuts import get_object_or_404, redirect from django.utils.translation import gettext_lazy as _ @@ -69,9 +70,29 @@ def NewSnapshot(request): except Exception: return JsonResponse({'status': 'fail'}, status=200) - return JsonResponse({'status': 'success'}, status=200) + annotation = Annotation.objects.filter( + uuid=data['uuid'], + type=Annotation.Type.SYSTEM, + key="hidalgo1", + owner=tk.owner.institution + ).first() + if not annotation: + return JsonResponse({'status': 'fail'}, status=200) + + url = "{}://{}{}".format( + request.scheme, + settings.DOMAIN, + reverse_lazy("device:details", args=(annotation.value,)) + ) + response = { + "status": "success", + "dhid": annotation.value[:5].upper(), + "url": url, + "public_url": url + } + return JsonResponse(response, status=200) class TokenView(DashboardView, SingleTableView): diff --git a/device/models.py b/device/models.py index d225946..926e447 100644 --- a/device/models.py +++ b/device/models.py @@ -27,7 +27,7 @@ class Device: # the id is the chid of the device self.id = kwargs["id"] self.pk = self.id - self.shortid = self.pk[:6] + self.shortid = self.pk[:6].upper() self.algorithm = None self.owner = None self.annotations = []