Updating functions.

Closes #13 (closed)

project_server.py

@@ -17,13 +17,12 @@ def connect_db(db_file=DATABASE):
         print("Error connecting to database.")
     return conn
 
-@app.route("/SearchRecord", methods=['POST'])
+@app.route('/SearchRecord', methods=['POST'])
 def searchRecord():
 
-    if request.method =='POST':
-
+    if (request.method =='POST'):
         recordName = request.form.get('recordName', default="Error")
-        print(f"Searching for '{recordName}' in database.")
+        print(f"Searching for '{recordName}' in the database.")
 
         try:
             conn = connect_db()
@@ -32,7 +31,7 @@ def searchRecord():
             recordData = cur.fetchall()
 
         except:
-            print(f"Error searching for record.")
+            print(f"Encountered an error whilst searching for record.")
 
         finally:
             conn.close()
@@ -43,9 +42,9 @@ def searchRecord():
 
             else:
                 print(f"Found: {recordData}")
-                return (str(recordData))
+                return (recordData)
 
-@app.route("/AddRecord", methods=['POST'])
+@app.route('/AddRecord', methods=['POST'])
 def addRecord():
 
     if (request.method == 'POST'):
@@ -60,7 +59,7 @@ def addRecord():
         recordOpeningHours = request.form.get('recordOpeningHours', default="Error")
         recordCheckinInstructions = request.form.get('recordCheckinInstructions', default="Error")
         recordData = [recordName, recordAddress, recordMainPhotos, recordAdditionalPhotos, recordDescription, recordWebsite, recordEmail, recordPhoneNumber, recordOpeningHours, recordCheckinInstructions]
-        print(f"Adding '{recordName}' to database.")
+        print(f"Adding '{recordName}' to the database.")
 
         try:
             conn = connect_db()
@@ -79,12 +78,12 @@ def addRecord():
             print(infoMessage)
             return (infoMessage)
 
-@app.route("/DeleteRecord", methods=['POST'])
+@app.route('/DeleteRecord', methods=['POST'])
 def deleteRecord():
 
-    if request.method =='POST':
+    if (request.method =='POST'):
         recordName = request.form.get('recordName', default="Error")
-        print(f"Deleting '{recordName}' from database.")
+        print(f"Deleting '{recordName}' from the database.")
 
         try:
             conn = sqlite3.connect(DATABASE)
@@ -102,35 +101,38 @@ def deleteRecord():
             print(infoMessage)
             return (infoMessage)
 
-@app.route("/EditRecord", methods=['POST'])
-def editRecord():
-
-    print('Processing record.')
-    infoMessage = ('Add record failed.')
+@app.route('/UpdateRecord', methods=['POST'])
+def updateRecord():
 
     if (request.method == 'POST'):
-        recordName = request.form['recordName']
-        recordAddress = request.form['recordAddress']
-        recordMainPhotos = request.form['recordMainPhotos']
-        recordAdditionalPhotos = request.form['recordAdditionalPhotos']
-        recordDescription = request.form['recordDescription']
-        recordWebsite = request.form['recordWebsite']
-        recordEmail = request.form['recordEmail']
-        recordPhoneNumber = request.form['recordPhoneNumber']
-        recordOpeningHours = request.form['recordOpeningHours']
-        recordCheckinInstructions = request.form['recordCheckinInstructions']
+        recordName = request.form.get('recordName', default="Error")
+        recordAddress = request.form.get('recordAddress', default="Error")
+        recordMainPhotos = request.form.get('recordMainPhotos', default="Error")
+        recordAdditionalPhotos = request.form.get('recordAdditionalPhotos', default="Error")
+        recordDescription = request.form.get('recordDescription', default="Error")
+        recordWebsite = request.form.get('recordWebsite', default="Error")
+        recordEmail = request.form.get('recordEmail', default="Error")
+        recordPhoneNumber = request.form.get('recordPhoneNumber', default="Error")
+        recordOpeningHours = request.form.get('recordOpeningHours', default="Error")
+        recordCheckinInstructions = request.form.get('recordCheckinInstructions', default="Error")
         recordData = [recordName, recordAddress, recordMainPhotos, recordAdditionalPhotos, recordDescription, recordWebsite, recordEmail, recordPhoneNumber, recordOpeningHours, recordCheckinInstructions]
+        print(f"Updating '{recordName}' in the database.")
 
-        conn = sqlite3.connect(DATABASE)
-        cur = conn.cursor()
-        cur.execute("UPDATE coworking_spaces SET 'Name' = ?, 'Address' = ?, 'Main_Photo' = ?, 'Additional_Photos' = ?, 'Description' = ?, 'Website' = ?, 'Email' = ?, 'Phone_Number' = ?, 'Opening_Hours' = ?, 'Checkin_Instructions' = ? WHERE Name=?;", [recordName, recordAddress, recordMainPhotos, recordAdditionalPhotos, recordDescription, recordWebsite, recordEmail, recordPhoneNumber, recordOpeningHours, recordCheckinInstructions, recordName])
-        conn.commit()
-        conn.close()
+        try:
+            conn = sqlite3.connect(DATABASE)
+            cur = conn.cursor()
+            cur.execute("UPDATE coworking_spaces SET 'Name' = ?, 'Address' = ?, 'Main_Photo' = ?, 'Additional_Photos' = ?, 'Description' = ?, 'Website' = ?, 'Email' = ?, 'Phone_Number' = ?, 'Opening_Hours' = ?, 'Checkin_Instructions' = ? WHERE Name=?;", [recordName, recordAddress, recordMainPhotos, recordAdditionalPhotos, recordDescription, recordWebsite, recordEmail, recordPhoneNumber, recordOpeningHours, recordCheckinInstructions, recordName])
+            conn.commit()
+            infoMessage = (f"Updated: '{recordName}'.")
 
-        infoMessage = (f'Updated: {recordData}')
+        except:
+            conn.rollback()
+            infoMessage = (f"Error updating record.")
 
-    print(infoMessage)
-    return (infoMessage)
+        finally:
+            conn.close()
+            print(infoMessage)
+            return (infoMessage)
 
 if __name__ == "__main__":
     app.run(debug=True)