cleanup

server.cpp

@@ -166,9 +166,11 @@ int main()
 		connect();
 		crow::json::wvalue entries;
 
-		//prep_stmt = con->prepareStatement("INSERT INTO practice_sessions (description, seconds, practice_category_id) VALUES (?, ?, ?)");
+		prep_stmt = con->prepareStatement("SELECT practice_sessions.id, practice_sessions.description, seconds, songs.id AS song_id, songs.title, comments, created_at, practice_categories.name AS category, instruments.name AS instrument "
-		//ResultSet *res = stmt->executeQuery("call show_category("+to_string(category_id)+");");
+				"FROM practice_sessions JOIN practice_categories ON practice_category_id = practice_categories.id "
-		prep_stmt = con->prepareStatement("SELECT practice_sessions.id, practice_sessions.description, seconds, songs.id AS song_id, songs.title, comments, created_at, practice_categories.name AS category, instruments.name AS instrument FROM practice_sessions JOIN practice_categories ON practice_category_id = practice_categories.id JOIN instruments ON instrument_id = instruments.id LEFT JOIN songs_practiced ON practice_sessions.id = songs_practiced.practice_session_id LEFT JOIN songs ON songs_practiced.song_id = songs.id WHERE practice_category_id = ? ORDER BY practice_sessions.id DESC;");
+				"JOIN instruments ON instrument_id = instruments.id "
+				"LEFT JOIN songs_practiced ON practice_sessions.id = songs_practiced.practice_session_id "
+				"LEFT JOIN songs ON songs_practiced.song_id = songs.id WHERE practice_category_id = ? ORDER BY practice_sessions.id DESC;");
 		prep_stmt->setInt(1, category_id);
 		ResultSet *res = prep_stmt->executeQuery();