Upload 2 files

app.py

@@ -7,41 +7,70 @@
 import pprint
 import json
 import pymysql.cursors
-from fastapi import FastAPI
-from fastapi.responses import JSONResponse
+from fastapi import FastAPI, HTTPException
+from fastapi.responses import JSONResponse, HTMLResponse
+import time
+from dbutils.pooled_db import PooledDB
 import os
 
-# Connect to the database
-connection = pymysql.connect(host=os.environ['MURMEL_DB_HOST'],
-                            user=os.environ['MURMEL_DB_USER'],
-                            password=os.environ['MURMEL_DB_PASSWORD'],
-                            database='murmel',
-                            cursorclass=pymysql.cursors.DictCursor)
+# Create a connection pool
+db_config = {
+    'host': os.environ['MURMEL_DB_HOST'],
+    'user': os.environ['MURMEL_DB_USER'],
+    'password': os.environ['MURMEL_DB_PASSWORD'],
+    'database': 'murmel',
+    'cursorclass': pymysql.cursors.DictCursor
+}
+
+pool = PooledDB(pymysql, maxconnections=5, **db_config)
 
 app = FastAPI()
 
+def execute_query(sql, params=None, max_retries=3, retry_delay=1):
+    for attempt in range(max_retries):
+        try:
+            connection = pool.connection()
+            with connection.cursor() as cursor:
+                cursor.execute(sql, params or ())
+                result = cursor.fetchall()
+            connection.commit()
+            return result
+        except pymysql.OperationalError as e:
+            if attempt == max_retries - 1:
+                raise HTTPException(status_code=500, detail="Database connection error")
+            time.sleep(retry_delay)
+        finally:
+            if 'connection' in locals():
+                connection.close()
 
 @app.get("/groups")
 def get_groups():
-    connection.ping(reconnect=True)      
-    with connection.cursor() as cursor:
-        # Read a single record
-        sql = "SELECT Gruppe, idGruppe FROM `gruppe` WHERE aktuell is True ORDER BY idGruppe ASC;"
-        cursor.execute(sql, ())
-        result = cursor.fetchall()
-        #pprint.pprint(result)
-    return result
+    sql = "SELECT Gruppe, idGruppe FROM `gruppe` WHERE aktuell is True ORDER BY idGruppe ASC;"
+    return execute_query(sql)
 
 @app.get("/students/{idGruppe}")
 def get_students(idGruppe):
-    connection.ping(reconnect=True)      
-    with connection.cursor() as cursor:
-        #sql = "SELECT Gruppe, idGruppe FROM `gruppe` WHERE idGruppe=%s ORDER BY name ASC;"
-        sql = "select concat(`ki`.`Vorname`,' ',`ki`.`Nachnamen`) AS `Kind`, `ki`.`idKind` AS `idKind` from (((`kind` `ki` join `gruppe` `gr`) join `kind_x_gruppe_x_schuljahr` `kgs`) join `schuljahr` `sch`) where `ki`.`idKind` = `kgs`.`x_kind` and `sch`.`idschuljahr` = `kgs`.`x_schuljahr` and `gr`.`idGruppe` =  `kgs`.`x_gruppe` and `sch`.`aktuell` = 1 and (`gr`.`Gruppe` = %s or `gr`.`idGruppe` =  %s) order by 1"
-        cursor.execute(sql, (idGruppe,idGruppe))
-        result = cursor.fetchall()
-        #pprint.pprint(result)
-    return result
+    if idGruppe == 'all':
+        sql = """
+        SELECT DISTINCT concat(`ki`.`Vorname`,' ',`ki`.`Nachnamen`) AS `Kind`, `ki`.`idKind` AS `idKind`
+        FROM `kind` `ki`
+        JOIN `kind_x_gruppe_x_schuljahr` `kgs` ON `ki`.`idKind` = `kgs`.`x_kind`
+        JOIN `schuljahr` `sch` ON `sch`.`idschuljahr` = `kgs`.`x_schuljahr`
+        WHERE `sch`.`aktuell` = 1
+        ORDER BY 1
+        """
+        return execute_query(sql)
+    else:
+        sql = """
+        SELECT concat(`ki`.`Vorname`,' ',`ki`.`Nachnamen`) AS `Kind`, `ki`.`idKind` AS `idKind`
+        FROM `kind` `ki`
+        JOIN `kind_x_gruppe_x_schuljahr` `kgs` ON `ki`.`idKind` = `kgs`.`x_kind`
+        JOIN `schuljahr` `sch` ON `sch`.`idschuljahr` = `kgs`.`x_schuljahr`
+        JOIN `gruppe` `gr` ON `gr`.`idGruppe` = `kgs`.`x_gruppe`
+        WHERE `sch`.`aktuell` = 1 AND (`gr`.`Gruppe` = %s OR `gr`.`idGruppe` = %s)
+        ORDER BY 1
+        """
+        return execute_query(sql, (idGruppe, idGruppe))
 
 @app.get("/return/{idBuch}")
 def rueckgabe(idBuch, grund='rueckgabe'):
@@ -56,21 +85,16 @@ def rueckgabe(idBuch, grund='rueckgabe'):
     - int: 0 if the book was not found or already returned.
 
     """
-    connection.ping(reconnect=True)
-    with connection.cursor() as cursor:
-        # check if the book is already returned
-        sql = "SELECT `idBuch`, `idKind`, `ausleihe`, `rueckgabe`, `rueckGrund` FROM `ausleihe` WHERE `idBuch` = %s AND `rueckgabe` is NULL;"
-        cursor.execute(sql, (idBuch,))
-        result = cursor.fetchall()
-        if len(result) == 0:
-            return 0
-        # return the book
-        sql = "UPDATE `ausleihe` SET `rueckgabe` = NOW(), `rueckGrund` = %s WHERE `idBuch` = %s AND `rueckgabe` is NULL;"
-        cursor.execute(sql, (grund, idBuch))
-        connection.commit()
-        #pprint.pprint(result)
-        # return if the book was returned or not and who had it before
-        return result
+    sql = "SELECT `idBuch`, `idKind`, `ausleihe`, `rueckgabe`, `rueckGrund` FROM `ausleihe` WHERE `idBuch` = %s AND `rueckgabe` is NULL;"
+    result = execute_query(sql, (idBuch,))
+    if len(result) == 0:
+        return 0
+    # return the book
+    sql = "UPDATE `ausleihe` SET `rueckgabe` = NOW(), `rueckGrund` = %s WHERE `idBuch` = %s AND `rueckgabe` is NULL;"
+    execute_query(sql, (grund, idBuch))
+    #pprint.pprint(result)
+    # return if the book was returned or not and who had it before
+    return result
 
 @app.get("/borrow/{idBuch}/{idKind}")
 def ausleihe(idBuch, idKind):
@@ -82,17 +106,23 @@ def ausleihe(idBuch, idKind):
     - idKind (int): The ID of the child borrowing the book.
 
     Returns:
-    - rueckgabe_result (str): The result of the book return operation, indicating if the book was returned or not and who had it before, or if there was an error.
+    - dict: A dictionary containing the result of the borrowing operation.
     """
-    rueckgabe_result = rueckgabe(idBuch, grund="neu-ausleihe") # Buch kann nicht durch andere ausgeliehen sein        
+    rueckgabe_result = rueckgabe(idBuch, grund="neu-ausleihe")
+    
+    message = "Buch erfolgreich ausgeliehen"
+    if rueckgabe_result:
+        # Get the name of the previous borrower
+        prev_borrower_id = rueckgabe_result[0]['idKind']
+        sql = "SELECT CONCAT(Vorname, ' ', Nachnamen) AS full_name FROM kind WHERE idKind = %s;"
+        prev_borrower_name = execute_query(sql, (prev_borrower_id,))[0]['full_name']
+        message += f". Zuvor ausgeliehen von {prev_borrower_name}"
+    
+    # Insert new borrowing record
     sql = "INSERT INTO `ausleihe` (`idBuch`, `idKind`, `ausleihe`) VALUES (%s, %s, NOW());"
-    connection.ping(reconnect=True)
-    with connection.cursor() as cursor:
-        cursor.execute(sql, (idBuch, idKind))
-        connection.commit()
-        #pprint.pprint(result)
-    # return if the book was returned or not and who had it before or if there was an error
-    return rueckgabe_result
+    execute_query(sql, (idBuch, idKind))
+    
+    return {"message": message}
     
 @app.get("/borrowed/{idKind}")
 def ausgeliehen(idKind):
@@ -105,17 +135,21 @@ def ausgeliehen(idKind):
     Returns:
         list: A list of tuples containing the book ID and the borrowing date for each book that is currently borrowed by the child.
     """
-    connection.ping(reconnect=True)
-    with connection.cursor() as cursor:
-        sql = "SELECT `idBuch`, `ausleihe` FROM `ausleihe` WHERE `idKind` = %s AND `rueckgabe` IS NULL;"
-        cursor.execute(sql, (idKind,))
-        result = cursor.fetchall()
-        #pprint.pprint(result)
+    sql = "SELECT `idBuch`, `ausleihe` FROM `ausleihe` WHERE `idKind` = %s AND `rueckgabe` IS NULL;"
+    result = execute_query(sql, (idKind,))
+    #pprint.pprint(result)
     return result
 
+@app.get("/", response_class=HTMLResponse)
+async def read_root():
+    with open("index.html", "r") as f:
+        content = f.read()
+    return HTMLResponse(content=content)
+
 
 # run the app
 if __name__ == '__main__':
-    app.run(host='localhost', port=5000)
+    import uvicorn
+    uvicorn.run(app, host='localhost', port=5000)
 
 # %%

index.html

@@ -1,142 +1,118 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="de">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Library App</title>
+    <title>Bibliotheksverwaltung</title>
+    <style>
+        body { font-family: Arial, sans-serif; max-width: 600px; margin: 0 auto; padding: 20px; }
+        select, input, button { margin: 10px 0; padding: 5px; }
+        #message { margin-top: 20px; font-weight: bold; }
+    </style>
 </head>
 <body>
-    <h1>Library App</h1>
+    <h1>Bibliotheksverwaltung</h1>
+    
+    <h2>Buch zurückgeben</h2>
+    <input type="text" id="returnBookId" placeholder="Buchnummer eingeben">
+    <button onclick="returnBook()">Buch zurückgeben</button>
 
-    <!-- Borrow a Book -->
-    <section id="borrow-section">
-        <h2>Borrow a Book</h2>
-        <button onclick="loadGroups('borrow')">Select Group</button>
-        <div id="borrow-controls" style="display: none;">
-            <select id="group-select-borrow" onchange="loadStudents('borrow')"></select>
-            <select id="student-select-borrow"></select>
-            <input type="text" id="book-id-borrow" placeholder="Enter Book ID">
-            <button onclick="borrowBook()">Borrow Book</button>
-        </div>
-        <div id="borrow-result"></div>
-    </section>
+    <h2>Buch ausleihen</h2>
+    <select id="groupSelect" onchange="loadStudents()">
+        <option value="">Gruppe auswählen</option>
+    </select>
+    <select id="studentSelect">
+        <option value="">Schüler auswählen</option>
+    </select>
+    <input type="text" id="borrowBookId" placeholder="Buchnummer eingeben">
+    <button onclick="borrowBook()">Buch ausleihen</button>
 
-    <!-- Return Books -->
-    <section id="return-section">
-        <h2>Return Books</h2>
-        <input type="text" id="book-id-return" placeholder="Enter Book ID">
-        <button onclick="returnBook()">Return Book</button>
-        <div id="return-result"></div>
-    </section>
-
-    <!-- List Outstanding Books -->
-    <section id="list-section">
-        <h2>List Outstanding Books</h2>
-        <button onclick="loadGroups('list')">Select Group</button>
-        <div id="list-controls" style="display: none;">
-            <select id="group-select-list" onchange="loadStudents('list')"></select>
-            <select id="student-select-list"></select>
-            <button onclick="listOutstandingBooks()">Show Outstanding Books</button>
-        </div>
-        <div id="list-result"></div>
-    </section>
-
-    <!-- Inventory -->
-    <section id="inventory-section">
-        <h2>Inventory</h2>
-        <input type="text" id="book-id-inventory" placeholder="Enter Book ID">
-        <button onclick="inventoryBook()">Inventory Book</button>
-        <div id="inventory-result"></div>
-    </section>
+    <div id="message"></div>
 
     <script>
-        const apiUrl = 'http://localhost:8000'; // Replace with your actual API URL
+        // Load groups when the page loads
+        window.onload = loadGroups;
 
-        // Load groups for selection
-        function loadGroups(mode) {
-            fetch(`${apiUrl}/groups`)
+        function loadGroups() {
+            fetch('/groups')
                 .then(response => response.json())
                 .then(groups => {
-                    let groupSelect = document.getElementById(`group-select-${mode}`);
-                    groupSelect.innerHTML = '<option value="">Select Group</option>';
+                    const select = document.getElementById('groupSelect');
+                    // Add "Alle Gruppen" option
+                    const allGroupsOption = document.createElement('option');
+                    allGroupsOption.value = "all";
+                    allGroupsOption.textContent = "Alle Gruppen";
+                    select.appendChild(allGroupsOption);
+                    // Add other groups
                     groups.forEach(group => {
-                        groupSelect.innerHTML += `<option value="${group.id}">${group.name}</option>`;
+                        const option = document.createElement('option');
+                        option.value = group.idGruppe;
+                        option.textContent = group.Gruppe;
+                        select.appendChild(option);
                     });
-                    document.getElementById(`${mode}-controls`).style.display = 'block';
                 });
         }
 
-        // Load students based on selected group
-        function loadStudents(mode) {
-            const groupId = document.getElementById(`group-select-${mode}`).value;
-            if (groupId) {
-                fetch(`${apiUrl}/students/${groupId}`)
-                    .then(response => response.json())
-                    .then(students => {
-                        let studentSelect = document.getElementById(`student-select-${mode}`);
-                        studentSelect.innerHTML = '<option value="">Select Student</option>';
-                        students.forEach(student => {
-                            studentSelect.innerHTML += `<option value="${student.id}">${student.name}</option>`;
-                        });
-                    });
-            }
-        }
+        function loadStudents() {
+            const groupId = document.getElementById('groupSelect').value;
+            if (!groupId) return;
 
-        // Borrow a book
-        function borrowBook() {
-            const studentId = document.getElementById('student-select-borrow').value;
-            const bookId = document.getElementById('book-id-borrow').value;
-            if (studentId && bookId) {
-                fetch(`${apiUrl}/borrow/${bookId}/${studentId}`)
-                    .then(response => response.json())
-                    .then(result => {
-                        document.getElementById('borrow-result').innerText = JSON.stringify(result);
+            let url = groupId === 'all' ? '/students/all' : `/students/${groupId}`;
+
+            fetch(url)
+                .then(response => response.json())
+                .then(students => {
+                    const select = document.getElementById('studentSelect');
+                    select.innerHTML = '<option value="">Schüler auswählen</option>';
+                    students.forEach(student => {
+                        const option = document.createElement('option');
+                        option.value = student.idKind;
+                        option.textContent = student.Kind;
+                        select.appendChild(option);
                     });
-            } else {
-                alert('Please select a student and enter a book ID.');
-            }
+                });
         }
 
-        // Return a book
         function returnBook() {
-            const bookId = document.getElementById('book-id-return').value;
-            if (bookId) {
-                fetch(`${apiUrl}/return/${bookId}?grund=rueckgabe`)
-                    .then(response => response.json())
-                    .then(result => {
-                        document.getElementById('return-result').innerText = JSON.stringify(result);
-                    });
-            } else {
-                alert('Please enter a book ID.');
+            const bookId = document.getElementById('returnBookId').value;
+            if (!bookId) {
+                setMessage('Bitte geben Sie eine Buchnummer ein');
+                return;
             }
+
+            fetch(`/return/${bookId}`)
+                .then(response => response.json())
+                .then(result => {
+                    if (result === 0) {
+                        setMessage('Buch nicht gefunden oder bereits zurückgegeben');
+                    } else {
+                        setMessage('Buch erfolgreich zurückgegeben');
+                    }
+                });
         }
 
-        // List outstanding books
-        function listOutstandingBooks() {
-            const studentId = document.getElementById('student-select-list').value;
-            if (studentId) {
-                fetch(`${apiUrl}/borrowed/${studentId}`)
-                    .then(response => response.json())
-                    .then(result => {
-                        document.getElementById('list-result').innerText = JSON.stringify(result);
-                    });
-            } else {
-                alert('Please select a student.');
+        function borrowBook() {
+            const studentId = document.getElementById('studentSelect').value;
+            const bookId = document.getElementById('borrowBookId').value;
+
+            if (!studentId || !bookId) {
+                setMessage('Bitte wählen Sie einen Schüler aus und geben Sie eine Buchnummer ein');
+                return;
             }
+
+            fetch(`/borrow/${bookId}/${studentId}`)
+                .then(response => response.json())
+                .then(result => {
+                    if (result.message) {
+                        setMessage(result.message);
+                    } else {
+                        setMessage('Fehler beim Ausleihen des Buches: ' + JSON.stringify(result));
+                    }
+                });
         }
 
-        // Inventory a book
-        function inventoryBook() {
-            const bookId = document.getElementById('book-id-inventory').value;
-            if (bookId) {
-                fetch(`${apiUrl}/return/${bookId}?grund=inventory`)
-                    .then(response => response.json())
-                    .then(result => {
-                        document.getElementById('inventory-result').innerText = JSON.stringify(result);
-                    });
-            } else {
-                alert('Please enter a book ID.');
-            }
+        function setMessage(msg) {
+            document.getElementById('message').textContent = msg;
         }
     </script>
 </body>