From 4c69906f24ced8e1408aa1c9d7af5b79d90846ac Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Wed, 13 Nov 2024 19:16:33 -0300 Subject: [PATCH] renaming annotation to variable --- dashboard/views.py | 4 ++-- device/models.py | 38 +++++++++++++++++++------------------- evidence/models.py | 2 +- evidence/views.py | 2 +- utils/device.py | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dashboard/views.py b/dashboard/views.py index 1bc0934..9b1be56 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -86,7 +86,7 @@ class SearchView(InventaryMixin): def get_properties(self, xp): snap = xp.document.get_data() uuid = json.loads(snap).get('uuid') - return Device.get_annotation_from_uuid(uuid, self.request.user.institution) + return Device.get_properties_from_uuid(uuid, self.request.user.institution) def search_hids(self, query, offset, limit): qry = Q() @@ -95,7 +95,7 @@ class SearchView(InventaryMixin): if i: qry |= Q(value__startswith=i) - chids = Annotation.objects.filter( + chids = SystemProperty.objects.filter( type=Annotation.Type.SYSTEM, owner=self.request.user.institution ).filter( diff --git a/device/models.py b/device/models.py index f74f8f6..f848f1d 100644 --- a/device/models.py +++ b/device/models.py @@ -1,7 +1,7 @@ from django.db import models, connection from utils.constants import ALGOS -from evidence.models import SystemProperty, UserProperty, Property, Evidence +from evidence.models import SystemProperty, UserProperty, Property, Evidence from lot.models import DeviceLot @@ -148,8 +148,8 @@ class Device: ELSE 3 END, t1.created DESC - ) AS row_num - FROM evidence_annotation AS t1 + ) AS row_num + FROM evidence_systemproperty AS t1 LEFT JOIN lot_devicelot AS t2 ON t1.value = t2.device_id WHERE t2.device_id IS NULL AND t1.owner_id = {institution} @@ -170,12 +170,12 @@ class Device: sql += ";" - annotations = [] + properties = [] with connection.cursor() as cursor: cursor.execute(sql) - annotations = cursor.fetchall() + properties = cursor.fetchall() - devices = [cls(id=x[0]) for x in annotations] + devices = [cls(id=x[0]) for x in properties] count = cls.get_unassigned_count(institution) return devices, count @@ -183,7 +183,7 @@ class Device: def get_unassigned_count(cls, institution): sql = """ - WITH RankedAnnotations AS ( + WITH RankedProperties AS ( SELECT t1.value, t1.key, @@ -197,30 +197,30 @@ class Device: END, t1.created DESC ) AS row_num - FROM evidence_annotation AS t1 + FROM evidence_systemproperty AS t1 LEFT JOIN lot_devicelot AS t2 ON t1.value = t2.device_id WHERE t2.device_id IS NULL AND t1.owner_id = {institution} - AND t1.type = {type} + And t1.type = '{type}' ) SELECT COUNT(DISTINCT value) FROM - RankedAnnotations + RankedProperties WHERE row_num = 1 """.format( institution=institution.id, - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, ) with connection.cursor() as cursor: cursor.execute(sql) return cursor.fetchall()[0][0] @classmethod - def get_annotation_from_uuid(cls, uuid, institution): + def get_properties_from_uuid(cls, uuid, institution): sql = """ - WITH RankedAnnotations AS ( + WITH RankedProperties AS ( SELECT t1.value, t1.key, @@ -234,29 +234,29 @@ class Device: END, t1.created DESC ) AS row_num - FROM evidence_annotation AS t1 + FROM evidence_systemproperty AS t1 LEFT JOIN lot_devicelot AS t2 ON t1.value = t2.device_id WHERE t2.device_id IS NULL AND t1.owner_id = {institution} - AND t1.type = {type} + AND t1.type = '{type}' AND t1.uuid = '{uuid}' ) SELECT DISTINCT value FROM - RankedAnnotations + RankedProperties WHERE row_num = 1; """.format( uuid=uuid.replace("-", ""), institution=institution.id, - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, ) - annotations = [] + properties = [] with connection.cursor() as cursor: cursor.execute(sql) - annotations = cursor.fetchall() + properties = cursor.fetchall() return cls(id=annotations[0][0]) diff --git a/evidence/models.py b/evidence/models.py index 6414f72..4074b7c 100644 --- a/evidence/models.py +++ b/evidence/models.py @@ -159,7 +159,7 @@ class Evidence: def get_all(cls, user): return SystemProperty.objects.filter( owner=user.institution, - type=SystemProperty.Type.SYSTEM, + type=Property.Type.SYSTEM, key="hidalgo1", ).order_by("-created").values_list("uuid", "created").distinct() diff --git a/evidence/views.py b/evidence/views.py index 1d39310..39b8d8e 100644 --- a/evidence/views.py +++ b/evidence/views.py @@ -13,7 +13,7 @@ from django.views.generic.edit import ( ) from dashboard.mixins import DashboardView, Http403 -from evidence.models import Property, SystemProperty, UserProperty +from evidence.models import Property, SystemProperty, UserProperty, Evidence from evidence.forms import ( UploadForm, UserTagForm, diff --git a/utils/device.py b/utils/device.py index 6f246c8..43d8e1b 100644 --- a/utils/device.py +++ b/utils/device.py @@ -76,7 +76,7 @@ def create_property(doc, user, commit=False): 'uuid': doc['uuid'], 'owner': user.institution, 'user': user, - 'type': Annotation.Type.SYSTEM, + 'type': Property.Type.SYSTEM, 'key': 'CUSTOMER_ID', 'value': doc['CUSTOMER_ID'], }