fix: types, db import

NOTES.md

@@ -46,6 +46,7 @@
 - [ ] "Serious mode" for LoadingBuddy for e.g. unsubscribe requests
 - [ ] Notification when target email is denylisted on record creation
 - [ ] Replace shared API lib dir with Yarn "shared package" workspace
+- [ ] Add advanced crash logging
 - [x] Resend confirmation if an RSVP enters an existing email
 - [x] Captcha
 - [x] Hold RSVP locally with cookie

api/src/functions/graphql.ts

@@ -6,9 +6,9 @@ import directives from 'src/directives/**/*.{js,ts}'
 import sdls from 'src/graphql/**/*.sdl.{js,ts}'
 import services from 'src/services/**/*.{js,ts}'
 
-import { db } from 'src/lib/backend/db'
 import { logger } from 'src/lib/backend/logger'
 import { wrap } from 'src/lib/backend/sentry'
+import { db } from 'src/lib/db'
 
 const baseHandler = createGraphQLHandler({
   loggerConfig: { logger, options: {} },

api/src/lib/backend/email/send.test.ts

@@ -1,6 +1,6 @@
 import { InMemoryMailHandler } from '@redwoodjs/mailer-handler-in-memory'
 
-import { db } from '../db'
+import { db } from '../../db'
 import { mailer } from '../mailer'
 
 import { sendEmail } from './send'

api/src/lib/backend/email/send.ts

@@ -1,7 +1,7 @@
 import { MAIL_SENDER } from 'src/api.config'
 import { mailer } from 'src/lib/backend/mailer'
 
-import { db } from '../db'
+import { db } from '../../db'
 import { logger } from '../logger'
 
 import { Plain } from './plain'

api/src/lib/backend/schedule/reminder.test.ts

@@ -1,4 +1,4 @@
-import { db } from '../db'
+import { db } from '../../db'
 
 import { sendOutstandingReminders } from './reminder'
 

api/src/lib/backend/schedule/reminder.ts

@@ -1,4 +1,4 @@
-import { db } from '../db'
+import { db } from '../../db'
 import { sendReminder } from '../email/template/reminder'
 import { logger } from '../logger'
 

api/src/lib/backend/tidy.test.ts

@@ -1,7 +1,8 @@
 import { randomString, randomInteger } from 'remeda'
 import { Event, Response } from 'types/graphql'
 
-import { db } from './db'
+import { db } from '../db'
+
 import { tidyUnconfirmedEvents, tidyUnconfirmedResponses } from './tidy'
 
 function buildEvent(overrides: Partial<Event> = {}): Omit<Event, 'responses'> {

api/src/lib/backend/tidy.ts

@@ -1,6 +1,7 @@
 import dayjs from 'src/lib/shared/dayjs'
 
-import { db } from './db'
+import { db } from '../db'
+
 import { logger } from './logger'
 
 const UNCONFIRMED_EXPIRY = dayjs.duration(24, 'hours')

api/src/lib/backend/db.ts → api/src/lib/db.ts

@@ -5,7 +5,7 @@ import { PrismaClient } from '@prisma/client'
 
 import { emitLogLevels, handlePrismaLogging } from '@redwoodjs/api/logger'
 
-import { logger } from './logger'
+import { logger } from './backend/logger'
 
 const prismaClient = new PrismaClient({
   log: emitLogLevels(['info', 'warn', 'error']),

api/src/services/events/events.ts

@@ -7,14 +7,14 @@ import type {
 import { RedwoodError, validate } from '@redwoodjs/api'
 
 import { validateCaptcha } from 'src/lib/backend/captcha'
-import { db } from 'src/lib/backend/db'
 import { sendEventDetails } from 'src/lib/backend/email/template/event'
 import {
   notifyEventCreated,
   notifyEventUpdated,
 } from 'src/lib/backend/notify/event'
 import { summarize } from 'src/lib/backend/response'
 import { generateToken, alphaLower } from 'src/lib/backend/token'
+import { db } from 'src/lib/db'
 import dayjs from 'src/lib/shared/dayjs'
 import { checkVisibility } from 'src/lib/shared/visibility'
 

api/src/services/ignoredEmails/ignoredEmails.test.ts

@@ -1,5 +1,5 @@
-import { db } from 'src/lib/backend/db'
 import { sign } from 'src/lib/backend/sign'
+import { db } from 'src/lib/db'
 
 import {
   createIgnoredEmail,

api/src/services/ignoredEmails/ignoredEmails.ts

@@ -2,8 +2,8 @@ import type { QueryResolvers, MutationResolvers } from 'types/graphql'
 
 import { RedwoodError } from '@redwoodjs/api'
 
-import { db } from 'src/lib/backend/db'
 import { verify } from 'src/lib/backend/sign'
+import { db } from 'src/lib/db'
 
 const ERROR_MSG = 'Could not validate your request'
 

api/src/services/responses/responses.test.ts

@@ -1,6 +1,6 @@
 import duration from 'dayjs/plugin/duration'
 
-import { db } from 'src/lib/backend/db'
+import { db } from 'src/lib/db'
 import dayjs from 'src/lib/shared/dayjs'
 
 import {

api/src/services/responses/responses.ts

@@ -8,7 +8,6 @@ import type {
 import { RedwoodError } from '@redwoodjs/api'
 
 import { validateCaptcha } from 'src/lib/backend/captcha'
-import { db } from 'src/lib/backend/db'
 import {
   // sendNewResponseReceived,
   sendResponseConfirmation,
@@ -19,6 +18,7 @@ import {
   notifyResponseDeleted,
 } from 'src/lib/backend/notify/response'
 import { generateToken } from 'src/lib/backend/token'
+import { db } from 'src/lib/db'
 import dayjs from 'src/lib/shared/dayjs'
 import { reminderDurations } from 'src/lib/shared/reminder'
 
@@ -59,6 +59,8 @@ export const responseByEditToken: QueryResolvers['responseByEditToken'] =
       include: { event: true, reminders: true },
     })
 
+    if (!resp) throw new RedwoodError("Sorry, we couldn't find that RSVP.")
+
     if (!resp.confirmed) {
       const updated = await db.response.update({
         where: { editToken },

scripts/seed.ts

@@ -1,5 +1,6 @@
 import type { Prisma } from '@prisma/client'
-import { db } from 'api/src/lib/db'
+
+import { db } from '../api/src/lib/backend/db'
 
 export default async () => {
   try {

web/src/components/PageHead/PageHead.tsx

@@ -1,6 +1,6 @@
 import { Metadata } from '@redwoodjs/web'
 
-import { SITE_URL } from 'src/lib/shared/shared.config'
+import { SITE_URL } from 'src/apiLibShared/shared.config'
 
 import Typ from '../Typ/Typ'
 

web/src/components/ResponseForm/ResponseForm.tsx

@@ -64,8 +64,11 @@ const ResponseForm = (props: Props) => {
   const { formState, getValues } = formMethods
 
   const { email } = getValues()
-  const forbidResubmit =
-    email === error?.cause?.extensions?.['forbidResubmitForEmail']
+  const forbidResubmit = (() => {
+    if (!email) return false
+    return email === error?.cause?.extensions?.['forbidResubmitForEmail']
+  })()
+  console.log({ email, error, forbidResubmit })
 
   const [exampleName, setExampleName] = useState('')
   useEffect(() => {