Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Dépôt de besoin] Ajouter une stat du nombre de structures qui ont cliqué OU vu #927

Merged
merged 3 commits into from
Oct 2, 2023
Merged

[Dépôt de besoin] Ajouter une stat du nombre de structures qui ont cliqué OU vu #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6eefd26
Tender: add stat siae_email_link_click_or_detail_display_count
raphodn Sep 28, 2023
6580c84
Update detail template
raphodn Sep 28, 2023
04d5a6c
Fix re-add property
raphodn Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lemarche/templates/tenders/detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</a>
<a href="{% url 'tenders:detail-siae-list' tender.slug "VIEWED" %}" id="show-tender-siae-list-from-detail-btn" class="btn btn-primary mb-3">
<i class="ri-focus-2-line"></i>
{{ tender.siae_detail_display_date_count_all }} prestataire{{ tender.siae_email_send_date_count|pluralize }} qui {{ tender.siae_email_send_date_count|pluralize:'a,ont' }} vu
{{ tender.siae_email_link_click_date_or_detail_display_date_count }} prestataire{{ tender.siae_email_link_click_date_or_detail_display_date_count|pluralize }} qui {{ tender.siae_email_link_click_date_or_detail_display_date_count|pluralize:'a,ont' }} vu
</a>
<a href="{% url 'tenders:detail-siae-list' tender.slug "INTERESTED" %}" id="show-tender-siae-interested-list-from-detail-btn" class="btn btn-primary mb-3">
<i class="ri-thumb-up-line"></i>
Expand All @@ -113,11 +113,11 @@
{% endif %}
{% else %}
{% if not tender.deadline_date_outdated %}
{% if tender.siae_detail_display_date_count_all > 0 %}
{% if tender.siae_email_link_click_date_or_detail_display_date_count > 0 %}
<div class="alert alert-warning mt-3 mt-lg-0" role="alert">
<p class="mb-0 fs-sm">
Déjà {{ tender.siae_detail_display_date_count_all }} prestataire{{ tender.siae_detail_display_date_count_all|pluralize }} inclusif{{ tender.siae_detail_display_date_count_all|pluralize }}
{{ tender.siae_detail_display_date_count_all|pluralize:"a,ont" }} vu le besoin de ce client.
Déjà {{ tender.siae_email_link_click_date_or_detail_display_date_count }} prestataire{{ tender.siae_email_link_click_date_or_detail_display_date_count|pluralize }} inclusif{{ tender.siae_email_link_click_date_or_detail_display_date_count|pluralize }}
{{ tender.siae_email_link_click_date_or_detail_display_date_count|pluralize:"a,ont" }} vu le besoin de ce client.
</p>
</div>
{% endif %}
Expand Down
17 changes: 17 additions & 0 deletions lemarche/tenders/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ class TenderAdmin(FieldsetsInlineMixin, admin.ModelAdmin):
# "siae_email_send_count_with_link",
"siae_email_link_click_count_with_link",
"siae_detail_display_count_with_link",
# "siae_email_link_click_or_detail_display_count_with_link",
"siae_detail_contact_click_count_with_link",
"siae_transactioned",
"created_at",
Expand Down Expand Up @@ -176,6 +177,7 @@ class TenderAdmin(FieldsetsInlineMixin, admin.ModelAdmin):
"siae_email_send_count_with_link",
"siae_email_link_click_count_with_link",
"siae_detail_display_count_with_link",
"siae_email_link_click_or_detail_display_count_with_link",
"siae_detail_contact_click_count_with_link",
"logs_display",
"extra_data_display",
Expand Down Expand Up @@ -281,6 +283,7 @@ class TenderAdmin(FieldsetsInlineMixin, admin.ModelAdmin):
"siae_email_send_count_with_link",
"siae_email_link_click_count_with_link",
"siae_detail_display_count_with_link",
"siae_email_link_click_or_detail_display_count_with_link",
"siae_detail_contact_click_count_with_link",
)
},
Expand Down Expand Up @@ -446,6 +449,20 @@ def siae_detail_display_count_with_link(self, tender):
siae_detail_display_count_with_link.short_description = "S. vues"
siae_detail_display_count_with_link.admin_order_field = "siae_detail_display_count"

def siae_email_link_click_or_detail_display_count_with_link(self, tender):
url = (
reverse("admin:siaes_siae_changelist")
+ f"?tenders__in={tender.id}&tendersiae__detail_display_date__isnull=False"
)
return format_html(
f'<a href="{url}">{getattr(tender, "siae_email_link_click_or_detail_display_count", 0)}</a>'
)

siae_email_link_click_or_detail_display_count_with_link.short_description = "S. cliquées ou vues"
siae_email_link_click_or_detail_display_count_with_link.admin_order_field = (
"siae_email_link_click_or_detail_display_count"
)

def siae_detail_contact_click_count_with_link(self, tender):
url = (
reverse("admin:siaes_siae_changelist")
Expand Down
28 changes: 17 additions & 11 deletions lemarche/tenders/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,17 @@ def with_siae_stats(self):
When(tendersiae__detail_display_date__isnull=False, then=1), default=0, output_field=IntegerField()
)
),
siae_email_link_click_or_detail_display_count=Sum(
Case(
When(
Q(tendersiae__detail_display_date__isnull=False)
| Q(tendersiae__detail_display_date__isnull=False),
then=1,
),
default=0,
output_field=IntegerField(),
)
),
siae_detail_contact_click_count=Sum(
Case(
When(tendersiae__detail_contact_click_date__isnull=False, then=1),
Expand Down Expand Up @@ -555,21 +566,16 @@ def hubspot_deal_id(self):
def siae_detail_display_date_count(self):
return self.tendersiae_set.filter(detail_display_date__isnull=False).count()

@property
def siae_detail_display_date_count_all(self):
"""
Return all siae that have seen the tender (via e-mail or link or both)
"""
return (
self.tendersiae_set.filter(Q(email_link_click_date__isnull=False) | Q(detail_display_date__isnull=False))
.distinct()
.count()
)

@property
def siae_email_send_date_count(self):
return self.tendersiae_set.filter(email_send_date__isnull=False).count()

@property
def siae_email_link_click_date_or_detail_display_date_count(self):
return self.tendersiae_set.filter(
Q(email_link_click_date__isnull=False) | Q(detail_display_date__isnull=False)
).count()

@property
def siae_detail_contact_click_date_count(self):
return self.tendersiae_set.filter(detail_contact_click_date__isnull=False).count()
Expand Down
4 changes: 4 additions & 0 deletions lemarche/tenders/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,20 +310,23 @@ def test_with_siae_stats_queryset(self):
self.assertEqual(tender_with_siae_1.siae_email_send_count, 4)
self.assertEqual(tender_with_siae_1.siae_email_link_click_count, 3)
self.assertEqual(tender_with_siae_1.siae_detail_display_count, 2)
self.assertEqual(tender_with_siae_1.siae_email_link_click_or_detail_display_count, 2)
self.assertEqual(tender_with_siae_1.siae_detail_contact_click_count, 1)
self.assertEqual(tender_with_siae_1.siae_detail_contact_click_since_last_seen_date_count, 1)
tender_with_siae_2 = Tender.objects.with_siae_stats().filter(id=self.tender_with_siae_2.id).first()
self.assertEqual(tender_with_siae_2.siaes.count(), 1)
self.assertEqual(tender_with_siae_2.siae_count, 1)
self.assertEqual(tender_with_siae_2.siae_email_send_count, 1)
self.assertEqual(tender_with_siae_2.siae_detail_display_count, 1)
self.assertEqual(tender_with_siae_2.siae_email_link_click_or_detail_display_count, 1)
self.assertEqual(tender_with_siae_2.siae_detail_contact_click_count, 1)
self.assertEqual(tender_with_siae_2.siae_detail_contact_click_since_last_seen_date_count, 1)
tender_without_siae = Tender.objects.with_siae_stats().filter(id=self.tender_without_siae.id).first()
self.assertEqual(tender_without_siae.siaes.count(), 0)
self.assertEqual(tender_without_siae.siae_count, 0)
self.assertEqual(tender_without_siae.siae_email_send_count, 0)
self.assertEqual(tender_without_siae.siae_detail_display_count, 0)
self.assertEqual(tender_without_siae.siae_email_link_click_or_detail_display_count, 0)
self.assertEqual(tender_without_siae.siae_detail_contact_click_count, 0)
self.assertEqual(tender_without_siae.siae_detail_contact_click_since_last_seen_date_count, 0)

Expand Down Expand Up @@ -367,6 +370,7 @@ def test_with_deadline_date_is_outdated_queryset(self):
# self.assertEqual(tender_with_siae_1.siae_email_send_count, 4)
# self.assertEqual(tender_with_siae_1.siae_email_link_click_count, 3)
# self.assertEqual(tender_with_siae_1.siae_detail_display_count, 2)
# self.assertEqual(tender_with_siae_1.siae_email_link_click_or_detail_display_count, 2)
# self.assertEqual(tender_with_siae_1.siae_detail_contact_click_count, 1)
# self.assertEqual(tender_with_siae_1.siae_detail_contact_click_since_last_seen_date_count, 1)

Expand Down
4 changes: 2 additions & 2 deletions lemarche/www/tenders/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,10 +613,10 @@ def test_update_tendersiae_stats_on_tender_view(self):
self.tender_1.siaes.add(self.siae_2)
self.assertEqual(self.tender_1.tendersiae_set.count(), 1 + 1)
self.assertEqual(self.tender_1.tendersiae_set.first().siae, self.siae_2)
self.assertEqual(self.tender_1.tendersiae_set.last().siae, self.siae_1)
self.assertIsNone(self.tender_1.tendersiae_set.first().email_link_click_date)
self.assertIsNone(self.tender_1.tendersiae_set.first().detail_display_date)
self.assertIsNotNone(self.tender_1.tendersiae_set.last().email_link_click_date) # siae_1
self.assertEqual(self.tender_1.tendersiae_set.last().siae, self.siae_1)
self.assertIsNotNone(self.tender_1.tendersiae_set.last().email_link_click_date)
self.assertIsNotNone(self.tender_1.tendersiae_set.last().detail_display_date)
# first load anonymous
url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug})
Expand Down