added additional user functionality and linking (contact us query_ids)

server/admins/__init__.py

@@ -1,10 +1,10 @@
 from core.pagination import CustomPagination
+from mainapp.models import MusicData
 from userprofile.models import UserData
+
 from .issue_jwt import AdminTokenAuth
-from mainapp.models import MusicData
 from .models import AdminAuth
 
-
 Admin_Token_Auth = AdminTokenAuth()
 Paginate = CustomPagination()
 Music_Data = MusicData()

server/admins/create_admin.py

@@ -1,9 +1,11 @@
-from dotenv import load_dotenv
-import hashlib, binascii
-import pymongo
+import binascii
+import hashlib
+import os
 import random
 import string
-import os
+
+import pymongo
+from dotenv import load_dotenv
 
 load_dotenv()
 

server/admins/issue_jwt.py

@@ -1,9 +1,10 @@
-from datetime import datetime, timedelta
-from dotenv import load_dotenv
-import jwt
 import os
+from datetime import datetime, timedelta
 
+import jwt
 from authentication.errors import InvalidTokenError
+from dotenv import load_dotenv
+
 from .errors import AdminTokenGenerationError
 
 load_dotenv()

server/admins/models.py

@@ -1,16 +1,18 @@
-from dotenv import load_dotenv
-import hashlib, binascii
-import pymongo
+import binascii
+import hashlib
+import os
 import random
 import string
-import os
 
+import pymongo
 from core.settings import DATABASE
+from dotenv import load_dotenv
+
 from .errors import (
-    InvalidAdminCredentialsError,
     AdminDoesNotExistError,
-    InvalidAdminIDError,
     AdminExistsError,
+    InvalidAdminCredentialsError,
+    InvalidAdminIDError,
 )
 
 load_dotenv()

server/admins/tests/test_jwt_adm.py

@@ -1,7 +1,7 @@
 import unittest
 
-from authentication.errors import InvalidTokenError
 from admins.issue_jwt import AdminTokenAuth
+from authentication.errors import InvalidTokenError
 
 
 class Test_Admin_JWT(unittest.TestCase):

server/admins/tests/test_models_adm.py

@@ -1,12 +1,12 @@
-from dotenv import load_dotenv
 import unittest
 
-from admins.models import AdminAuth
 from admins.errors import (
-    InvalidAdminCredentialsError,
     AdminDoesNotExistError,
+    InvalidAdminCredentialsError,
     InvalidAdminIDError,
 )
+from admins.models import AdminAuth
+from dotenv import load_dotenv
 
 
 class Test_Admin_Model(unittest.TestCase):

server/admins/urls.py

@@ -1,6 +1,7 @@
-from .views import AdminView, AdminLogin, GenerateTokens
 from django.urls import path
 
+from .views import AdminLogin, AdminView, GenerateTokens
+
 urlpatterns = [
     path("", AdminView.as_view()),
     path("login", AdminLogin.as_view()),

server/admins/utils.py

@@ -1,20 +1,19 @@
-from rest_framework import status
-from django.http import response
-
-from userprofile.errors import FileDoesNotExistForCurrentUserError
 from authentication.errors import InvalidTokenError
 from core.errors import PageDoesNotExistError
+from django.http import response
+from mainapp.aws import AWSFunctionsS3
 from mainapp.errors import DataFetchingError
+from rest_framework import status
+from userprofile.errors import FileDoesNotExistForCurrentUserError
+
+from . import Admin_Auth, Admin_Token_Auth, Music_Data, Paginate, User_Data
 from .errors import (
-    InvalidAdminCredentialsError,
-    AdminTokenGenerationError,
     AdminDoesNotExistError,
+    AdminTokenGenerationError,
+    InvalidAdminCredentialsError,
     InvalidAdminIDError,
 )
 
-from . import Paginate, Music_Data, User_Data, Admin_Auth, Admin_Token_Auth
-from mainapp.aws import AWSFunctionsS3
-
 
 def login_admin(request, **kwargs) -> response.JsonResponse:
     """Handles data when Admin Logs In through POST requests

server/admins/validate_admins.py

@@ -1,7 +1,7 @@
+from authentication.errors import InvalidTokenError
 from rest_framework.permissions import BasePermission
 
-from authentication.errors import InvalidTokenError
-from . import Admin_Token_Auth, Admin_Auth
+from . import Admin_Auth, Admin_Token_Auth
 from .errors import InvalidAdminIDError
 
 

server/admins/views.py

@@ -1,10 +1,10 @@
+from core.throttle import throttle
+from django.http import response
 from rest_framework.permissions import AllowAny
 from rest_framework.views import APIView
-from django.http import response
 
-from .utils import delete_music_data, send_music_data, login_admin, get_tokens
-from core.throttle import throttle
 from . import validate_admins
+from .utils import delete_music_data, get_tokens, login_admin, send_music_data
 
 
 class AdminLogin(APIView):

server/authentication/__init__.py

@@ -1,5 +1,5 @@
-from .models import UserAuth, ContactUsData
 from .jwt import TokenAuth
+from .models import ContactUsData, UserAuth
 
 Contact_Us = ContactUsData()
 Token_Auth = TokenAuth()

server/authentication/errors.py

@@ -9,6 +9,10 @@ class InvalidVerificationError(AuthenticationErrors):
     ...
 
 
+class NoContactUsQueriesFoundError(ContactUsErrors):
+    ...
+
+
 class ContactUsDataInsertionError(ContactUsErrors):
     ...
 
@@ -31,3 +35,7 @@ class UserExistsError(AuthenticationErrors):
 
 class InvalidUIDError(AuthenticationErrors):
     ...
+
+
+class InvalidQIDError(ContactUsErrors):
+    ...

server/authentication/jwt.py

@@ -1,7 +1,9 @@
+import os
 from datetime import datetime, timedelta
+
 from dotenv import load_dotenv
+
 import jwt
-import os
 
 from .errors import InvalidTokenError, TokenGenerationError
 

server/authentication/mailer.py

@@ -1,6 +1,7 @@
-from dotenv import load_dotenv
-import smtplib
 import os
+import smtplib
+
+from dotenv import load_dotenv
 
 from . import UserAuth
 

server/authentication/models.py

@@ -1,19 +1,23 @@
-from dotenv import load_dotenv
-from datetime import datetime
-import hashlib, binascii
-import pymongo
+import binascii
+import hashlib
+import os
 import random
 import string
-import os
+from datetime import datetime
 
+import pymongo
 from core.settings import DATABASE
+from dotenv import load_dotenv
+
 from .errors import (
-    InvalidUserCredentialsError,
     ContactUsDataInsertionError,
+    InvalidQIDError,
+    InvalidUIDError,
+    InvalidUserCredentialsError,
     InvalidVerificationError,
+    NoContactUsQueriesFoundError,
     UserDoesNotExistError,
     UserExistsError,
-    InvalidUIDError,
 )
 
 load_dotenv()
@@ -96,10 +100,33 @@ def insert_user(self, email: str, pwd: str) -> None:
                 "user_id": self.generate_uid(),
                 "Email": email,
                 "Password": pwd,
-                "ContactUs": [],
+                "ContactUs": [],  # Query ID
+                "Likes": [],  # Like ID
+                "Comments": [],  # Comment ID
+                "Notes": [],  # Notes on When Password was Last Changed - FOR ADMIN
             }
             self.db.insert_one(rec)
 
+    def get_contact_us_query_ids(self, email: str) -> list:
+        """Fetches contact us query ids for particular user
+
+        Args:
+            email: User Email ID
+
+        Returns:
+            list
+        """
+        if value := self.db.find_one({"Email": email}):
+            query_ids = value["ContactUs"]
+            if isinstance(query_ids, list) and len(query_ids) > 0:
+                return query_ids
+            else:
+                raise NoContactUsQueriesFoundError(
+                    f"User {email} Has No Contact Us Queries Raised"
+                )
+
+        raise UserDoesNotExistError(f"User {email} Does Not Exist")
+
     def add_verif_code(self, email: str, check_recursive_correctness: int) -> int:
         """Adds verification code & timestamp for reset password functionality
 
@@ -217,11 +244,17 @@ def reset_password(self, pwd: str, code: int) -> bool:
         """
         if value := self.db.find_one({"verif_code": code}):
             email = value["Email"]
+
+            pwd_change_time = datetime.now()
+            pct_string = pwd_change_time.strftime("%d/%m/%Y %H:%M:%S")
+            msg = "Password Changed: " + pct_string
+
             self.db.find_one_and_update(
                 {"Email": email},
                 update={
                     "$set": {"Password": self.hash_password(pwd)},
                     "$unset": {"verif_code": "", "timestamp_created": ""},
+                    "$push": {"Notes": msg},
                 },
             )
             return True
@@ -237,25 +270,69 @@ def __init__(self) -> None:
         client = pymongo.MongoClient(DATABASE["mongo_uri"])
         self.db = client[DATABASE["db"]][os.getenv("CONTACT_US_DATA_COLLECTION")]
 
-    def insert_contact_us_data(self, name: str, email: str, message: str) -> bool:
-        """Inserts Contact Us Data
+    def generate_query_id(self) -> str:
+        """Generates a unique query id
+
+        Args:
+            None
+
+        Returns:
+            str
+        """
+        q_id = "".join(
+            random.choice(
+                string.ascii_uppercase + string.ascii_lowercase + string.digits
+            )
+            for _ in range(16)
+        )
+        q_id = "query_" + q_id
+
+        if self.db.find_one({"query_id": q_id}):
+            q_id = self.generate_query_id()
+        return q_id
+
+    def validate_query_id(self, qid: str) -> bool:
+        """Validates query id for particular user
+
+        Args:
+            qid: Query ID
+
+        Returns:
+            bool
+        """
+        value = self.db.find_one({"query_id": qid})
+        if value:
+            return True
+
+        raise InvalidQIDError(f"Query With query_id {qid} NOT Found")
+
+    def insert_contact_us_data(
+        self, name: str, email: str, message: str, status: str
+    ) -> bool:
+        """Inserts Contact Us Data & Updates User Profile With Query ID
 
         Args:
             name: Name of User
             email: User Email ID
             message: Contact Us Message
+            status: Status of Query
 
         Returns:
             bool
         """
         data = {
+            "query_id": self.generate_query_id(),
             "Name": name,
             "Email": email,
             "Message": message,
+            "Status": status,
         }
 
         try:
             self.db.insert_one(data)
+
+            # UPDATE USER CONTACTUS[] WITH QUERY ID
+
             return True
         except Exception:
             raise ContactUsDataInsertionError("Error Inserting Contact Us Data")

server/authentication/tests/test_models.py

@@ -1,12 +1,12 @@
-from dotenv import load_dotenv
 import unittest
 
-from authentication.models import UserAuth, ContactUsData
 from authentication.errors import (
+    InvalidUIDError,
     InvalidUserCredentialsError,
     UserDoesNotExistError,
-    InvalidUIDError,
 )
+from authentication.models import ContactUsData, UserAuth
+from dotenv import load_dotenv
 
 
 class Test_Auth_Model(unittest.TestCase):

server/authentication/urls.py

@@ -1,6 +1,7 @@
-from .views import Register, Login, ResetPassword, ResetPasswordLink, GenerateTokens
 from django.urls import path
 
+from .views import GenerateTokens, Login, Register, ResetPassword, ResetPasswordLink
+
 urlpatterns = [
     path("register", Register.as_view()),
     path("login", Login.as_view()),