From 35620936ac57be6333fe2a0b12e485ee3bf9d34c Mon Sep 17 00:00:00 2001
From: Eberton Kociba <ebertonkociba@gmail.com>
Date: Thu, 28 May 2026 23:24:47 -0300
Subject: [PATCH] Fix FarmSelect
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Corrigido a forma como o sistema busca as informações de Animais e Piquetes para exibir na tela de seleção de Fazenda
---
 multigranja/apps/entities/services/user.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/multigranja/apps/entities/services/user.py b/multigranja/apps/entities/services/user.py
index 3d36a07..6885e27 100644
--- a/multigranja/apps/entities/services/user.py
+++ b/multigranja/apps/entities/services/user.py
@@ -1,6 +1,6 @@
 from django.shortcuts import redirect
 from django.contrib.auth import authenticate, login, logout
-from django.db.models import Count
+from django.db.models import Count, Q
 
 from ..forms import UserLoginForm
 
@@ -48,8 +48,16 @@ def farm_select(request):
 
     farms_query = request.user.farms.filter(is_active=True)
     farms_with_counts = farms_query.annotate(
-        total_animals=Count('animals'),
-        total_paddocks=Count('paddocks')
+        total_animals=Count(
+            'animals',
+            filter=Q(animals__is_active=True),
+            distinct=True
+        ),
+        total_paddocks=Count(
+            'paddocks',
+            filter=Q(paddocks__is_active=True),
+            distinct=True
+        )
     )
 
     context = {