Fix performance issues caused by cartesian explosion

Oliveriver · Aug 20, 2024 · 201431f · 201431f
1 parent 87db1b2
commit 201431f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/client/src/components/context/WorldContext.tsx b/client/src/components/context/WorldContext.tsx
@@ -65,7 +65,7 @@ export const WorldContextProvider = ({ children }: PropsWithChildren) => {
       submitOrders: async (orders: Order[]) => {
         if (!game || !world) return;
         const players = game.player ? [game.player] : Object.values(Nation);
-        submitOrders({ gameId: game.id, players, orders });
+        await submitOrders({ gameId: game.id, players, orders });
         await refetchUntilUpdate();
       },
       isLoading: isLoading || isSubmitting || isRefetching || isWaitingForAdjudication,

diff --git a/client/src/hooks/api/useSubmitOrders.tsx b/client/src/hooks/api/useSubmitOrders.tsx
@@ -20,11 +20,11 @@ const submitOrders = async ({ gameId, players, orders }: SubmissionRequest) => {
 };
 
 const useSubmitOrders = () => {
-  const { mutate, ...rest } = useMutation({
+  const { mutateAsync, ...rest } = useMutation({
     mutationKey: ['submitOrders'],
     mutationFn: submitOrders,
   });
-  return { submitOrders: mutate, ...rest };
+  return { submitOrders: mutateAsync, ...rest };
 };
 
 export default useSubmitOrders;
diff --git a/server/Repositories/WorldRepository.cs b/server/Repositories/WorldRepository.cs
@@ -21,6 +21,7 @@ public async Task<World> GetWorld(int gameId)
             .Include(w => w.Boards).ThenInclude(b => b.Centres)
             .Include(w => w.Boards).ThenInclude(b => b.Units)
             .Include(w => w.Orders).ThenInclude(o => o.Unit)
+            .AsSplitQuery() // TODO wrap database operations in shared lock to prevent concurrency issues
             .FirstOrDefaultAsync(w => w.GameId == gameId)
             ?? throw new KeyNotFoundException("World not found");