From afa8edb9949a0f0258a18cf67db2056e54b41dc5 Mon Sep 17 00:00:00 2001
From: ismail <ismail.mosa.ibrahim@gmail.com>
Date: Wed, 2 Jul 2025 15:19:05 +0300
Subject: [PATCH] fix the group user count qs

---
 .gitignore           |  2 +-
 inventory/models.py  |  2 +-
 inventory/signals.py | 11 +++++++++++
 inventory/views.py   |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 195cc59e..450418e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,7 @@ Makefile
 .idea/**/dynamic.xml
 .idea/**/uiDesigner.xml
 .idea/**/dbnavigator.xml
-**/migrations/
+**/migrations/**
 
 # Gradle
 .idea/**/gradle.xml
diff --git a/inventory/models.py b/inventory/models.py
index e8da8f43..c9bd3525 100644
--- a/inventory/models.py
+++ b/inventory/models.py
@@ -2518,7 +2518,7 @@ class CustomGroup(models.Model):
 
     @property
     def users(self):
-        return self.group.user_set.all()
+        return self.group.user_set.exclude(email=self.dealer.user.email).all()
 
     @property
     def permissions(self):
diff --git a/inventory/signals.py b/inventory/signals.py
index a2fd44e8..ac0da1a3 100644
--- a/inventory/signals.py
+++ b/inventory/signals.py
@@ -984,6 +984,17 @@ def lead_created_notification(sender, instance, created, **kwargs):
             <a href="{reverse('lead_detail',kwargs={'dealer_slug':instance.dealer.slug,'slug':instance.slug})}" target="_blank">View</a>
             """,
         )
+@receiver(post_save, sender=models.Lead)
+def estimate__notification(sender, instance, created, **kwargs):
+    if created:
+        models.Notification.objects.create(
+            user=instance.staff.user,
+            message=f"""
+            New Lead has been added.
+            <a href="{reverse('lead_detail',kwargs={'dealer_slug':instance.dealer.slug,'slug':instance.slug})}" target="_blank">View</a>
+            """,
+        )
+
 # @receiver(post_save, sender=models.Lead)
 # def lead_created_notification(sender, instance, created, **kwargs):
 #     if created:
diff --git a/inventory/views.py b/inventory/views.py
index 3275f7a5..c8abb885 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -2610,7 +2610,7 @@ class GroupListView(LoginRequiredMixin, ListView):
     template_name = "groups/group_list.html"
 
     def get_queryset(self):
-        dealer = get_user_type(self.request)
+        dealer = get_object_or_404(models.Dealer,slug=self.kwargs["dealer_slug"])
         return dealer.groups.all()