refactor(api): stages → src/api modules (Effort 1)

src/hooks/queries/stages/types.ts → src/api/stages/types.ts

@@ -2,7 +2,6 @@ import type { Database } from "@/integrations/supabase/types";
 
 export type Stage = Database["public"]["Tables"]["stages"]["Row"];
 
-// Query key factory
 export const stagesKeys = {
   all: ["stages"] as const,
   byEdition: (editionId: string) => ["stages", { editionId }] as const,

src/hooks/queries/stages/useStageQuery.ts → src/api/stages/useStageQuery.ts

@@ -1,8 +1,9 @@
-import { useQuery } from "@tanstack/react-query";
+import { queryOptions, useQuery } from "@tanstack/react-query";
 import { supabase } from "@/integrations/supabase/client";
-import { Stage, stagesKeys } from "./types";
+import type { Stage } from "./types";
+import { stagesKeys } from "./types";
 
-async function fetchStage(stageId: string): Promise<Stage | null> {
+export async function fetchStage(stageId: string): Promise<Stage | null> {
   const { data, error } = await supabase
     .from("stages")
     .select("*")
@@ -12,7 +13,6 @@ async function fetchStage(stageId: string): Promise<Stage | null> {
 
   if (error) {
     if (error.code === "PGRST116") {
-      // No rows returned
       return null;
     }
     throw new Error("Failed to load stage");
@@ -21,10 +21,16 @@ async function fetchStage(stageId: string): Promise<Stage | null> {
   return data;
 }
 
+export function stageQuery(stageId: string) {
+  return queryOptions({
+    queryKey: stagesKeys.byId(stageId),
+    queryFn: () => fetchStage(stageId),
+  });
+}
+
 export function useStageQuery(stageId: string | undefined | null) {
   return useQuery({
-    queryKey: stagesKeys.byId(stageId || ""),
-    queryFn: () => fetchStage(stageId!),
+    ...stageQuery(stageId ?? ""),
     enabled: !!stageId,
   });
 }

src/hooks/queries/stages/useStagesByEdition.ts → src/api/stages/useStagesByEdition.ts

@@ -1,9 +1,12 @@
-import { useQuery } from "@tanstack/react-query";
+import { queryOptions, useQuery } from "@tanstack/react-query";
 import { supabase } from "@/integrations/supabase/client";
-import { Stage, stagesKeys } from "./types";
+import type { Stage } from "./types";
+import { stagesKeys } from "./types";
 import { sortStagesByOrder } from "@/lib/stageUtils";
 
-async function fetchStagesByEdition(editionId: string): Promise<Stage[]> {
+export async function fetchStagesByEdition(
+  editionId: string,
+): Promise<Stage[]> {
   const { data, error } = await supabase
     .from("stages")
     .select("*")
@@ -15,14 +18,19 @@ async function fetchStagesByEdition(editionId: string): Promise<Stage[]> {
     throw new Error("Failed to load stages for edition");
   }
 
-  // Apply custom sorting using shared utility
   return sortStagesByOrder(data || []);
 }
 
+export function stagesByEditionQuery(editionId: string) {
+  return queryOptions({
+    queryKey: stagesKeys.byEdition(editionId),
+    queryFn: () => fetchStagesByEdition(editionId),
+  });
+}
+
 export function useStagesByEditionQuery(editionId: string | undefined) {
   return useQuery({
-    queryKey: stagesKeys.byEdition(editionId || ""),
-    queryFn: () => fetchStagesByEdition(editionId!),
+    ...stagesByEditionQuery(editionId ?? ""),
     enabled: !!editionId,
   });
 }

src/components/Admin/ScheduleImport/ReviewStage.tsx

@@ -10,8 +10,8 @@ import {
 } from "@/services/scheduleImport/types";
 import { artistsKeys } from "@/hooks/queries/artists/useArtists";
 import { setsKeys } from "@/api/sets/types";
-import { stagesKeys } from "@/hooks/queries/stages/types";
-import { useStagesByEditionQuery } from "@/hooks/queries/stages/useStagesByEdition";
+import { stagesKeys } from "@/api/stages/types";
+import { useStagesByEditionQuery } from "@/api/stages/useStagesByEdition";
 import type { RevealLevel } from "@/lib/scheduleReveal";
 import { DiffReviewStep } from "./DiffReviewStep";
 

src/components/StagePin.test.tsx

@@ -1,11 +1,11 @@
 import { describe, expect, it, vi, beforeEach } from "vitest";
 import { render, screen } from "@testing-library/react";
 import { StagePin } from "./StagePin";
-import * as useStageQueryModule from "@/hooks/queries/stages/useStageQuery";
+import * as useStageQueryModule from "@/api/stages/useStageQuery";
 
 type StageQueryResult = ReturnType<typeof useStageQueryModule.useStageQuery>;
 
-vi.mock("@/hooks/queries/stages/useStageQuery");
+vi.mock("@/api/stages/useStageQuery");
 
 describe("StagePin", () => {
   beforeEach(() => {

src/components/StagePin.tsx

@@ -1,4 +1,4 @@
-import { useStageQuery } from "@/hooks/queries/stages/useStageQuery";
+import { useStageQuery } from "@/api/stages/useStageQuery";
 import { MapPin } from "lucide-react";
 
 export function StagePin({ stageId }: { stageId: string | null }) {

src/hooks/useScheduleData.ts

@@ -2,7 +2,7 @@ import { useMemo } from "react";
 import { formatDateTime } from "@/lib/timeUtils";
 import { format, startOfDay } from "date-fns";
 import type { FestivalSet } from "@/api/sets/types";
-import { Stage } from "./queries/stages/types";
+import type { Stage } from "@/api/stages/types";
 import { sortStagesByOrder } from "@/lib/stageUtils";
 
 export interface ScheduleDay {

src/lib/stageUtils.ts

@@ -1,4 +1,4 @@
-import type { Stage } from "@/hooks/queries/stages/types";
+import type { Stage } from "@/api/stages/types";
 
 /**
  * Sorts stages by priority: stages with order > 0 come first (sorted by order),

src/lib/timelineCalculator.ts

@@ -1,6 +1,6 @@
 import { differenceInMinutes } from "date-fns";
 import type { ScheduleSet, ScheduleDay } from "@/hooks/useScheduleData";
-import type { Stage } from "@/hooks/queries/stages/types";
+import type { Stage } from "@/api/stages/types";
 import { sortStagesByOrder } from "@/lib/stageUtils";
 
 export interface HorizontalTimelineSet extends ScheduleSet {

src/pages/EditionView/tabs/ArtistsTab/SetCard/SetMetadata.tsx

@@ -3,7 +3,7 @@ import { formatDayOnly, formatTimeRange } from "@/lib/timeUtils";
 import { GenreBadge } from "@/components/GenreBadge";
 import { StageBadge } from "@/components/StageBadge";
 import { useFestivalSet } from "../FestivalSetContext";
-import { useStageQuery } from "@/hooks/queries/stages/useStageQuery";
+import { useStageQuery } from "@/api/stages/useStageQuery";
 import { useScheduleReveal } from "@/hooks/useScheduleReveal";
 
 export function SetMetadata() {

src/pages/EditionView/tabs/ArtistsTab/filters/DesktopFilters.tsx

@@ -1,6 +1,6 @@
 import { Button } from "@/components/ui/button";
 import type { FilterSortState } from "@/hooks/useUrlState";
-import { useStagesByEditionQuery } from "@/hooks/queries/stages/useStagesByEdition";
+import { useStagesByEditionQuery } from "@/api/stages/useStagesByEdition";
 import { useScheduleReveal } from "@/hooks/useScheduleReveal";
 
 interface DesktopFiltersProps {

src/pages/EditionView/tabs/ArtistsTab/filters/MobileFilters.tsx

@@ -6,7 +6,7 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import type { FilterSortState } from "@/hooks/useUrlState";
-import { useStagesByEditionQuery } from "@/hooks/queries/stages/useStagesByEdition";
+import { useStagesByEditionQuery } from "@/api/stages/useStagesByEdition";
 import { useScheduleReveal } from "@/hooks/useScheduleReveal";
 
 interface MobileFiltersProps {

src/pages/EditionView/tabs/ScheduleTab/StageFilterButtons.tsx

@@ -1,6 +1,6 @@
 import { Button } from "@/components/ui/button";
 import { MapPin } from "lucide-react";
-import { useStagesByEditionQuery } from "@/hooks/queries/stages/useStagesByEdition";
+import { useStagesByEditionQuery } from "@/api/stages/useStagesByEdition";
 import { useFestivalEdition } from "@/contexts/FestivalEditionContext";
 
 interface StageFilterButtonsProps {

src/pages/EditionView/tabs/ScheduleTab/horizontal/Timeline.tsx

@@ -7,7 +7,7 @@ import { useFestivalEdition } from "@/contexts/FestivalEditionContext";
 import { useSetsByEditionQuery as useEditionSetsQuery } from "@/api/sets/useSetsByEdition";
 import { useTimelineUrlState } from "@/hooks/useTimelineUrlState";
 import { format } from "date-fns";
-import { useStagesByEditionQuery } from "@/hooks/queries/stages/useStagesByEdition";
+import { useStagesByEditionQuery } from "@/api/stages/useStagesByEdition";
 import { useScheduleReveal } from "@/hooks/useScheduleReveal";
 import { ScheduleNotRevealedPlaceholder } from "../ScheduleNotRevealedPlaceholder";
 

src/pages/EditionView/tabs/ScheduleTab/list/ListSchedule.tsx

@@ -6,7 +6,7 @@ import { isSameDay, format } from "date-fns";
 import { TimeSlotGroup } from "./TimeSlotGroup";
 import type { ScheduleSet } from "@/hooks/useScheduleData";
 import { useTimelineUrlState } from "@/hooks/useTimelineUrlState";
-import { useStagesByEditionQuery } from "@/hooks/queries/stages/useStagesByEdition";
+import { useStagesByEditionQuery } from "@/api/stages/useStagesByEdition";
 import { useScheduleReveal } from "@/hooks/useScheduleReveal";
 import { ScheduleNotRevealedPlaceholder } from "../ScheduleNotRevealedPlaceholder";
 

src/pages/ExploreSetPage/SetExploreCard/SetCardHeader.tsx

@@ -1,7 +1,7 @@
 import { Badge } from "@/components/ui/badge";
 import { Clock } from "lucide-react";
 import { StageBadge } from "@/components/StageBadge";
-import { useStageQuery } from "@/hooks/queries/stages/useStageQuery";
+import { useStageQuery } from "@/api/stages/useStageQuery";
 import { useScheduleReveal } from "@/hooks/useScheduleReveal";
 
 interface SetCardHeaderProps {

src/pages/admin/festivals/SetsTable.tsx

@@ -1,4 +1,4 @@
-import { useStagesByEditionQuery } from "@/hooks/queries/stages/useStagesByEdition";
+import { useStagesByEditionQuery } from "@/api/stages/useStagesByEdition";
 import {
   Table,
   TableBody,

src/pages/admin/festivals/StageManagement.tsx

@@ -1,8 +1,8 @@
 import { useState } from "react";
 import { useParams } from "@tanstack/react-router";
-import { useStagesByEditionQuery } from "@/hooks/queries/stages/useStagesByEdition";
-import { useDeleteStageMutation } from "@/hooks/queries/stages/useDeleteStage";
-import { Stage } from "@/hooks/queries/stages/types";
+import { useStagesByEditionQuery } from "@/api/stages/useStagesByEdition";
+import { useDeleteStageMutation } from "@/api/stages/useDeleteStage";
+import type { Stage } from "@/api/stages/types";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Loader2, MapPin } from "lucide-react";
 import { StagesTable } from "./StageManagement/StagesTable";

src/pages/admin/festivals/StageManagement/CreateStageDialog.tsx

@@ -1,5 +1,5 @@
 import { useState } from "react";
-import { useCreateStageMutation } from "@/hooks/queries/stages/useCreateStage";
+import { useCreateStageMutation } from "@/api/stages/useCreateStage";
 import {
   Dialog,
   DialogContent,

src/pages/admin/festivals/StageManagement/EditStageDialog.tsx

@@ -1,5 +1,5 @@
-import { useUpdateStageMutation } from "@/hooks/queries/stages/useUpdateStage";
-import { Stage } from "@/hooks/queries/stages/types";
+import { useUpdateStageMutation } from "@/api/stages/useUpdateStage";
+import type { Stage } from "@/api/stages/types";
 import {
   Dialog,
   DialogContent,

src/pages/admin/festivals/StageManagement/StagesTable.tsx

@@ -1,4 +1,4 @@
-import { Stage } from "@/hooks/queries/stages/types";
+import type { Stage } from "@/api/stages/types";
 import {
   Table,
   TableBody,

src/pages/admin/festivals/StageSelector.tsx

@@ -6,7 +6,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import { useStagesByEditionQuery } from "@/hooks/queries/stages/useStagesByEdition";
+import { useStagesByEditionQuery } from "@/api/stages/useStagesByEdition";
 
 export function StageSelector({
   value,