fix: set constructor type

app/tipping/add-tips/[race-id]/actions/submit-tip.tsx

@@ -310,7 +310,7 @@ export async function submitChanges(input: Record<string, any>) {
     )
 
     const driverKeys = DRIVER_RACE_PREDICTION_FIELDS
-    const constructorKeys = ['constructorWithMostPoints'] as const
+    const constructorKeys = CONSTRUCTOR_RACE_PREDICTION_FIELDS
 
     driverKeys.forEach((key) => {
       const givenId = body[key]?.id

app/tipping/add-tips/[race-id]/page.tsx

@@ -18,7 +18,7 @@ import { eq } from 'drizzle-orm'
 import {
   getClosedFields,
   getIsSprint,
-  getPositionType,
+  getTipTypeFromPosition,
   isPredictionForRace,
   isRaceAbleToBeTipped,
 } from '@/lib/utils/prediction-fields'
@@ -164,7 +164,9 @@ export default async function RaceFormPage({
           return acc
         }
         const savedTip =
-          getPositionType(position) === 'driver' ? tip.driver : tip.constructor
+          getTipTypeFromPosition(position) === 'driver'
+            ? tip.driver
+            : tip.constructor
         if (!savedTip) {
           return acc
         }

app/tipping/group-admin/_components/create-edit-tip-dialog.tsx

@@ -23,7 +23,12 @@ import {
 import UserAvatar from '@/components/user-avatar'
 import { RACE_PREDICTION_FIELDS, RacePredictionField } from '@/constants'
 import { Database } from '@/db/types'
-import { getIsSprint, getLabel } from '@/lib/utils/prediction-fields'
+import {
+  getIsSprint,
+  getLabel,
+  getTipTypeFromPosition,
+  TipType,
+} from '@/lib/utils/prediction-fields'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { isFuture } from 'date-fns'
 import { LucideInfo, LucidePlus, LucideTriangleAlert } from 'lucide-react'
@@ -96,7 +101,11 @@ export default function CreateOrEditTipDialog({
     RacePredictionField[]
   >([...RACE_PREDICTION_FIELDS])
 
-  const [tipType, setTipType] = React.useState<'constructor' | 'driver'>()
+  const [tipType, setTipType] = React.useState<TipType>(
+    defaultValues?.position
+      ? getTipTypeFromPosition(defaultValues.position)
+      : 'driver',
+  )
 
   const [message, setMessage] = React.useState<{
     title: string
@@ -173,11 +182,12 @@ export default function CreateOrEditTipDialog({
   )
 
   function onPositionChange(position: RacePredictionField | undefined) {
-    if (position === 'constructorWithMostPoints') {
-      setTipType('constructor')
+    if (!position) {
+      setTipType('driver')
       return
     }
-    setTipType('driver')
+    const type = getTipTypeFromPosition(position)
+    setTipType(type)
   }
 
   function onRaceChange(raceId: RaceOption['id'] | undefined) {

app/tipping/group-admin/_utils/create-tip-action.ts

@@ -11,6 +11,7 @@ import { revalidateTag } from 'next/cache'
 import { CacheTag } from '@/constants/cache'
 import { eq } from 'drizzle-orm'
 import { RacePredictionField } from '@/constants'
+import { getTipTypeFromPosition } from '@/lib/utils/prediction-fields'
 
 export async function createTip(data: Schema): Promise<ServerResponse> {
   const result = await verifyRequest(data)
@@ -193,7 +194,7 @@ export async function updateTip(
 }
 
 function getValueObject(data: Schema) {
-  const isForDriver = data.position !== 'constructorWithMostPoints'
+  const isForDriver = getTipTypeFromPosition(data.position) === 'driver'
   return isForDriver
     ? {
         driverId: data.valueId,

lib/utils/prediction-fields.ts

@@ -16,23 +16,6 @@ export function isPredictionForRace(
   return RACE_PREDICTION_FIELDS.includes(position as RacePredictionField)
 }
 
-export function getPositionType(
-  position: PredictionField,
-): 'driver' | 'constructor' {
-  switch (position) {
-    case 'sprintP1':
-    case 'pole':
-    case 'p1':
-    case 'p10':
-    case 'last':
-    case 'championshipDriver':
-      return 'driver'
-    case 'constructorWithMostPoints':
-    case 'championshipConstructor':
-      return 'constructor'
-  }
-}
-
 export function getIsSprint(race: Pick<Database.Race, 'sprintQualifyingDate'>) {
   return !!race.sprintQualifyingDate
 }
@@ -152,3 +135,16 @@ export function getLabel(
   }
   return positionToLabel[position]
 }
+
+export type TipType = 'driver' | 'constructor'
+export function getTipTypeFromPosition(position: RacePredictionField): TipType {
+  const positionToType: Record<RacePredictionField, TipType> = {
+    sprintP1: 'driver',
+    pole: 'driver',
+    p1: 'driver',
+    p10: 'driver',
+    last: 'driver',
+    constructorWithMostPoints: 'constructor',
+  }
+  return positionToType[position]
+}