refactor: clean up unused imports and improve code organization

src/backend/database.py

@@ -179,7 +179,8 @@ class Database:
         log_message = f"Querying database with query {logs_query}, args: {logs_args}"
         # if "INSERT" in query:
         #     log_message = f"Querying database with query {query}"
-
+        if "INTO user" in query:
+            log_message = f"Querying database with query {query}"
         logger.debug(log_message)
         try:
             cursor.execute(query, args)
@@ -793,6 +794,7 @@ class Database:
             "SELECT appnr FROM semesterapparat WHERE deletion_status=0"
         )
         numbers = [i[0] for i in numbers]
+        numbers.sort()
         logger.info(f"Currently used apparat numbers: {numbers}")
         return numbers
 
@@ -962,6 +964,7 @@ class Database:
             app_id (Union[str, int]): the id of the apparat
             semester (str): the semester the apparat should be deleted from
         """
+        logger.info(f"Deleting apparat with id {app_id} in semester {semester}")
         self.query_db(
             "UPDATE semesterapparat SET deletion_status=1, deleted_date=? WHERE appnr=?",
             (semester, app_id),
@@ -1064,7 +1067,6 @@ class Database:
             Returns:
                 list: the result of the query
             """
-            logger.debug(query)
             logger.debug(f"Query: {query}")
             conn = self.connect()
             cursor = conn.cursor()
@@ -1086,7 +1088,7 @@ class Database:
             WHERE deletion_status=0 AND dauer=0 AND 
             (
                 (erstellsemester!='{kwargs["deletesemester"]}' AND verlängerung_bis IS NULL) OR
-                (erstellsemester!='{kwargs["deletesemester"]}' AND verlängerung_bis!='{kwargs["deletesemester"]}' AND verlängerung_bis!='{Semester()}')
+                (erstellsemester!='{kwargs["deletesemester"]}' AND verlängerung_bis!='{kwargs["deletesemester"]}' AND verlängerung_bis!='{Semester().next}')
             )"""
             return __query(query)
         if "dauer" in kwargs.keys():
@@ -1563,11 +1565,13 @@ class Database:
             apprarat_id (int): Number of the apparat
 
         Returns:
+
             int | None: The id of the prof or None if not found
         """
-        query = f"SELECT prof_id from semesterapparat WHERE id = '{apprarat_id}' and deletion_status = 0"
+        query = f"SELECT prof_id from semesterapparat WHERE appnr = '{apprarat_id}' and deletion_status = 0"
         data = self.query_db(query)
         if data:
+            logger.info("Prof ID: " + str(data[0][0]))
             return data[0][0]
         else:
             return None