Merge pull request #514 from MicroPyramid/new_release

new release

Author: ashwin31

.runcode.yaml

@@ -18,7 +18,7 @@ onCreate:
         python manage.py migrate
 onStart:
   - |
-        . ../venv/bin/activate
+        . ../env/bin/activate
         WS_DOMAIN=`cat /home/ubuntu/runcode/ws-url-domain.txt`
         printf "\nGO TO THIS URL TO VIEW PAGE \033[4;34m https://8000-${WS_DOMAIN}\033[0;30m\n\n"
         python manage.py runserver

accounts/migrations/0003_alter_account_created_by.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.1 on 2023-10-13 08:16
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('accounts', '0002_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='account',
+            name='created_by',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By'),
+        ),
+    ]

accounts/models.py

@@ -61,9 +61,9 @@ class Account(BaseModel):
     )
     website = models.URLField(_("Website"), blank=True, null=True)
     description = models.TextField(blank=True, null=True)
-    created_by = models.ForeignKey(
-        Profile, related_name="account_created_by", on_delete=models.SET_NULL, null=True
-    )
+    # created_by = models.ForeignKey(
+    #     Profile, related_name="account_created_by", on_delete=models.SET_NULL, null=True
+    # )
     is_active = models.BooleanField(default=False)
     tags = models.ManyToManyField(Tags, blank=True)
     status = models.CharField(

accounts/serializer.py

@@ -46,7 +46,7 @@ class Meta:
             "description",
             "account_attachment",
             "created_by",
-            "created_on",
+            "created_at",
             "is_active",
             "tags",
             "status",
@@ -71,7 +71,7 @@ class Meta:
             "timezone",
             "scheduled_date_time",
             "scheduled_later",
-            "created_on",
+            "created_at",
             "from_email",
             "rendered_message_body",
         )
@@ -132,7 +132,7 @@ def __init__(self, *args, **kwargs):
         if self.instance:
             self.fields["lead"].required = False
         self.fields["lead"].required = False
-        self.org = request_obj.org
+        self.org = request_obj.profile.org
 
     def validate_name(self, name):
         if self.instance:

accounts/views.py

@@ -140,7 +140,7 @@ def post(self, request, *args, **kwargs):
         # Save Account
         if serializer.is_valid():
             account_object = serializer.save(
-                created_by=request.profile, org=request.profile.org
+                org=request.profile.org
             )
             if data.get("contacts"):
                 contacts_list = json.loads(data.get("contacts"))
@@ -171,7 +171,7 @@ def post(self, request, *args, **kwargs):
 
             if self.request.FILES.get("account_attachment"):
                 attachment = Attachments()
-                attachment.created_by = request.profile
+                attachment.created_by = request.profile.user
                 attachment.file_name = request.FILES.get("account_attachment").name
                 attachment.account = account_object
                 attachment.attachment = request.FILES.get("account_attachment")

cases/serializer.py

@@ -26,7 +26,7 @@ class Meta:
             "closed_on",
             "description",
             "created_by",
-            "created_on",
+            "created_at",
             "is_active",
             "account",
             "contacts",
@@ -43,7 +43,7 @@ class CaseCreateSerializer(serializers.ModelSerializer):
     def __init__(self, *args, **kwargs):
         request_obj = kwargs.pop("request_obj", None)
         super().__init__(*args, **kwargs)
-        self.org = request_obj.org
+        self.org = request_obj.profile.org
 
     def validate_name(self, name):
         if self.instance:
@@ -67,7 +67,7 @@ class Meta:
             "priority",
             "description",
             "created_by",
-            "created_on",
+            "created_at",
             "is_active",
             "account",
             "org",

common/serializer.py

@@ -184,6 +184,7 @@ class Meta:
 
 
 class ProfileSerializer(serializers.ModelSerializer):
+    # address = BillingAddressSerializer()
 
     class Meta:
         model = Profile
@@ -210,7 +211,7 @@ def get_file_path(self, obj):
 
     class Meta:
         model = Attachments
-        fields = ["id", "created_by", "file_name", "created_on", "file_path"]
+        fields = ["id", "created_by", "file_name", "created_at", "file_path"]
 
 
 class DocumentSerializer(serializers.ModelSerializer):
@@ -231,7 +232,7 @@ class Meta:
             "status",
             "shared_to",
             "teams",
-            "created_on",
+            "created_at",
             "created_by",
             "org",
         ]
@@ -242,7 +243,7 @@ def __init__(self, *args, **kwargs):
         request_obj = kwargs.pop("request_obj", None)
         super().__init__(*args, **kwargs)
         self.fields["title"].required = True
-        self.org = request_obj.org
+        self.org = request_obj.profile.org
 
     def validate_title(self, title):
         if self.instance:
@@ -312,7 +313,7 @@ class Meta:
             "title",
             "apikey",
             "website",
-            "created_on",
+            "created_at",
             "created_by",
             "lead_assigned_to",
             "tags",

common/views.py

@@ -434,8 +434,6 @@ class ProfileView(APIView):
     def get(self, request, format=None):
         # profile=Profile.objects.get(user=request.user)
         context = {}
-        print("I am here")
-        print(self.request.profile)
         context["user_obj"] = ProfileSerializer(self.request.profile).data
         return Response(context, status=status.HTTP_200_OK)
 

contacts/serializer.py

@@ -51,7 +51,7 @@ class Meta:
             "contact_attachment",
             "assigned_to",
             "created_by",
-            "created_on",
+            "created_at",
             "is_active",
             "teams",
             "created_on_arrow",

contacts/views.py

@@ -128,7 +128,7 @@ def post(self, request, *args, **kwargs):
 
         if request.FILES.get("contact_attachment"):
             attachment = Attachments()
-            attachment.created_by = request.profile
+            attachment.created_by = request.profile.user
             attachment.file_name = request.FILES.get("contact_attachment").name
             attachment.contact = contact_obj
             attachment.attachment = request.FILES.get("contact_attachment")
@@ -227,7 +227,7 @@ def put(self, request, pk, format=None):
             )
             if request.FILES.get("contact_attachment"):
                 attachment = Attachments()
-                attachment.created_by = request.profile
+                attachment.created_by = request.profile.user
                 attachment.file_name = request.FILES.get("contact_attachment").name
                 attachment.contact = contact_obj
                 attachment.attachment = request.FILES.get("contact_attachment")

events/serializer.py

@@ -38,7 +38,7 @@ class Meta:
             "description",
             "date_of_meeting",
             "created_by",
-            "created_on",
+            "created_at",
             "contacts",
             "teams",
             "assigned_to",
@@ -53,7 +53,7 @@ def __init__(self, *args, **kwargs):
         request_obj = kwargs.pop("request_obj", None)
         super(EventCreateSerializer, self).__init__(*args, **kwargs)
         self.fields["event_type"].required = True
-        self.org = request_obj.org
+        self.org = request_obj.profile.org
 
     def validate_name(self, name):
         if self.instance:
@@ -126,7 +126,7 @@ class Meta:
             "disabled",
             "description",
             "created_by",
-            "created_on",
+            "created_at",
             "org",
         )
 

invoices/serializer.py

@@ -30,7 +30,7 @@ class Meta:
             "phone",
             "from_address",
             "to_address",
-            "created_on",
+            "created_at",
             "created_by",
             "currency",
             "quantity",
@@ -61,7 +61,7 @@ class Meta:
             "name",
             "email",
             "phone",
-            "created_on",
+            "created_at",
             "currency",
             "quantity",
             "rate",
@@ -80,7 +80,7 @@ def __init__(self, *args, **kwargs):
         request_obj = kwargs.pop("request_obj", None)
         super(InvoiceCreateSerializer, self).__init__(*args, **kwargs)
 
-        self.org = request_obj.org
+        self.org = request_obj.profile.org
 
     def validate_invoice_title(self, invoice_title):
         if self.instance:
@@ -113,7 +113,7 @@ class Meta:
             "email",
             "phone",
             "due_date",
-            "created_on",
+            "created_at",
             "created_by",
             "currency",
             "quantity",

opportunity/serializer.py

@@ -41,7 +41,7 @@ class Meta:
             "description",
             "assigned_to",
             "created_by",
-            "created_on",
+            "created_at",
             "is_active",
             "tags",
             "opportunity_attachment",
@@ -61,7 +61,7 @@ class OpportunityCreateSerializer(serializers.ModelSerializer):
     def __init__(self, *args, **kwargs):
         request_obj = kwargs.pop("request_obj", None)
         super().__init__(*args, **kwargs)
-        self.org = request_obj.org
+        self.org = request_obj.profile.org
 
     def validate_name(self, name):
         if self.instance:
@@ -94,7 +94,7 @@ class Meta:
             "closed_on",
             "description",
             "created_by",
-            "created_on",
+            "created_at",
             "is_active",
             "created_on_arrow",
             "org"

tasks/serializer.py

@@ -28,7 +28,7 @@ class Meta:
             "due_date",
             "account",
             "created_by",
-            "created_on",
+            "created_at",
             "contacts",
             "teams",
             "assigned_to",
@@ -41,7 +41,7 @@ class TaskCreateSerializer(serializers.ModelSerializer):
     def __init__(self, *args, **kwargs):
         request_obj = kwargs.pop("request_obj", None)
         super().__init__(*args, **kwargs)
-        self.org = request_obj.org
+        self.org = request_obj.profile.org
 
         self.fields["title"].required = True
 
@@ -68,7 +68,7 @@ class Meta:
             "due_date",
             "account",
             "created_by",
-            "created_on",
+            "created_at",
         )
 
 class TaskDetailEditSwaggerSerializer(serializers.Serializer):

teams/serializer.py

@@ -15,7 +15,7 @@ class Meta:
             "name",
             "description",
             "users",
-            "created_on",
+            "created_at",
             "created_by",
             "created_on_arrow",
         )
@@ -49,7 +49,7 @@ class Meta:
         fields = (
             "name",
             "description",
-            "created_on",
+            "created_at",
             "created_by",
             "created_on_arrow",
             "org",