Merge pull request #2 from Programmer-RD-AI/deepsource-fix-9203773f

Change methods not using its bound instance to staticmethods

Author: Programmer-RD-AI

server/db/admin/crud_subjects.py

@@ -30,9 +30,10 @@ def delete_collection(self):
             if self.subject in results:
                 self.collection.drop()
                 results_ = []
-                for result_ in auth_collection_sign_in.find(
-                    {"Subject": self.subject, "Role": "Teacher"}
-                ):
+                for result_ in auth_collection_sign_in.find({
+                        "Subject": self.subject,
+                        "Role": "Teacher"
+                }):
                     results_.append(result_)
                 for result_delete in results_:
                     auth_collection_sign_in.delete_one(result_delete)
@@ -41,7 +42,8 @@ def delete_collection(self):
         except:
             return False
 
-    def get_collections(self):
+    @staticmethod
+    def get_collections():
         try:
             results = subject_db.collection_names()
             string_results = " "
@@ -59,9 +61,10 @@ def get_collections(self):
     def update_collection(self, old_name):
         subject_db[old_name].rename(self.subject)
         results = []
-        for result in auth_collection_sign_in.find(
-            {"Subject": old_name, "Role": "Teacher"}
-        ):
+        for result in auth_collection_sign_in.find({
+                "Subject": old_name,
+                "Role": "Teacher"
+        }):
             results.append(result)
         for result_ in results:
             new_values = {"$set": {"Subject": self.subject}}
@@ -75,4 +78,4 @@ def check_if_exits(self):
                 return True
             return False
         except:
-            return False
+            return False

server/db/admin/crud_users.py

@@ -1,6 +1,6 @@
+from mongodb.get_the_last_id import get_custom_last_id, last_id
 from server import *
 from server.db.home.autentication import Sign_In
-from mongodb.get_the_last_id import last_id, get_custom_last_id
 
 user_db = cluster["Auth"]
 auth_collection_sign_in = user_db["Auth-Sign-In"]
@@ -35,44 +35,58 @@ def add_teacher(self):
                 password_or_email=self.password,
                 role="Teacher",
             )
-            si2 = Sign_In(
-                user_name=self.user_name, password_or_email=self.email, role="Teacher"
-            )
+            si2 = Sign_In(user_name=self.user_name,
+                          password_or_email=self.email,
+                          role="Teacher")
             results = [si1.check(), si2.check()]
             print(results)
             if results[0][0] is True or results[1][0] is True:
-                return [False, "There is another teacher with the same info ! "]
+                return [
+                    False, "There is another teacher with the same info ! "
+                ]
             ids = last_id()
-            auth_collection_sign_in.insert_one(
-                {
-                    "_id": ids,
-                    "User Name": self.user_name,
-                    "Password": self.password,
-                    "Email": self.email,
-                    "Role": "Teacher",
-                    "Subject": self.subject,
-                    "Whatsapp Number": self.whatsapp_number,
-                }
-            )
-            self.subject_collection.insert_one(
-                {
-                    "User Name": self.user_name,
-                    "Password": self.password,
-                    "Email": self.email,
-                    "Role": "Teacher",
-                    "Subject": self.subject,
-                    "Whatsapp Number": self.whatsapp_number,
-                }
-            )
+            auth_collection_sign_in.insert_one({
+                "_id":
+                ids,
+                "User Name":
+                self.user_name,
+                "Password":
+                self.password,
+                "Email":
+                self.email,
+                "Role":
+                "Teacher",
+                "Subject":
+                self.subject,
+                "Whatsapp Number":
+                self.whatsapp_number,
+            })
+            self.subject_collection.insert_one({
+                "User Name":
+                self.user_name,
+                "Password":
+                self.password,
+                "Email":
+                self.email,
+                "Role":
+                "Teacher",
+                "Subject":
+                self.subject,
+                "Whatsapp Number":
+                self.whatsapp_number,
+            })
             return [True, "New Teacher Created ! "]
         except:
             return False
 
-    def delete_teacher(self, email, user_name):
+    @staticmethod
+    def delete_teacher(email, user_name):
         results = []
-        for result in auth_collection_sign_in.find(
-            {"User Name": user_name, "Email": email, "Role": "Teacher"}
-        ):
+        for result in auth_collection_sign_in.find({
+                "User Name": user_name,
+                "Email": email,
+                "Role": "Teacher"
+        }):
             results.append(result)
         if results == []:
             return False
@@ -85,15 +99,18 @@ def delete_teacher(self, email, user_name):
     @staticmethod
     def get_data_of_teacher(user_name, email):
         results = []
-        for result in auth_collection_sign_in.find(
-            {"User Name": user_name, "Email": email, "Role": "Teacher"}
-        ):
+        for result in auth_collection_sign_in.find({
+                "User Name": user_name,
+                "Email": email,
+                "Role": "Teacher"
+        }):
             results.append(result)
         if results == []:
             return [False, results]
         return [True, results]
 
-    def update_teacher(self, new_info: dict, old_info: dict):
+    @staticmethod
+    def update_teacher(new_info: dict, old_info: dict):
         # si1 = Sign_In(
         #     user_name=new_info["User Name"],
         #     password_or_email=new_info["Password"],
@@ -146,7 +163,8 @@ def update_teacher(self, new_info: dict, old_info: dict):
     def get_all_teachers():
         try:
             results_user = []
-            for result_user in auth_collection_sign_in.find({"Role": "Teacher"}):
+            for result_user in auth_collection_sign_in.find(
+                    {"Role": "Teacher"}):
                 results_user.append(result_user)
             return [results_user]
         except:
@@ -156,17 +174,18 @@ def get_all_teachers():
     def get_teachers(subject):
         try:
             results_user = []
-            for result_user in auth_collection_sign_in.find(
-                {"Role": "Teacher", "Subject": subject}
-            ):
+            for result_user in auth_collection_sign_in.find({
+                    "Role": "Teacher",
+                    "Subject": subject
+            }):
                 results_user.append(result_user)
             return [results_user]
         except:
             return False
 
 
 class Students:
-    def __init__(self, user_name, password, email,whatsapp_number):
+    def __init__(self, user_name, password, email, whatsapp_number):
         try:
             self.user_name = user_name
             self.password = password
@@ -187,37 +206,37 @@ def add_student(self):
             password_or_email=self.password,
             role="Student",
         )
-        si2 = Sign_In(
-            user_name=self.user_name, password_or_email=self.email, role="Student"
-        )
+        si2 = Sign_In(user_name=self.user_name,
+                      password_or_email=self.email,
+                      role="Student")
         results = [si1.check(), si2.check()]
         if results[0][0] is True or results[1][0] is True:
             return [
                 False,
                 "There is another student or a teacher or your  with the same info ! ",
             ]
         ids = last_id()
-        auth_collection_sign_in.insert_one(
-            {
-                "_id": ids,
-                "User Name": self.user_name,
-                "Password": self.password,
-                "Email": self.email,
-                "Whatapp Number": self.whatsapp_number,
-                "Role": "Student",
-            }
-        )
+        auth_collection_sign_in.insert_one({
+            "_id": ids,
+            "User Name": self.user_name,
+            "Password": self.password,
+            "Email": self.email,
+            "Whatapp Number": self.whatsapp_number,
+            "Role": "Student",
+        })
         return [True, "New Student Created ! "]
 
-    def delete_student(self, infos: list):
+    @staticmethod
+    def delete_student(infos: list):
         for info in infos:
             try:
                 auth_collection_sign_in.delete_one(info)
             except:
                 pass
         return True
 
-    def get_students(self):
+    @staticmethod
+    def get_students():
         try:
             results = []
             for result in auth_collection_sign_in.find({"Role": "Student"}):
@@ -226,7 +245,8 @@ def get_students(self):
         except:
             return [False, ""]
 
-    def update_student(self, new_info: dict, old_info: dict):
+    @staticmethod
+    def update_student(new_info: dict, old_info: dict):
         # si1 = Sign_In(
         #     user_name=new_info["User Name"],
         #     password_or_email=new_info["Password"],
@@ -251,7 +271,7 @@ def update_student(self, new_info: dict, old_info: dict):
                     "Password": new_info["Password"],
                     "Email": new_info["Email"],
                     "Role": new_info["Role"],
-                    'Whatapp Number':new_info['Whatsapp Number']
+                    "Whatapp Number": new_info["Whatsapp Number"],
                 }
             }
             auth_collection_sign_in.update_one(old_info, new)
@@ -264,22 +284,28 @@ def update_student(self, new_info: dict, old_info: dict):
                     "Email": new_info["Email"],
                     "Role": new_info["Role"],
                     "Subject": new_info["Subject"],
-                    'Whatapp Number':new_info['Whatsapp Number']
+                    "Whatapp Number": new_info["Whatsapp Number"],
                 }
             }
             subject_collection = subject_db[new_info["Subject"]]
-            last_id_ = get_custom_last_id(db="Subjects", collection=new_info["Subject"])
-            subject_collection.insert_one(
-                {
-                    "_id": last_id_,
-                    "User Name": new_info["User Name"],
-                    "Password": new_info["Password"],
-                    "Email": new_info["Email"],
-                    "Role": new_info["Role"],
-                    "Subject": new_info["Subject"],
-                    'Whatapp Number':new_info['Whatsapp Number']
-                }
-            )
+            last_id_ = get_custom_last_id(db="Subjects",
+                                          collection=new_info["Subject"])
+            subject_collection.insert_one({
+                "_id":
+                last_id_,
+                "User Name":
+                new_info["User Name"],
+                "Password":
+                new_info["Password"],
+                "Email":
+                new_info["Email"],
+                "Role":
+                new_info["Role"],
+                "Subject":
+                new_info["Subject"],
+                "Whatapp Number":
+                new_info["Whatsapp Number"],
+            })
             auth_collection_sign_in.update_one(old_info, new)
         return True
 
@@ -288,9 +314,11 @@ def get_data_of_student(user_name, email):
         auth_db = cluster["Auth"]
         auth_collection_sign_in = auth_db["Auth-Sign-In"]
         results = []
-        for result in auth_collection_sign_in.find(
-            {"User Name": user_name, "Email": email, "Role": "Student"}
-        ):
+        for result in auth_collection_sign_in.find({
+                "User Name": user_name,
+                "Email": email,
+                "Role": "Student"
+        }):
             results.append(result)
         print(results)
         if results == []:

server/db/admin/sms.py

@@ -1,6 +1,7 @@
-from server import *
 import requests
+
 from mongodb.get_the_last_id import *
+from server import *
 
 
 class SMS:
@@ -36,13 +37,11 @@ def send(self):
         return [True, old_balance - new_balance]
 
     def add_logs(self):
-        self.collection.insert_one(
-            {
-                "_id": self.last_id,
-                "Phone Numbers": self.phone_numbers,
-                "Message": self.message,
-            }
-        )
+        self.collection.insert_one({
+            "_id": self.last_id,
+            "Phone Numbers": self.phone_numbers,
+            "Message": self.message,
+        })
         return True
 
     def get_logs(self):
@@ -53,10 +52,14 @@ def get_logs(self):
 
     def get_balance(self):
         url = "http://sender.marxhal.com/api/v2/status.php"
-        balance = requests.post(url, {"user_id": self.user_id, "api_key": self.api_key})
+        balance = requests.post(url, {
+            "user_id": self.user_id,
+            "api_key": self.api_key
+        })
         return balance.json()["result"]["account_balance"]
 
-    def add_balance(self, amount):
+    @staticmethod
+    def add_balance(amount):
         # +94718024596 is the phone number of the person who updates the price.
         sms = SMS(
             phone_numbers=["+94718024596"],