Ashwin (#431)

* enhancements * enhancements * added default secret key * added default secret key * added default secret key * added default secret key * code formatting
KINOA1209 · Feb 21, 2021 · d0e6e2b · d0e6e2b
1 parent ccb8346
commit d0e6e2b
Show file tree

Hide file tree

Showing 14 changed files with 623 additions and 710 deletions.
diff --git a/accounts/api_views.py b/accounts/api_views.py
@@ -625,4 +625,4 @@ def delete(self, request, pk, format=None):
                     "error": True,
                     "errors": "You don't have permission to delete this Attachment",
                 }
-            )
+            )
diff --git a/accounts/swagger_params.py b/accounts/swagger_params.py
@@ -89,17 +89,14 @@
 account_detail_get_params = [
     company_params_in_header,
     openapi.Parameter(
-        "account_attachment", openapi.IN_QUERY, type=openapi.TYPE_FILE, 
-    ),
-    openapi.Parameter(
-        "comment", openapi.IN_QUERY, type=openapi.TYPE_STRING
+        "account_attachment",
+        openapi.IN_QUERY,
+        type=openapi.TYPE_FILE,
     ),
+    openapi.Parameter("comment", openapi.IN_QUERY, type=openapi.TYPE_STRING),
 ]
 
 account_comment_edit_params = [
     company_params_in_header,
-    openapi.Parameter(
-        "comment", openapi.IN_QUERY, type=openapi.TYPE_STRING
-    ),
+    openapi.Parameter("comment", openapi.IN_QUERY, type=openapi.TYPE_STRING),
 ]
-
diff --git a/cases/api_views.py b/cases/api_views.py
diff --git a/cases/models.py b/cases/models.py
@@ -19,7 +19,11 @@ class Case(models.Model):
         choices=CASE_TYPE, max_length=255, blank=True, null=True, default=""
     )
     account = models.ForeignKey(
-        Account, on_delete=models.CASCADE, blank=True, null=True, related_name="accounts_cases",
+        Account,
+        on_delete=models.CASCADE,
+        blank=True,
+        null=True,
+        related_name="accounts_cases",
     )
     contacts = models.ManyToManyField(Contact)
     # closed_on = models.DateTimeField()

diff --git a/cases/serializer.py b/cases/serializer.py
@@ -35,6 +35,7 @@ class Meta:
             "created_on_arrow",
         )
 
+
 class CaseCreateSerializer(serializers.ModelSerializer):
     closed_on = serializers.DateField
 
@@ -47,20 +48,16 @@ def __init__(self, *args, **kwargs):
 
     def validate_name(self, name):
         if self.instance:
-            if Case.objects.filter(
-                name__iexact=name, company=self.company
-            ).exclude(id=self.instance.id).exists():
-                raise serializers.ValidationError(
-                    "Case already exists with this name"
-                )
+            if (
+                Case.objects.filter(name__iexact=name, company=self.company)
+                .exclude(id=self.instance.id)
+                .exists()
+            ):
+                raise serializers.ValidationError("Case already exists with this name")
 
         else:
-            if Case.objects.filter(
-                name__iexact=name, company=self.company
-            ).exists():               
-                raise serializers.ValidationError(
-                    "Case already exists with this name"
-                )
+            if Case.objects.filter(name__iexact=name, company=self.company).exists():
+                raise serializers.ValidationError("Case already exists with this name")
         return name
 
     class Meta:
@@ -76,4 +73,4 @@ class Meta:
             "account",
             "company",
             "created_on_arrow",
-        )
+        )
diff --git a/cases/swagger_params.py b/cases/swagger_params.py
@@ -6,28 +6,20 @@
 
 cases_list_get_params = [
     company_params_in_header,
-    openapi.Parameter(
-        "name", openapi.IN_QUERY, type=openapi.TYPE_STRING
-    ),
-    openapi.Parameter(
-        "status", openapi.IN_QUERY, type=openapi.TYPE_STRING
-    ),
-    openapi.Parameter(
-        "priority", openapi.IN_QUERY, type=openapi.TYPE_STRING
-    ),
-    openapi.Parameter(
-        "account", openapi.IN_QUERY, type=openapi.TYPE_STRING
-    ),
+    openapi.Parameter("name", openapi.IN_QUERY, type=openapi.TYPE_STRING),
+    openapi.Parameter("status", openapi.IN_QUERY, type=openapi.TYPE_STRING),
+    openapi.Parameter("priority", openapi.IN_QUERY, type=openapi.TYPE_STRING),
+    openapi.Parameter("account", openapi.IN_QUERY, type=openapi.TYPE_STRING),
 ]
 
 cases_detail_get_params = [
     company_params_in_header,
     openapi.Parameter(
-        "case_attachment", openapi.IN_QUERY, type=openapi.TYPE_FILE, 
-    ),
-    openapi.Parameter(
-        "comment", openapi.IN_QUERY, type=openapi.TYPE_STRING
+        "case_attachment",
+        openapi.IN_QUERY,
+        type=openapi.TYPE_FILE,
     ),
+    openapi.Parameter("comment", openapi.IN_QUERY, type=openapi.TYPE_STRING),
 ]
 
 cases_delete_params = [
@@ -45,38 +37,27 @@
     openapi.Parameter(
         "priority", openapi.IN_QUERY, type=openapi.TYPE_STRING, required=True
     ),
+    openapi.Parameter("type_of_case", openapi.IN_QUERY, type=openapi.TYPE_STRING),
     openapi.Parameter(
-        "type_of_case", openapi.IN_QUERY, type=openapi.TYPE_STRING
-    ),
-    openapi.Parameter(
-        "closed_on", openapi.IN_QUERY,
-         type=openapi.TYPE_STRING,
-         format="date",
-         required=True
+        "closed_on",
+        openapi.IN_QUERY,
+        type=openapi.TYPE_STRING,
+        format="date",
+        required=True,
     ),
+    openapi.Parameter("teams", openapi.IN_QUERY, type=openapi.TYPE_STRING),
+    openapi.Parameter("assigned_to", openapi.IN_QUERY, type=openapi.TYPE_STRING),
+    openapi.Parameter("account", openapi.IN_QUERY, type=openapi.TYPE_INTEGER),
     openapi.Parameter(
-        "teams", openapi.IN_QUERY, type=openapi.TYPE_STRING
-    ),
-    openapi.Parameter(
-        "assigned_to", openapi.IN_QUERY, type=openapi.TYPE_STRING
-    ),
-    openapi.Parameter(
-        "account", openapi.IN_QUERY, type=openapi.TYPE_INTEGER
-    ),
-    openapi.Parameter(
-        "case_attachment", openapi.IN_QUERY, type=openapi.TYPE_FILE, 
-    ),
-    openapi.Parameter(
-        "contacts", openapi.IN_QUERY, type=openapi.TYPE_STRING
-    ),
-    openapi.Parameter(
-        "description", openapi.IN_QUERY, type=openapi.TYPE_STRING
+        "case_attachment",
+        openapi.IN_QUERY,
+        type=openapi.TYPE_FILE,
     ),
+    openapi.Parameter("contacts", openapi.IN_QUERY, type=openapi.TYPE_STRING),
+    openapi.Parameter("description", openapi.IN_QUERY, type=openapi.TYPE_STRING),
 ]
 
 cases_comment_edit_params = [
     company_params_in_header,
-    openapi.Parameter(
-        "comment", openapi.IN_QUERY, type=openapi.TYPE_STRING
-    ),
+    openapi.Parameter("comment", openapi.IN_QUERY, type=openapi.TYPE_STRING),
 ]
diff --git a/crm/settings.py b/crm/settings.py
@@ -11,7 +11,10 @@
 load_dotenv(dotenv_path=env_path)
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.getenv("SECRET_KEY", '&q1&ftrxho9lrzm$$%6!cplb5ac957-9y@t@17u(3yqqb#9xl%')
+SECRET_KEY = os.getenv(
+    "SECRET_KEY", "&q1&ftrxho9lrzm$$%6!cplb5ac957-9y@t@17u(3yqqb#9xl%"
+)
+
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = os.getenv("DEBUG")
@@ -54,7 +57,7 @@
     "drf_yasg",
     "corsheaders",
     "django_ses",
-    "django_blog_it"
+    "django_blog_it",
 ]
 
 MIDDLEWARE = [
-Original file line number
+Diff line change
@@ Expand Up / @@ -625,4 +625,4 @@ def delete(self, request, pk, format=None): @@
                         "error": True,
                         "errors": "You don't have permission to delete this Attachment",
                     }
-                )
+                )