fix show as verified the unverifiable places that are visited (#145)

* fix show verified unverifiable * fix
mauriciabad · Nov 8, 2023 · 2cbe1c9 · 2cbe1c9
1 parent 76f6fcf
commit 2cbe1c9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 14 deletions.
diff --git a/src/app/[locale]/(app)/missions/_components/verificate-place-visit-modal.tsx b/src/app/[locale]/(app)/missions/_components/verificate-place-visit-modal.tsx
@@ -29,6 +29,10 @@ import { DividerWithText } from '~/components/generic/divider-with-text'
 import { ExplanationCard } from '~/components/generic/explanation-card'
 import { LinkButton } from '~/components/links/link-button'
 import { MapPoint } from '~/helpers/spatial-data'
+import {
+  VerificationRequirements,
+  isVerificationRequired,
+} from '~/server/db/constants/verifications'
 import { trpc } from '~/trpc'
 import { useLocationValidator } from '../_hooks/useLocationValidator'
 
@@ -46,10 +50,7 @@ export const VerificatePlaceVisitModal: FC<
     expectedLocation: MapPoint
     placeId: number
     isAlreadyVisited: boolean
-    verificationRequirements: {
-      isLocationRequired: boolean
-      maxLocationDistance: number | null
-    } | null
+    verificationRequirements: VerificationRequirements | null
   }
 > = ({
   isOpen,
@@ -146,8 +147,7 @@ export const VerificatePlaceVisitModal: FC<
             {session ? (
               <ModalBody className="block space-y-2 pb-6 pt-0">
                 <>
-                  {verificationRequirements &&
-                  verificationRequirements.isLocationRequired ? (
+                  {isVerificationRequired(verificationRequirements) ? (
                     <>
                       {verificationRequirements.isLocationRequired && (
                         <>

diff --git a/src/server/api/router/missions.ts b/src/server/api/router/missions.ts
@@ -170,15 +170,17 @@ export const missionsRouter = router({
               const hasBeenVisited = visitedPlacesIds.has(place.id)
               const lastVerification =
                 verifications.length > 0 ? verifications[0] : null
-
+              const isVerificationRequired =
+                place.verificationRequirements &&
+                place.verificationRequirements.isLocationRequired
               return {
                 ...place,
                 location: getPoint(location),
                 categories: categories.map(({ category }) => category),
                 images: [],
                 missionStatus: {
                   visited: hasBeenVisited,
-                  verified: place.verificationRequirements
+                  verified: isVerificationRequired
                     ? Boolean(lastVerification)
                     : hasBeenVisited,
                 },

diff --git a/src/server/db/constants/missions.ts b/src/server/db/constants/missions.ts
@@ -2,6 +2,7 @@ import {
   PlaceCategoryColor,
   PlaceCategoryIcon as PlaceCategoryIconType,
 } from '~/server/db/constants/places'
+import { VerificationRequirements } from './verifications'
 
 export type VisitMissionPlace = {
   id: number
@@ -30,10 +31,7 @@ export type VisitMissionPlace = {
     visited: boolean
     verified: boolean
   }
-  verificationRequirements: {
-    isLocationRequired: boolean
-    maxLocationDistance: number | null
-  } | null
+  verificationRequirements: VerificationRequirements | null
 }
 
 export type VisitMission = {

diff --git a/src/server/db/constants/verifications.ts b/src/server/db/constants/verifications.ts
@@ -0,0 +1,14 @@
+import { InferSelectModel } from 'drizzle-orm'
+import { verificationRequirements } from '../schema'
+
+export type VerificationRequirements = InferSelectModel<
+  typeof verificationRequirements
+>
+
+export function isVerificationRequired<T extends VerificationRequirements>(
+  verificationRequirements: T | null
+): verificationRequirements is T {
+  if (!verificationRequirements) return false
+
+  return verificationRequirements.isLocationRequired
+}
diff --git a/src/server/helpers/spatial-data.ts b/src/server/helpers/spatial-data.ts
@@ -1,5 +1,3 @@
-import 'server-only'
-
 import { DriverValueMapper, sql } from 'drizzle-orm'
 import { customType } from 'drizzle-orm/mysql-core'
 import {