new release

This commit is contained in:
Ashwin 2022-02-02 20:47:29 +05:30
parent 5faf22acb3
commit 27c74e4865
9 changed files with 226 additions and 80 deletions

View file

@ -0,0 +1,69 @@
# Generated by Django 3.2.8 on 2022-01-20 07:48
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('common', '0037_alter_profile_org'),
]
operations = [
migrations.RemoveField(
model_name='google',
name='profile',
),
migrations.AddField(
model_name='google',
name='user',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='google_user', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='google',
name='dob',
field=models.CharField(default='', max_length=50),
),
migrations.AlterField(
model_name='google',
name='email',
field=models.CharField(db_index=True, default='', max_length=200),
),
migrations.AlterField(
model_name='google',
name='family_name',
field=models.CharField(default='', max_length=200),
),
migrations.AlterField(
model_name='google',
name='gender',
field=models.CharField(default='', max_length=10),
),
migrations.AlterField(
model_name='google',
name='given_name',
field=models.CharField(default='', max_length=200),
),
migrations.AlterField(
model_name='google',
name='google_id',
field=models.CharField(default='', max_length=200),
),
migrations.AlterField(
model_name='google',
name='google_url',
field=models.TextField(default=''),
),
migrations.AlterField(
model_name='google',
name='name',
field=models.CharField(default='', max_length=200),
),
migrations.AlterField(
model_name='google',
name='verified_email',
field=models.CharField(default='', max_length=200),
),
]

File diff suppressed because one or more lines are too long

View file

@ -28,17 +28,15 @@ def img_url(self, filename):
class Address(models.Model):
address_line = models.CharField(
_("Address"), max_length=255, blank=True, null=True
_("Address"), max_length=255, blank=True, default=""
)
street = models.CharField(
_("Street"), max_length=55, blank=True, null=True)
city = models.CharField(_("City"), max_length=255, blank=True, null=True)
state = models.CharField(_("State"), max_length=255, blank=True, null=True)
street = models.CharField(_("Street"), max_length=55, blank=True, default="")
city = models.CharField(_("City"), max_length=255, blank=True, default="")
state = models.CharField(_("State"), max_length=255, blank=True, default="")
postcode = models.CharField(
_("Post/Zip-code"), max_length=64, blank=True, null=True
_("Post/Zip-code"), max_length=64, blank=True, default=""
)
country = models.CharField(
max_length=3, choices=COUNTRIES, blank=True, null=True)
country = models.CharField(max_length=3, choices=COUNTRIES, blank=True, default="")
def __str__(self):
return self.city if self.city else ""
@ -79,8 +77,7 @@ class Org(models.Model):
name = models.CharField(max_length=100, blank=True, null=True)
address = models.TextField(blank=True, null=True)
user_limit = models.IntegerField(default=5)
country = models.CharField(
max_length=3, choices=COUNTRIES, blank=True, null=True)
country = models.CharField(max_length=3, choices=COUNTRIES, blank=True, null=True)
class User(AbstractBaseUser, PermissionsMixin):
@ -100,7 +97,7 @@ class User(AbstractBaseUser, PermissionsMixin):
description = models.TextField(blank=True, null=True)
USERNAME_FIELD = "email"
REQUIRED_FIELDS = ['username']
REQUIRED_FIELDS = ["username"]
objects = UserManager()
@ -134,7 +131,8 @@ class User(AbstractBaseUser, PermissionsMixin):
class Profile(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE)
org = models.ForeignKey(
Org, null=True, on_delete=models.CASCADE, blank=True)
Org, null=True, on_delete=models.CASCADE, blank=True, related_name="user_org"
)
phone = PhoneNumberField(null=True, unique=True)
alternate_phone = PhoneNumberField(null=True)
address = models.ForeignKey(
@ -157,7 +155,7 @@ class Profile(models.Model):
unique_together = (("user", "org"),)
def save(self, *args, **kwargs):
""" by default the expiration time is set to 2 hours """
"""by default the expiration time is set to 2 hours"""
self.key_expires = timezone.now() + datetime.timedelta(hours=2)
super().save(*args, **kwargs)
@ -251,7 +249,8 @@ class Comment_Files(models.Model):
comment = models.ForeignKey(Comment, on_delete=models.CASCADE)
updated_on = models.DateTimeField(auto_now_add=True)
comment_file = models.FileField(
"File", upload_to="comment_files", null=True)
"File", upload_to="comment_files", null=True, blank=True
)
def get_file_name(self):
if self.comment_file:
@ -270,8 +269,7 @@ class Attachments(models.Model):
)
file_name = models.CharField(max_length=60)
created_on = models.DateTimeField(_("Created on"), auto_now_add=True)
attachment = models.FileField(
max_length=1001, upload_to="attachments/%Y/%m/")
attachment = models.FileField(max_length=1001, upload_to="attachments/%Y/%m/")
lead = models.ForeignKey(
"leads.Lead",
null=True,
@ -386,12 +384,14 @@ class Document(models.Model):
status = models.CharField(
choices=DOCUMENT_STATUS_CHOICE, max_length=64, default="active"
)
shared_to = models.ManyToManyField(
Profile, related_name="document_shared_to")
teams = models.ManyToManyField(
"teams.Teams", related_name="document_teams")
shared_to = models.ManyToManyField(Profile, related_name="document_shared_to")
teams = models.ManyToManyField("teams.Teams", related_name="document_teams")
org = models.ForeignKey(
Org, on_delete=models.SET_NULL, null=True, blank=True
Org,
on_delete=models.SET_NULL,
null=True,
blank=True,
related_name="document_org",
)
class Meta:
@ -456,7 +456,8 @@ class APISettings(models.Model):
apikey = models.CharField(max_length=16, blank=True)
website = models.URLField(max_length=255, null=True)
lead_assigned_to = models.ManyToManyField(
Profile, related_name="lead_assignee_users")
Profile, related_name="lead_assignee_users"
)
tags = models.ManyToManyField("accounts.Tags", blank=True)
created_by = models.ForeignKey(
Profile,
@ -466,7 +467,12 @@ class APISettings(models.Model):
blank=True,
)
org = models.ForeignKey(
Org, blank=True, on_delete=models.SET_NULL, null=True)
Org,
blank=True,
on_delete=models.SET_NULL,
null=True,
related_name="org_api_settings",
)
created_on = models.DateTimeField(auto_now_add=True)
class Meta:
@ -482,17 +488,18 @@ class APISettings(models.Model):
class Google(models.Model):
profile = models.ForeignKey(
Profile, related_name="google", null=True, on_delete=models.CASCADE)
google_id = models.CharField(max_length=200, null=True)
google_url = models.TextField(null=True)
verified_email = models.CharField(max_length=200, null=True)
family_name = models.CharField(max_length=200, null=True)
name = models.CharField(max_length=200, null=True)
gender = models.CharField(max_length=10, null=True)
dob = models.CharField(max_length=50, null=True)
given_name = models.CharField(max_length=200, null=True)
email = models.CharField(max_length=200, null=True, db_index=True)
user = models.ForeignKey(
User, related_name="google_user", on_delete=models.CASCADE, null=True
)
google_id = models.CharField(max_length=200, default="")
google_url = models.TextField(default="")
verified_email = models.CharField(max_length=200, default="")
family_name = models.CharField(max_length=200, default="")
name = models.CharField(max_length=200, default="")
gender = models.CharField(max_length=10, default="")
dob = models.CharField(max_length=50, default="")
given_name = models.CharField(max_length=200, default="")
email = models.CharField(max_length=200, default="", db_index=True)
def __str__(self):
return self.email

View file

@ -19,8 +19,8 @@ app = Celery("redis://")
def send_email_to_new_user(
profile_id, org_id
):
""" Send Mail To Users When their account is created """
profile_obj = Profile.objects.filter(id=profile_id, org_id=org_id).last()
user_obj = profile_obj.user

View file

@ -196,6 +196,7 @@ class UserDetailView(APIView):
return Response({"status": "success"}, status=status.HTTP_200_OK)
class ChangePasswordView(APIView):
authentication_classes = (JSONWebTokenAuthentication,)
permission_classes = (IsAuthenticated,)
@ -969,9 +970,6 @@ class DomainDetailView(APIView):
authentication_classes = (JSONWebTokenAuthentication,)
permission_classes = (IsAuthenticated,)
def get_object(self, pk):
return self.model.objects.get(pk=pk)
@swagger_auto_schema(
tags=["Settings"], manual_parameters=swagger_params.organization_params
)

View file

@ -177,7 +177,7 @@ class ContactDetailView(APIView):
status=status.HTTP_403_FORBIDDEN
)
contact_serializer = CreateContactSerializer(
data=params, instance=contact_obj, request_obj=request, contact=True
data=params, instance=contact_obj, request_obj=request
)
address_serializer = BillingAddressSerializer(
data=params, instance=address_obj)
@ -206,6 +206,7 @@ class ContactDetailView(APIView):
},
status=status.HTTP_403_FORBIDDEN,
)
address_obj = address_serializer.save()
contact_obj = contact_serializer.save(
date_of_birth=params.get("date_of_birth")
@ -299,7 +300,7 @@ class ContactDetailView(APIView):
{"username": contact_obj.created_by.user.username}]
else:
users_mention = list(
contact_obj.assigned_to.all().values("username"))
contact_obj.assigned_to.all().values("user__username"))
if request.profile == contact_obj.created_by:
user_assgn_list.append(self.request.profile.id)

View file

@ -32,9 +32,9 @@ lead_create_post_params = [
openapi.Parameter(
"title", openapi.IN_QUERY, required=True, type=openapi.TYPE_STRING
),
openapi.Parameter("first_name", openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter("first_name", openapi.IN_QUERY,required=True, type=openapi.TYPE_STRING),
openapi.Parameter("last_name", openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter("account_name", openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter("account_name", openapi.IN_QUERY,type=openapi.TYPE_STRING),
openapi.Parameter("phone", openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter("email", openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter(
@ -42,6 +42,7 @@ lead_create_post_params = [
openapi.IN_QUERY,
type=openapi.TYPE_FILE,
),
openapi.Parameter("opportunity_amount",openapi.IN_QUERY,required=True, type=openapi.TYPE_STRING),
openapi.Parameter("website", openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter("description", openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter("teams", openapi.IN_QUERY, type=openapi.TYPE_STRING),
@ -49,7 +50,7 @@ lead_create_post_params = [
openapi.Parameter("contacts", openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter("status", openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter("source", openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter("address_line", openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter("address_line", openapi.IN_QUERY,required=True, type=openapi.TYPE_STRING),
openapi.Parameter("street", openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter("city", openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter("state", openapi.IN_QUERY, type=openapi.TYPE_STRING),

View file

@ -123,7 +123,12 @@ class LeadListView(APIView, LimitOffsetPagination):
"close_leads": close_leads,
"offset": offset
}
contacts = Contact.objects.filter(org=self.request.org).values(
"id",
"first_name"
)
context["contacts"] = contacts
context["status"] = LEAD_STATUS
context["source"] = LEAD_SOURCE
context["companies"] = CompanySerializer(

View file

@ -1,47 +1,48 @@
arrow==1.2.0
django==3.2.11
arrow==1.2.1
black==20.8b1
boto==2.49.0
boto3==1.18.52
CacheControl==0.12.6
celery==5.1.2
boto3==1.20.37
# CacheControl==0.12.10
celery==5.2.3
codacy-coverage==1.3.11
contextlib2==21.6.0
coverage==6.0
cssselect==1.1.0
distlib==0.3.3
distro==1.6.0
django-cors-headers==3.10.0
django-phonenumber-field==5.2.0
django-ses==2.3.0
# contextlib2==21.6.0
coverage==6.2
# cssselect==1.1.0
# distlib==0.3.3
# distro==1.6.0
django-cors-headers==3.11.0
django-phonenumber-field==6.0.0
django-ses==2.3.1
django-settings-export==1.2.1
django-storages==1.11.1
django-storages==1.12.3
# docker==5.0.2
djangorestframework==3.12.2
djangorestframework-jwt==1.11.0
docker==5.0.2
drf-compound-fields==2.0.0
drf-yasg==1.20.0
html5lib==1.1
importlib-metadata==4.8.1
ipaddr==2.2.0
lockfile==0.12.2
lxml==4.6.3
# importlib-metadata==4.10.1
# ipaddr==2.2.0
# lockfile==0.12.2
# lxml==4.7.1
openpyxl==3.0.9
pdfkit==0.6.1
phonenumbers==8.12.33
Pillow==8.3.2
pip-check==2.6
pipdeptree==2.1.0
progress==1.6
psycopg2==2.8.6
pytest-django==4.4.0
python-dotenv==0.19.0
python-memcached==1.59
pdfkit==1.0.0
phonenumbers==8.12.41
# Pillow==9.0.0
pip-check==2.7
pipdeptree==2.2.1
# progress==1.6
psycopg2-binary==2.9.3
pytest-django==4.5.2
python-dotenv==0.19.2
# python-memcached==1.59
pytoml==0.1.21
redis==3.5.3
retrying==1.3.3
sentry-sdk==1.4.3
setuptools==58.2.0
uWSGI==2.0.19.1
wheel==0.37.0
redis==4.1.1
# retrying==1.3.3
sentry-sdk==1.5.2
# setuptools==60.5.0
# uWSGI==2.0.20
# wheel==0.37.1
whitenoise==5.3.0
xlrd==2.0.1
xlwt==1.3.0
xlwt==1.3.0