Skip to content

Commit 615d201

Browse files
committed
refactor: Remove unused access decorators, permission classes, utility files, and update time formatting.
1 parent 26d8b26 commit 615d201

File tree

21 files changed

+120
-1970
lines changed

21 files changed

+120
-1970
lines changed

backend/accounts/models.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,6 @@ class Meta:
8484
def __str__(self):
8585
return f"{self.name}"
8686

87-
def get_complete_address(self):
88-
"""Concatenates complete address."""
89-
address_parts = [
90-
self.address_line,
91-
self.city,
92-
self.state,
93-
self.postcode,
94-
self.get_country_display() if self.country else None,
95-
]
96-
return ", ".join(part for part in address_parts if part)
97-
9887

9988
class AccountEmail(BaseModel):
10089
from_account = models.ForeignKey(

backend/accounts/tasks.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
from datetime import datetime
2-
3-
import pytz
41
from celery import Celery
52
from django.conf import settings
63
from django.core.mail import EmailMessage
@@ -10,7 +7,6 @@
107
from accounts.models import Account, AccountEmail, AccountEmailLog
118
from common.models import Profile
129
from common.tasks import set_rls_context
13-
from common.utils import convert_to_custom_timezone
1410

1511
app = Celery("redis://")
1612

@@ -91,22 +87,3 @@ def send_email_to_assigned_user(recipients, account_id, org_id):
9187
msg.send()
9288

9389

94-
@app.task
95-
def send_scheduled_emails(org_id):
96-
set_rls_context(org_id)
97-
email_objs = AccountEmail.objects.filter(scheduled_later=True, org_id=org_id)
98-
for each in email_objs:
99-
scheduled_date_time = each.scheduled_date_time
100-
101-
sent_time = datetime.now().strftime("%Y-%m-%d %H:%M")
102-
sent_time = datetime.strptime(sent_time, "%Y-%m-%d %H:%M")
103-
local_tz = pytz.timezone(settings.TIME_ZONE)
104-
sent_time = local_tz.localize(sent_time)
105-
sent_time = convert_to_custom_timezone(sent_time, each.timezone, to_utc=True)
106-
107-
if (
108-
str(each.scheduled_date_time.date()) == str(sent_time.date())
109-
and str(scheduled_date_time.hour) == str(sent_time.hour)
110-
and str(scheduled_date_time.minute) == str(sent_time.minute)
111-
):
112-
send_email.delay(each.id, org_id)
Lines changed: 2 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,2 @@
1-
from django.contrib.auth.mixins import AccessMixin
2-
from django.core.exceptions import PermissionDenied
3-
4-
5-
def sales_access_required(function):
6-
"""this function is a decorator used to authorize if a user has sales access"""
7-
8-
def wrap(request, *args, **kwargs):
9-
if (
10-
request.user.role == "ADMIN"
11-
or request.user.is_superuser
12-
or request.user.has_sales_access
13-
):
14-
return function(request, *args, **kwargs)
15-
raise PermissionDenied
16-
17-
return wrap
18-
19-
20-
def marketing_access_required(function):
21-
"""this function is a decorator used to authorize if a user has marketing access"""
22-
23-
def wrap(request, *args, **kwargs):
24-
if (
25-
request.user.role == "ADMIN"
26-
or request.user.is_superuser
27-
or request.user.has_marketing_access
28-
):
29-
return function(request, *args, **kwargs)
30-
raise PermissionDenied
31-
32-
return wrap
33-
34-
35-
class SalesAccessRequiredMixin(AccessMixin):
36-
"""Mixin used to authorize if a user has sales access"""
37-
38-
def dispatch(self, request, *args, **kwargs):
39-
if not request.user.is_authenticated:
40-
return self.handle_no_permission()
41-
self.raise_exception = True
42-
if (
43-
request.user.role == "ADMIN"
44-
or request.user.is_superuser
45-
or request.user.has_sales_access
46-
):
47-
return super().dispatch(request, *args, **kwargs)
48-
return self.handle_no_permission()
49-
50-
51-
class MarketingAccessRequiredMixin(AccessMixin):
52-
"""Mixin used to authorize if a user has marketing access"""
53-
54-
def dispatch(self, request, *args, **kwargs):
55-
if not request.user.is_authenticated:
56-
return self.handle_no_permission()
57-
self.raise_exception = True
58-
if (
59-
request.user.role == "ADMIN"
60-
or request.user.is_superuser
61-
or request.user.has_marketing_access
62-
):
63-
return super().dispatch(request, *args, **kwargs)
64-
return self.handle_no_permission()
65-
66-
67-
def admin_login_required(function):
68-
"""this function is a decorator used to authorize if a user is admin"""
69-
70-
def wrap(request, *args, **kwargs):
71-
if request.user.role == "ADMIN" or request.user.is_superuser:
72-
return function(request, *args, **kwargs)
73-
raise PermissionDenied
74-
75-
return wrap
1+
# This file previously contained unused access decorators and mixins.
2+
# They have been removed as they were not used anywhere in the codebase.

0 commit comments

Comments
 (0)