dashboard/mixins.py

@@ -39,7 +39,7 @@ class DashboardView(LoginRequiredMixin):
             'section': self.section,
             'path': resolve(self.request.path).url_name,
             'user': self.request.user,
-            'lot_tags': LotTag.objects.filter(owner=self.request.user.institution)
+            'lot_tags': LotTag.objects.filter(owner=self.request.user)
         })
         return context
 
@@ -58,11 +58,7 @@ class DetailsMixin(DashboardView, TemplateView):
 
     def get(self, request, *args, **kwargs):
         self.pk = kwargs['pk']
-        self.object = get_object_or_404(
+        self.object = get_object_or_404(self.model, pk=self.pk, owner=self.request.user)
-            self.model,
-            pk=self.pk,
-            owner=self.request.user.institution
-        )
         return super().get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
@@ -76,17 +72,14 @@ class DetailsMixin(DashboardView, TemplateView):
 class InventaryMixin(DashboardView, TemplateView):
 
     def post(self, request, *args, **kwargs):
-        post = dict(self.request.POST)
+        dev_ids = dict(self.request.POST).get("devices", [])
-        url = post.get("url")
-
-        if url:
-            dev_ids = post.get("devices", [])
         self.request.session["devices"] = dev_ids
-
+        url = self.request.POST.get("url")
+        if url:
             try:
-                resource = resolve(url[0])
+                resource = resolve(url)
                 if resource and dev_ids:
-                    return redirect(url[0])
+                    return redirect(url)
             except Exception:
                 pass
         return super().get(request, *args, **kwargs)

dashboard/templates/base.html

@@ -179,17 +179,6 @@
           {% endblock messages %}
           <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2">
             <h1 class="h2">{{ title }}</h1>
-
-	    <form method="post" action="{% url 'dashboard:search' %}">
-              {% csrf_token %}
-              <div class="input-group rounded">
-                <input type="search" name="search" class="form-control rounded" placeholder="Search your device..." aria-label="Search" aria-describedby="search-addon" />
-        	<span class="input-group-text border-0" id="search-addon">
-        	  <i class="fas fa-search"></i>
-        	</span>
-              </div>
-            </form>
-	    
           </div>
           <div class="row border-bottom mb-3">
             <div class="col">

dashboard/urls.py

@@ -6,5 +6,4 @@ app_name = 'dashboard'
 urlpatterns = [
     path("", views.UnassignedDevicesView.as_view(), name="unassigned_devices"),
     path("<int:pk>/", views.LotDashboardView.as_view(), name="lot"),
-    path("search", views.SearchView.as_view(), name="search"),
 ]

dashboard/views.py

@@ -1,13 +1,7 @@
-import json
-
 from django.utils.translation import gettext_lazy as _
-from django.views.generic.edit import FormView
 from django.shortcuts import Http404
-from django.db.models import Q
 
 from dashboard.mixins import InventaryMixin, DetailsMixin
-from evidence.models import Annotation
-from evidence.xapian import search
 from device.models import Device
 from lot.models import Lot
 
@@ -38,68 +32,6 @@ class LotDashboardView(InventaryMixin, DetailsMixin):
         return context
 
     def get_devices(self, user, offset, limit):
-        chids = self.object.devicelot_set.all().values_list(
+        chids = self.object.devicelot_set.all().values_list("device_id", flat=True).distinct()
-            "device_id", flat=True
-        ).distinct()
-
         chids_page = chids[offset:offset+limit]
         return [Device(id=x) for x in chids_page], chids.count()
-
-
-class SearchView(InventaryMixin):
-    template_name = "unassigned_devices.html"
-    section = "Search"
-    title = _("Search Devices")
-    breadcrumb = "Devices / Search Devices"
-
-    def get_devices(self, user, offset, limit):
-        post = dict(self.request.POST)
-        query = post.get("search")
-
-        if not query:
-            return [], 0
-
-        matches = search(
-            self.request.user.institution,
-            query[0],
-            offset,
-            limit
-        )
-
-        if not matches.size():
-            return self.search_hids(query, offset, limit)
-
-        annotations = []
-        for x in matches:
-            annotations.extend(self.get_annotations(x))
-
-        devices = [Device(id=x) for x in set(annotations)]
-        count = matches.size()
-        return devices, count
-
-    def get_annotations(self, xp):
-        snap = xp.document.get_data()
-        uuid = json.loads(snap).get('uuid')
-
-        return Annotation.objects.filter(
-            type=Annotation.Type.SYSTEM,
-            owner=self.request.user.institution,
-            uuid=uuid
-        ).values_list("value", flat=True).distinct()
-
-    def search_hids(self, query, offset, limit):
-        qry = Q()
-
-        for i in query[0].split(" "):
-            if i:
-                qry |= Q(value__startswith=i)
-
-        chids = Annotation.objects.filter(
-            type=Annotation.Type.SYSTEM,
-            owner=self.request.user.institution
-        ).filter(
-            qry
-        ).values_list("value", flat=True).distinct()
-        chids_page = chids[offset:offset+limit]
-
-        return [Device(id=x) for x in chids_page], chids.count()

device/views.py

@@ -98,7 +98,7 @@ class DetailsView(DashboardView, TemplateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         self.object.initial()
-        lot_tags = LotTag.objects.filter(owner=self.request.user.institution)
+        lot_tags = LotTag.objects.filter(owner=self.request.user)
         context.update({
             'object': self.object,
             'snapshot': self.object.get_last_evidence(),

evidence/xapian.py

@@ -18,6 +18,7 @@ def search(institution, qs, offset=0, limit=10):
     qp.set_stemmer(xapian.Stem("english"))
     qp.set_stemming_strategy(xapian.QueryParser.STEM_SOME)
     qp.add_prefix("uuid", "uuid")
+    # qp.add_prefix("snapshot", "snapshot")
     query = qp.parse_query(qs)
     institution_term = "U{}".format(institution.id)
     final_query = xapian.Query(

lot/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.0.6 on 2024-10-09 14:41
+# Generated by Django 5.0.6 on 2024-07-27 16:23
 
 import django.db.models.deletion
 from django.conf import settings
@@ -10,7 +10,6 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ("user", "0001_initial"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
@@ -37,15 +36,6 @@ class Migration(migrations.Migration):
                     "owner",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        to="user.institution",
-                    ),
-                ),
-                (
-                    "user",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
                         to=settings.AUTH_USER_MODEL,
                     ),
                 ),
@@ -72,51 +62,6 @@ class Migration(migrations.Migration):
                 ),
             ],
         ),
-        migrations.CreateModel(
-            name="LotAnnotation",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("created", models.DateTimeField(auto_now_add=True)),
-                (
-                    "type",
-                    models.SmallIntegerField(
-                        choices=[(0, "System"), (1, "User"), (2, "Document")]
-                    ),
-                ),
-                ("key", models.CharField(max_length=256)),
-                ("value", models.CharField(max_length=256)),
-                (
-                    "lot",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE, to="lot.lot"
-                    ),
-                ),
-                (
-                    "owner",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to="user.institution",
-                    ),
-                ),
-                (
-                    "user",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-            ],
-        ),
         migrations.CreateModel(
             name="LotTag",
             fields=[
@@ -134,15 +79,6 @@ class Migration(migrations.Migration):
                     "owner",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        to="user.institution",
-                    ),
-                ),
-                (
-                    "user",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
                         to=settings.AUTH_USER_MODEL,
                     ),
                 ),

lot/migrations/0002_lotannotation.py

@@ -0,0 +1,52 @@
+# Generated by Django 5.0.6 on 2024-07-29 15:37
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("lot", "0001_initial"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="LotAnnotation",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created", models.DateTimeField(auto_now_add=True)),
+                (
+                    "type",
+                    models.SmallIntegerField(
+                        choices=[(0, "System"), (1, "User"), (2, "Document")]
+                    ),
+                ),
+                ("key", models.CharField(max_length=256)),
+                ("value", models.CharField(max_length=256)),
+                (
+                    "lot",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="lot.lot"
+                    ),
+                ),
+                (
+                    "owner",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+    ]

lot/models.py

@@ -6,15 +6,14 @@ from utils.constants import (
     STR_EXTEND_SIZE,
 )
 
-from user.models import User, Institution
+from user.models import User
 # from device.models import Device
 from evidence.models import Annotation
 
 
 class LotTag(models.Model):
     name = models.CharField(max_length=STR_SIZE, blank=False, null=False)
-    owner = models.ForeignKey(Institution, on_delete=models.CASCADE)
+    owner = models.ForeignKey(User, on_delete=models.CASCADE)
-    user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True)
 
     def __str__(self):
         return self.name
@@ -32,8 +31,7 @@ class Lot(models.Model):
     code = models.CharField(max_length=STR_SIZE, blank=True, null=True)
     description = models.CharField(max_length=STR_SIZE, blank=True, null=True)
     closed = models.BooleanField(default=True)
-    owner = models.ForeignKey(Institution, on_delete=models.CASCADE)
+    owner = models.ForeignKey(User, on_delete=models.CASCADE)
-    user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True)
     type = models.ForeignKey(LotTag, on_delete=models.CASCADE)
 
     def add(self, v):
@@ -54,8 +52,7 @@ class LotAnnotation(models.Model):
 
     created = models.DateTimeField(auto_now_add=True)
     lot  = models.ForeignKey(Lot, on_delete=models.CASCADE)
-    owner = models.ForeignKey(Institution, on_delete=models.CASCADE)
+    owner = models.ForeignKey(User, on_delete=models.CASCADE)
-    user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True)
     type =  models.SmallIntegerField(choices=Type) 
     key = models.CharField(max_length=STR_EXTEND_SIZE)
     value = models.CharField(max_length=STR_EXTEND_SIZE)

lot/views.py

@@ -28,8 +28,7 @@ class NewLotView(DashboardView, CreateView):
     )
 
     def form_valid(self, form):
-        form.instance.owner = self.request.user.institution
+        form.instance.owner = self.request.user
-        form.instance.user = self.request.user
         response = super().form_valid(form)
         return response
 
@@ -69,11 +68,7 @@ class EditLotView(DashboardView, UpdateView):
 
     def get_form_kwargs(self):
         pk = self.kwargs.get('pk')
-        self.object = get_object_or_404(
+        self.object = get_object_or_404(self.model, pk=pk)
-            self.model,
-            owner=self.request.user.institution,
-            pk=pk,
-        )
         # self.success_url = reverse_lazy('dashbiard:lot', args=[pk])
         kwargs = super().get_form_kwargs()
         return kwargs
@@ -88,8 +83,8 @@ class AddToLotView(DashboardView, FormView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        lots = Lot.objects.filter(owner=self.request.user.institution)
+        lots = Lot.objects.filter(owner=self.request.user)
-        lot_tags = LotTag.objects.filter(owner=self.request.user.institution)
+        lot_tags = LotTag.objects.filter(owner=self.request.user)
         context.update({
             'lots': lots,
             'lot_tags':lot_tags,
@@ -98,7 +93,7 @@ class AddToLotView(DashboardView, FormView):
 
     def get_form(self):
         form = super().get_form()
-        form.fields["lots"].queryset = Lot.objects.filter(owner=self.request.user.institution)
+        form.fields["lots"].queryset = Lot.objects.filter(owner=self.request.user)
         return form
 
     def form_valid(self, form):
@@ -128,10 +123,10 @@ class LotsTagsView(DashboardView, TemplateView):
     def get_context_data(self, **kwargs):
         self.pk = kwargs.get('pk')
         context = super().get_context_data(**kwargs)
-        tag = get_object_or_404(LotTag, owner=self.request.user.institution, id=self.pk)
+        tag = get_object_or_404(LotTag, owner=self.request.user, id=self.pk)
         self.title += " {}".format(tag.name)
         self.breadcrumb += " {}".format(tag.name)
-        lots = Lot.objects.filter(owner=self.request.user.institution).filter(type=tag)
+        lots = Lot.objects.filter(owner=self.request.user).filter(type=tag)
         context.update({
             'lots': lots,
             'title': self.title,
@@ -149,8 +144,7 @@ class LotAddDocumentView(DashboardView, CreateView):
     fields = ("key", "value")
 
     def form_valid(self, form):
-        form.instance.owner = self.request.user.institution
+        form.instance.owner = self.request.user
-        form.instance.user = self.request.user
         form.instance.lot = self.lot
         form.instance.type = LotAnnotation.Type.DOCUMENT
         response = super().form_valid(form)
@@ -158,7 +152,7 @@ class LotAddDocumentView(DashboardView, CreateView):
 
     def get_form_kwargs(self):
         pk = self.kwargs.get('pk')
-        self.lot = get_object_or_404(Lot, pk=pk, owner=self.request.user.institution)
+        self.lot = get_object_or_404(Lot, pk=pk, owner=self.request.user)
         self.success_url = reverse_lazy('lot:documents', args=[pk])
         kwargs = super().get_form_kwargs()
         return kwargs
@@ -172,10 +166,10 @@ class LotDocumentsView(DashboardView, TemplateView):
     def get_context_data(self, **kwargs):
         self.pk = kwargs.get('pk')
         context = super().get_context_data(**kwargs)
-        lot = get_object_or_404(Lot, owner=self.request.user.institution, id=self.pk)
+        lot = get_object_or_404(Lot, owner=self.request.user, id=self.pk)
         documents = LotAnnotation.objects.filter(
             lot=lot,
-            owner=self.request.user.institution,
+            owner=self.request.user,
             type=LotAnnotation.Type.DOCUMENT,
         )
         context.update({
@@ -195,10 +189,10 @@ class LotAnnotationsView(DashboardView, TemplateView):
     def get_context_data(self, **kwargs):
         self.pk = kwargs.get('pk')
         context = super().get_context_data(**kwargs)
-        lot = get_object_or_404(Lot, owner=self.request.user.institution, id=self.pk)
+        lot = get_object_or_404(Lot, owner=self.request.user, id=self.pk)
         annotations = LotAnnotation.objects.filter(
             lot=lot,
-            owner=self.request.user.institution,
+            owner=self.request.user,
             type=LotAnnotation.Type.USER,
         )
         context.update({
@@ -219,8 +213,7 @@ class LotAddAnnotationView(DashboardView, CreateView):
     fields = ("key", "value")
 
     def form_valid(self, form):
-        form.instance.owner = self.request.user.institution
+        form.instance.owner = self.request.user
-        form.instance.user = self.request.user
         form.instance.lot = self.lot
         form.instance.type = LotAnnotation.Type.USER
         response = super().form_valid(form)
@@ -228,7 +221,7 @@ class LotAddAnnotationView(DashboardView, CreateView):
 
     def get_form_kwargs(self):
         pk = self.kwargs.get('pk')
-        self.lot = get_object_or_404(Lot, pk=pk, owner=self.request.user.institution)
+        self.lot = get_object_or_404(Lot, pk=pk, owner=self.request.user)
         self.success_url = reverse_lazy('lot:annotations', args=[pk])
         kwargs = super().get_form_kwargs()
         return kwargs

user/management/commands/add_user.py

@@ -43,6 +43,5 @@ class Command(BaseCommand):
         for tag in tags:
             LotTag.objects.create(
                 name=tag,
-                owner=self.u.institution,
+                owner=self.u
-                user=self.u
             )

utils/device.py

@@ -87,4 +87,4 @@ def create_index(doc, user):
     
     _uuid = doc['uuid']
     ev = json.dumps(doc)
-    index(user.institution, _uuid, ev)
+    index(user, _uuid, ev)