codemicro/duck-pond
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Format everything

Browse source 
Signed-off-by: AKP <tom@tdpain.net>
This commit is contained in:
akp 2022-10-30 07:34:02 +00:00
parent 753404f72d
commit f232c3478f
No known key found for this signature in database
GPG key ID: AA5726202C8879B7
4 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/duckpond/__main__.py
View file

@ -5,7 +5,7 @@ import db
import endpoints
__version__ = '0.1.0'
__version__ = "0.1.0"
def main():

55
backend/duckpond/db.py
View file

@ -82,18 +82,24 @@ class DB:
def _setup(self):
cursor = self.conn.cursor()
cursor.execute('''
cursor.execute(
"""
CREATE TABLE IF NOT EXISTS entries
([ID] INTEGER PRIMARY KEY, [title] TEXT, [latitude] FLOAT, [longitude] FLOAT, [votes] INTEGER, [image_url], STRING)
''')
cursor.execute('''
"""
)
cursor.execute(
"""
CREATE TABLE IF NOT EXISTS users
([ID] INTEGER PRIMARY KEY, [username] TEXT, [password_salt] TEXT, [password_hash] TEXT)
''')
cursor.execute('''
"""
)
cursor.execute(
"""
CREATE TABLE IF NOT EXISTS places_visited
([ID] INTEGER PRIMARY KEY, [userID] INTEGER, [entryID] INTEGER)
''')
"""
)
self.conn.commit()
cursor.close()
@ -101,7 +107,7 @@ class DB:
def getAllEntries(self):
arrayEntries = []
cursor = self.conn.cursor()
cursor.execute('SELECT * FROM entries')
cursor.execute("SELECT * FROM entries")
result = cursor.fetchall()
cursor.close()
@ -113,27 +119,34 @@ class DB:
def getEntry(self, ID):
cursor = self.conn.cursor()
cursor.execute('SELECT * FROM entries WHERE ID = ?', ID)
cursor.execute("SELECT * FROM entries WHERE ID = ?", ID)
result = cursor.fetchall()
cursor.close()
entry = Entry(result[0], result[1], result[2],
result[3], result[4], result[5])
entry = Entry(result[0], result[1], result[2], result[3], result[4], result[5])
return entry
def addEntry(self, entry):
insertArray = [entry.name, entry.location_lat, entry.location_long, entry.votes, entry.image_url]
insertArray = [
entry.name,
entry.location_lat,
entry.location_long,
entry.votes,
entry.image_url,
]
cursor = self.conn.cursor()
cursor.execute(
'INSERT INTO entries (title, latitude, longitude, votes, image_url) VALUES (?, ?, ?, ?, ?);', insertArray)
"INSERT INTO entries (title, latitude, longitude, votes, image_url) VALUES (?, ?, ?, ?, ?);",
insertArray,
)
self.conn.commit()
cursor.close()
def deleteEntry(self, ID):
cursor = self.conn.cursor()
cursor.execute('DELETE FROM entries WHERE ID = ?', ID)
cursor.execute("DELETE FROM entries WHERE ID = ?", ID)
self.conn.commit()
cursor.close()
@ -148,13 +161,15 @@ class DB:
cursor = self.conn.cursor()
cursor.execute(
'UPDATE entries SET title = ?, latitude = ?, longitude = ?, votes = ?, image_url = ?;', updateArray)
"UPDATE entries SET title = ?, latitude = ?, longitude = ?, votes = ?, image_url = ?;",
updateArray,
)
self.conn.commit()
cursor.close()
def getUser(self, ID):
cursor = self.conn.cursor()
cursor.execute('SELECT * FROM users WHERE ID = ?', ID)
cursor.execute("SELECT * FROM users WHERE ID = ?", ID)
result = cursor.fetchall()
cursor.close()
@ -170,20 +185,22 @@ class DB:
cursor = self.conn.cursor()
cursor.execute(
'INSERT INTO user (username, password_salt, password_hash) VALUES (?, ?, ?);', insertArray)
"INSERT INTO user (username, password_salt, password_hash) VALUES (?, ?, ?);",
insertArray,
)
self.conn.commit()
cursor.close()
def deleteUser(self, ID):
cursor = self.conn.cursor()
cursor.execute('DELETE FROM users WHERE ID = ?', ID)
cursor.execute("DELETE FROM users WHERE ID = ?", ID)
self.conn.commit()
cursor.close()
def getUserLocations(self, ID):
array_locations = []
cursor = self.conn.cursor()
cursor.execute('SELECT * FROM places_visited WHERE userID = ?', ID)
cursor.execute("SELECT * FROM places_visited WHERE userID = ?", ID)
result = cursor.fetchall()
cursor.close()
@ -195,6 +212,6 @@ class DB:
def deleteUserLocation(self, ID):
cursor = self.conn.cursor()
cursor.execute('DELETE FROM places_visited WHERE ID = ?', ID)
cursor.execute("DELETE FROM places_visited WHERE ID = ?", ID)
self.conn.commit()
cursor.close()

16
backend/duckpond/endpoints.py
View file

@ -12,14 +12,14 @@ class Endpoints:
def __init__(self, app: flask.Flask, database: db.DB):
self.db = database
app.add_url_rule(paths.ENTRIES, view_func=self.list_entries, methods=["GET"])
app.add_url_rule(paths.GET_ENTRY, view_func=self.get_entry, methods=["GET"])
app.add_url_rule(
paths.ENTRIES, view_func=self.list_entries, methods=["GET"])
paths.UPDATE_ENTRY, view_func=self.update_entry, methods=["PATCH"]
)
app.add_url_rule(
paths.GET_ENTRY, view_func=self.get_entry, methods=["GET"])
app.add_url_rule(paths.UPDATE_ENTRY,
view_func=self.update_entry, methods=["PATCH"])
app.add_url_rule(paths.CREATE_ENTRY,
view_func=self.create_entry, methods=["POST"])
paths.CREATE_ENTRY, view_func=self.create_entry, methods=["POST"]
)
def list_entries(self):
entries = self.db.getAllEntries()
@ -64,6 +64,4 @@ class Endpoints:
self.db.addEntry(new_entry)
return flask.jsonify({
"id": new_entry.id
})
return flask.jsonify({"id": new_entry.id})

2
backend/duckpond/paths.py
View file

@ -1,4 +1,4 @@
ENTRIES = "/entries"
GET_ENTRY = "/entry/<entry_id>"
UPDATE_ENTRY = "/entry/<entry_id>"
CREATE_ENTRY = "/entry"
CREATE_ENTRY = "/entry"