Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions sweepy-ui/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import SweepstakeDetail from "./components/SweepstakeDetail";
import ApiClient from "./Api";

const App = () => {
const [loading, setLoading] = useState(false);
const [error, setError] = useState(null);
const [displayHome, setDisplayHome] = useState(true);
const [displayCreateForm, setDisplayCreateForm] = useState(false);
Expand Down Expand Up @@ -39,8 +40,18 @@ const App = () => {
};

useEffect(() => {
fetchEventTypes();
fetchAllSweepstakes();
setLoading(true);
Promise.all([apiClient.getEventTypes(), apiClient.getAllSweepstakes()])
.then(([eventTypes, allSweepstakes]) => {
setEventTypes(eventTypes);
setAllSweepstakes(allSweepstakes);
})
.catch((error) => {
setError("Failed to fetch initial data");
})
.finally(() => {
setLoading(false);
});
}, []);

const handleCreateApiResponse = (responseData) => {
Expand Down Expand Up @@ -113,7 +124,9 @@ const App = () => {

const mainComponent = () => {
let component;
if (displayHome) {
if (loading) {
component = <p>Loading...</p>;
} else if (displayHome) {
component = (
<Home
setDisplayCreateForm={setDisplayCreateForm}
Expand Down
2 changes: 0 additions & 2 deletions sweepy-ui/src/components/LeaderboardTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ function LeaderboardTable({ data }) {
score: (val) => stringifyScore(val),
};

console.log("Leaderboard data:", allAssignments);

return (
<SortableTable
sortableColumns={columns}
Expand Down
3 changes: 3 additions & 0 deletions sweepy/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,9 @@ def refresh_sweepstake(
__bf_client, sweepstake, session
)

if updated_sweepstake.has_leaderboard:
generate_sweepstakes.refresh_sweepstake_leaderboard

session.refresh(updated_sweepstake)

resp = generate_sweepstakes.convert_db_model_to_response(updated_sweepstake)
Expand Down
4 changes: 3 additions & 1 deletion sweepy/generate_sweepstakes.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ def refresh_sweepstake_leaderboard(
client: LiveGolfClient,
sweepstake_db: db_models.Sweepstakes,
session: sqlmodel.Session,
):
) -> db_models.Sweepstakes:
"""
Refresh the sweepstakes leaderboard by re-fetching the market data and updating the participants.
"""
Expand Down Expand Up @@ -308,3 +308,5 @@ def refresh_sweepstake_leaderboard(

session.commit()
logging.info(f"Refreshed sweepstakes leaderboard for {sweepstake_db.id}")

return sweepstake_db