From bf5292fa6a3821bb7d0110152eb3772c7cd7cc9f Mon Sep 17 00:00:00 2001
From: Jordan Welch <jordanhwelch@gmail.com>
Date: Wed, 30 Oct 2024 21:10:01 -0500
Subject: [PATCH 1/4] newline between returns

---
 eslint.config.mjs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 8d64924..218c537 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -11,5 +11,9 @@ export default [
       'no-restricted-imports': ['error', {
         patterns: ['.*'], // Disable all relative imports
       }],
+      '@stylistic/padding-line-between-statements': [
+        'error',
+        { blankLine: 'always', prev: '*', next: 'return' },
+      ],
     },
   }]

From 423650ba04dbcc1a16ed498b797d993e7f3d79dc Mon Sep 17 00:00:00 2001
From: Jordan Welch <jordanhwelch@gmail.com>
Date: Wed, 30 Oct 2024 21:10:08 -0500
Subject: [PATCH 2/4] lint newlines

---
 .../__tests__/controllers/cacheEmailTemplatesController.spec.ts  | 1 +
 server/src/controllers/cacheWeeksController.ts                   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/server/__tests__/controllers/cacheEmailTemplatesController.spec.ts b/server/__tests__/controllers/cacheEmailTemplatesController.spec.ts
index 69430c0..a9228dc 100644
--- a/server/__tests__/controllers/cacheEmailTemplatesController.spec.ts
+++ b/server/__tests__/controllers/cacheEmailTemplatesController.spec.ts
@@ -23,6 +23,7 @@ let req: Request
 const newCacheController = () => {
   const config = mockConfig()
   const firestore = new FirestoreAdapter(config)
+
   return new CacheEmailTemplatesController(firestore)
 }
 
diff --git a/server/src/controllers/cacheWeeksController.ts b/server/src/controllers/cacheWeeksController.ts
index 37384bb..2e5fa1c 100644
--- a/server/src/controllers/cacheWeeksController.ts
+++ b/server/src/controllers/cacheWeeksController.ts
@@ -50,6 +50,7 @@ export default class CacheWeeksController {
       res.status(200).json(dto)
 
       await this.firestore.setGlobal('lastUpdated', meta)
+
       return
     }
 

From 14402c5a16ac014c3244c23927e8631247bede30 Mon Sep 17 00:00:00 2001
From: Jordan Welch <jordanhwelch@gmail.com>
Date: Wed, 30 Oct 2024 21:20:59 -0500
Subject: [PATCH 3/4] Add member-delimiter-style

---
 eslint.config.mjs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 218c537..b15f644 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -15,5 +15,18 @@ export default [
         'error',
         { blankLine: 'always', prev: '*', next: 'return' },
       ],
+      '@stylistic/member-delimiter-style': [
+        'error',
+        {
+          multiline: {
+            delimiter: 'none',
+          },
+          singleline: {
+            delimiter: 'comma',
+            requireLast: false,
+          },
+          multilineDetection: 'brackets',
+        },
+      ],
     },
   }]

From ef98da0d1806aedf3e18d32acbd51aa45c028a2c Mon Sep 17 00:00:00 2001
From: Jordan Welch <jordanhwelch@gmail.com>
Date: Wed, 30 Oct 2024 21:22:47 -0500
Subject: [PATCH 4/4] Run linter, remove extraneous characters

---
 client/src/__tests__/test-extensions.d.ts     |  2 +-
 client/src/components/DynamicHeroIcon.vue     |  4 +-
 client/src/components/RsvpModal.vue           |  6 +-
 client/src/components/form/FormCheckbox.vue   |  6 +-
 client/src/components/form/FormInput.vue      | 14 ++--
 client/src/pages/SuggestionsCreatePage.vue    |  8 +-
 client/src/types.ts                           |  6 +-
 .../controllers/rsvpController.spec.ts        |  6 +-
 .../subscriptionController.spec.ts            |  2 +-
 .../controllers/suggestionController.spec.ts  |  6 +-
 server/__tests__/support/firebaseMock.ts      | 64 +++++++--------
 server/__tests__/support/notionHelpers.ts     | 82 +++++++++----------
 server/__tests__/support/notionMock.ts        |  6 +-
 .../src/controllers/cacheWeeksController.ts   |  8 +-
 server/src/controllers/weekController.ts      |  6 +-
 server/src/data/firestore/firestoreAdapter.ts | 14 ++--
 server/src/data/firestore/firestoreTypes.ts   | 38 ++++-----
 server/src/data/tmdb/dtos/responseTypes.ts    | 42 +++++-----
 server/src/helpers/validation.ts              |  2 +-
 server/src/models/movie.ts                    | 22 ++---
 server/src/models/week.ts                     | 16 ++--
 server/src/types/weekProperties.ts            |  4 +-
 shared/dtos.ts                                | 66 +++++++--------
 23 files changed, 215 insertions(+), 215 deletions(-)

diff --git a/client/src/__tests__/test-extensions.d.ts b/client/src/__tests__/test-extensions.d.ts
index 9ac46ea..cdc2515 100644
--- a/client/src/__tests__/test-extensions.d.ts
+++ b/client/src/__tests__/test-extensions.d.ts
@@ -3,7 +3,7 @@ import 'vitest'
 
 declare module '@vue/test-utils' {
   interface VueWrapper {
-    byTestId(id: string): DOMWrapper<Element>;
+    byTestId(id: string): DOMWrapper<Element>
   }
 }
 
diff --git a/client/src/components/DynamicHeroIcon.vue b/client/src/components/DynamicHeroIcon.vue
index 67a834b..adee9f7 100644
--- a/client/src/components/DynamicHeroIcon.vue
+++ b/client/src/components/DynamicHeroIcon.vue
@@ -3,8 +3,8 @@ import { onMounted, ref } from 'vue'
 import * as heroIcons from '@heroicons/vue/24/solid'
 
 const props = defineProps<{
-  name: keyof typeof heroIcons,
-  class?: string,
+  name: keyof typeof heroIcons
+  class?: string
 }>()
 
 const isLoaded = ref(false)
diff --git a/client/src/components/RsvpModal.vue b/client/src/components/RsvpModal.vue
index 5eae56b..413fb54 100644
--- a/client/src/components/RsvpModal.vue
+++ b/client/src/components/RsvpModal.vue
@@ -9,9 +9,9 @@ import { CalendarDaysIcon } from '@heroicons/vue/24/solid'
 import { jsonHeaders } from '@client/data/headers'
 
 type RsvpForm = {
-  name: string,
-  email?: string,
-  reminders: boolean,
+  name: string
+  email?: string
+  reminders: boolean
 }
 
 const errors = ref<Errors>({})
diff --git a/client/src/components/form/FormCheckbox.vue b/client/src/components/form/FormCheckbox.vue
index 8f9b067..8c71d8b 100644
--- a/client/src/components/form/FormCheckbox.vue
+++ b/client/src/components/form/FormCheckbox.vue
@@ -2,9 +2,9 @@
 import { computed } from 'vue'
 
 const props = defineProps<{
-  name: string,
-  description: string,
-  label?: string,
+  name: string
+  description: string
+  label?: string
 }>()
 
 defineEmits([
diff --git a/client/src/components/form/FormInput.vue b/client/src/components/form/FormInput.vue
index d618434..2395f3b 100644
--- a/client/src/components/form/FormInput.vue
+++ b/client/src/components/form/FormInput.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup>
 withDefaults(defineProps<{
-  name: string,
-  hideLabel?: boolean,
-  label?: string,
-  type?: string,
-  error?: string,
-  placeholder?: string,
-  required?: boolean,
+  name: string
+  hideLabel?: boolean
+  label?: string
+  type?: string
+  error?: string
+  placeholder?: string
+  required?: boolean
 }>(), {
   hideLabel: false,
   type: 'text',
diff --git a/client/src/pages/SuggestionsCreatePage.vue b/client/src/pages/SuggestionsCreatePage.vue
index 0d2e9cf..5d2f2f6 100644
--- a/client/src/pages/SuggestionsCreatePage.vue
+++ b/client/src/pages/SuggestionsCreatePage.vue
@@ -6,10 +6,10 @@ import { ErrorBag } from '@client/types'
 import { jsonHeaders } from '@client/data/headers'
 
 type SuggestionFormData = {
-  theme?: string,
-  submitted_by?: string,
-  movie1?: string,
-  movie2?: string,
+  theme?: string
+  submitted_by?: string
+  movie1?: string
+  movie2?: string
 }
 
 const errors = ref<SuggestionFormData>({})
diff --git a/client/src/types.ts b/client/src/types.ts
index 3accf61..86c5582 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -1,8 +1,8 @@
 export type Errors = {
-  [key: string]: string;
+  [key: string]: string
 }
 
 export type ErrorBag = {
-  errors?: Errors;
-  message?: string;
+  errors?: Errors
+  message?: string
 }
diff --git a/server/__tests__/controllers/rsvpController.spec.ts b/server/__tests__/controllers/rsvpController.spec.ts
index 677c412..6a99577 100644
--- a/server/__tests__/controllers/rsvpController.spec.ts
+++ b/server/__tests__/controllers/rsvpController.spec.ts
@@ -27,9 +27,9 @@ const mockBody = ({
   email = 'test@example.com',
   reminders = false,
 }: {
-  name?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
-  email?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
-  reminders?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
+  name?: any // eslint-disable-line @typescript-eslint/no-explicit-any
+  email?: any // eslint-disable-line @typescript-eslint/no-explicit-any
+  reminders?: any // eslint-disable-line @typescript-eslint/no-explicit-any
 } = {}) => ({ name, email, reminders })
 
 describe('store', () => {
diff --git a/server/__tests__/controllers/subscriptionController.spec.ts b/server/__tests__/controllers/subscriptionController.spec.ts
index 3c439ed..ac6fe42 100644
--- a/server/__tests__/controllers/subscriptionController.spec.ts
+++ b/server/__tests__/controllers/subscriptionController.spec.ts
@@ -33,7 +33,7 @@ beforeEach(() => {
 })
 
 interface MockBodyArgs {
-  email?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
+  email?: any // eslint-disable-line @typescript-eslint/no-explicit-any
 }
 
 const mockBody = ({
diff --git a/server/__tests__/controllers/suggestionController.spec.ts b/server/__tests__/controllers/suggestionController.spec.ts
index 464f000..6b3fd9b 100644
--- a/server/__tests__/controllers/suggestionController.spec.ts
+++ b/server/__tests__/controllers/suggestionController.spec.ts
@@ -33,9 +33,9 @@ const newSuggestionController = () => {
 }
 
 interface MockBodyArgs {
-  theme?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
-  submitted_by?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
-  movies?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
+  theme?: any // eslint-disable-line @typescript-eslint/no-explicit-any
+  submitted_by?: any // eslint-disable-line @typescript-eslint/no-explicit-any
+  movies?: any // eslint-disable-line @typescript-eslint/no-explicit-any
 }
 
 const mockBody = ({
diff --git a/server/__tests__/support/firebaseMock.ts b/server/__tests__/support/firebaseMock.ts
index 7a2d441..b6bec97 100644
--- a/server/__tests__/support/firebaseMock.ts
+++ b/server/__tests__/support/firebaseMock.ts
@@ -115,8 +115,8 @@ export class FirebaseMock {
     }).toFirebaseDTO()
 
   static mockCollection = (collectionPath: string): {
-    firestore: { firestore: 'firestore' },
-    collectionPath: string,
+    firestore: { firestore: 'firestore' }
+    collectionPath: string
   } => ({
     firestore: { firestore: 'firestore' },
     collectionPath,
@@ -124,43 +124,43 @@ export class FirebaseMock {
 }
 
 export type FirebaseWeek = {
-  id: string,
-  theme: string,
-  date: DateTime,
-  slug?: string | null,
-  isSkipped: boolean,
-  movies?: FirebaseMovie[],
-  styledTheme?: RichText[],
-  lastEditedTime?: string,
+  id: string
+  theme: string
+  date: DateTime
+  slug?: string | null
+  isSkipped: boolean
+  movies?: FirebaseMovie[]
+  styledTheme?: RichText[]
+  lastEditedTime?: string
 }
 
 export type FirebaseMovie = {
-  director: string,
-  length: number,
-  notionId: string,
-  posterPath: string,
-  showingUrl: string | null,
-  theaterName: string | null,
-  time: string | null,
-  title: string,
-  tmdbId: number | null,
-  url: string | null,
-  year: number | null,
+  director: string
+  length: number
+  notionId: string
+  posterPath: string
+  showingUrl: string | null
+  theaterName: string | null
+  time: string | null
+  title: string
+  tmdbId: number | null
+  url: string | null
+  year: number | null
 }
 
 export type FirebaseUser = {
-  id: string,
-  email: string,
-  reminders: boolean,
+  id: string
+  email: string
+  reminders: boolean
 }
 
 export type FirebaseWeekConstructor = {
-  id: string,
-  theme: string,
-  date: Date|string,
-  styledTheme?: RichText[],
-  isSkipped?: boolean,
-  slug?: string | null,
-  movies?: Movie[],
-  lastEditedTime?: DateTime|string,
+  id: string
+  theme: string
+  date: Date|string
+  styledTheme?: RichText[]
+  isSkipped?: boolean
+  slug?: string | null
+  movies?: Movie[]
+  lastEditedTime?: DateTime|string
 }
diff --git a/server/__tests__/support/notionHelpers.ts b/server/__tests__/support/notionHelpers.ts
index 44f97d0..a7168ed 100644
--- a/server/__tests__/support/notionHelpers.ts
+++ b/server/__tests__/support/notionHelpers.ts
@@ -5,9 +5,9 @@ import {
 import { Movie } from '@server/models/movie'
 
 export const nCheckbox = (checked: boolean): {
-  type: 'checkbox';
-  checkbox: boolean;
-  id: string;
+  type: 'checkbox'
+  checkbox: boolean
+  id: string
 } => ({
   checkbox: checked,
   type: 'checkbox',
@@ -15,13 +15,13 @@ export const nCheckbox = (checked: boolean): {
 })
 
 export const nDate = (start: string): {
-  type: 'date';
+  type: 'date'
   date: {
-    start: string,
-    end: null,
-    time_zone: null,
-  };
-  id: string;
+    start: string
+    end: null
+    time_zone: null
+  }
+  id: string
 } => ({
   type: 'date',
   date: {
@@ -33,9 +33,9 @@ export const nDate = (start: string): {
 })
 
 export const nNumber = (number: number | null): {
-  type: 'number';
-  number: number | null;
-  id: string;
+  type: 'number'
+  number: number | null
+  id: string
 } => ({
   type: 'number',
   number: number,
@@ -45,9 +45,9 @@ export const nNumber = (number: number | null): {
 export const nRichText = (
   text: string | RichTextItemResponse[] | null,
 ): {
-  type: 'rich_text';
-  rich_text: Array<RichTextItemResponse>;
-  id: string;
+  type: 'rich_text'
+  rich_text: Array<RichTextItemResponse>
+  id: string
 } => ({
   type: 'rich_text',
   rich_text: Array.isArray(text)
@@ -57,9 +57,9 @@ export const nRichText = (
 })
 
 export const nTitle = (title: string): {
-  type: 'title';
-  title: Array<RichTextItemResponse>;
-  id: string;
+  type: 'title'
+  title: Array<RichTextItemResponse>
+  id: string
 } => ({
   type: 'title',
   title: [richTextItem(title)],
@@ -85,9 +85,9 @@ export const richTextItem = (text: string): RichTextItemResponse => ({
 })
 
 export const nUrl = (url: string | null): {
-  type: 'url';
-  url: string | null;
-  id: string;
+  type: 'url'
+  url: string | null
+  id: string
 } => ({
   url,
   type: 'url',
@@ -95,11 +95,11 @@ export const nUrl = (url: string | null): {
 })
 
 export const nRelation = (relation: NotionMovie[]): {
-  type: 'relation';
+  type: 'relation'
   relation: {
-    id: string;
-  }[];
-  id: string;
+    id: string
+  }[]
+  id: string
 } => ({
   type: 'relation',
   relation: relation.map(movie => movie.toPageObjectResponse()),
@@ -107,9 +107,9 @@ export const nRelation = (relation: NotionMovie[]): {
 })
 
 export const nLastEditedTime = (time: string): {
-  type: 'last_edited_time';
-  last_edited_time: string;
-  id: string;
+  type: 'last_edited_time'
+  last_edited_time: string
+  id: string
 } => ({
   type: 'last_edited_time',
   last_edited_time: time,
@@ -124,12 +124,12 @@ export const nFormula = (result: string | null): {
   }| {
     type: 'date'
     date: {
-      start: string;
+      start: string
       end: string | null
       time_zone: null
     }
   }
-  id: string;
+  id: string
 } => result
   ? {
     type: 'formula',
@@ -192,20 +192,20 @@ export type QueryBody = {
 }
 
 export type WithAuth<P> = P & {
-  auth?: string;
+  auth?: string
 }
 
 type NotionMovieConstructor = {
-  id: string,
-  title: string,
-  director?: string | null,
-  year?: number | null,
-  length?: number | null,
-  time?: string | null,
-  url?: string | null,
-  posterPath?: string | null,
-  theaterName?: string | null,
-  showingUrl?: string | null,
+  id: string
+  title: string
+  director?: string | null
+  year?: number | null
+  length?: number | null
+  time?: string | null
+  url?: string | null
+  posterPath?: string | null
+  theaterName?: string | null
+  showingUrl?: string | null
 }
 
 export class NotionMovie {
diff --git a/server/__tests__/support/notionMock.ts b/server/__tests__/support/notionMock.ts
index 250b374..b0f6268 100644
--- a/server/__tests__/support/notionMock.ts
+++ b/server/__tests__/support/notionMock.ts
@@ -90,9 +90,9 @@ export class NotionMock {
   }
 
   static mockWeek = (week: {
-    id: string,
-    date: string,
-    theme: string,
+    id: string
+    date: string
+    theme: string
     skipped?: boolean
     slug?: string | null
     movies?: NotionMovie[]
diff --git a/server/src/controllers/cacheWeeksController.ts b/server/src/controllers/cacheWeeksController.ts
index 2e5fa1c..6740e49 100644
--- a/server/src/controllers/cacheWeeksController.ts
+++ b/server/src/controllers/cacheWeeksController.ts
@@ -126,10 +126,10 @@ export default class CacheWeeksController {
   )
 
   private generateCacheWeeksData = (input: {
-    updatedWeeks?: number,
-    previousLastUpdated?: Date | null,
-    newLastUpdated?: Date | null,
-    tmdbMoviesSynced?: Movie[],
+    updatedWeeks?: number
+    previousLastUpdated?: Date | null
+    newLastUpdated?: Date | null
+    tmdbMoviesSynced?: Movie[]
   } ): { dto: CacheWeeksOutput, meta: LastUpdated } => {
     const baseData = {
       updatedWeeks: input.updatedWeeks ?? 0,
diff --git a/server/src/controllers/weekController.ts b/server/src/controllers/weekController.ts
index 1f36350..1dabb32 100644
--- a/server/src/controllers/weekController.ts
+++ b/server/src/controllers/weekController.ts
@@ -20,9 +20,9 @@ export default class WeekController {
   }
 
   parseIndexQuery = (req: Request): {
-    past: boolean,
-    limit?: number,
-    posterWidth: Width,
+    past: boolean
+    limit?: number
+    posterWidth: Width
   } =>
     ({
       past: req.query.past === 'true',
diff --git a/server/src/data/firestore/firestoreAdapter.ts b/server/src/data/firestore/firestoreAdapter.ts
index 3c3a2b4..44019b1 100644
--- a/server/src/data/firestore/firestoreAdapter.ts
+++ b/server/src/data/firestore/firestoreAdapter.ts
@@ -200,8 +200,8 @@ export default class FirestoreAdapter {
   sendEmailTemplates = async (
     templateName: string,
     emails: {
-      to: string,
-      data: Record<string, unknown>,
+      to: string
+      data: Record<string, unknown>
     }[],
   ): Promise<void> => {
     await runTransaction(this.firestore, async (transaction) => {
@@ -223,8 +223,8 @@ export default class FirestoreAdapter {
     })
   }
   updateTemplates = async (templates: {
-    name: string,
-    data: Record<string, unknown>,
+    name: string
+    data: Record<string, unknown>
   }[]): Promise<void> => {
     await runTransaction(this.firestore, async (transaction) => {
       templates.forEach((template) => {
@@ -293,9 +293,9 @@ export default class FirestoreAdapter {
 }
 
 export type EmailMessage = {
-  subject: string,
-  text: string,
-  html: string,
+  subject: string
+  text: string
+  html: string
 }
 
 type Collection = CollectionReference<DocumentData,DocumentData>
diff --git a/server/src/data/firestore/firestoreTypes.ts b/server/src/data/firestore/firestoreTypes.ts
index 5bc17fb..78afc49 100644
--- a/server/src/data/firestore/firestoreTypes.ts
+++ b/server/src/data/firestore/firestoreTypes.ts
@@ -2,26 +2,26 @@ import { RichText } from '@shared/dtos'
 import { Timestamp } from 'firebase/firestore'
 
 export type FirestoreWeek = {
-  id: string;
-  theme: string;
-  date: Timestamp;
-  isSkipped: boolean;
-  slug: string | null;
-  styledTheme: RichText[];
-  movies: FirestoreMovie[];
-  lastUpdated: Timestamp;
+  id: string
+  theme: string
+  date: Timestamp
+  isSkipped: boolean
+  slug: string | null
+  styledTheme: RichText[]
+  movies: FirestoreMovie[]
+  lastUpdated: Timestamp
 }
 
 export type FirestoreMovie = {
-  title: string;
-  director: string | null;
-  year: number | null;
-  length: number | null;
-  time: string | null;
-  url: string | null;
-  posterPath: string | null;
-  tmdbId: number | null;
-  notionId: string | null;
-  theaterName: string | null;
-  showingUrl: string | null;
+  title: string
+  director: string | null
+  year: number | null
+  length: number | null
+  time: string | null
+  url: string | null
+  posterPath: string | null
+  tmdbId: number | null
+  notionId: string | null
+  theaterName: string | null
+  showingUrl: string | null
 }
diff --git a/server/src/data/tmdb/dtos/responseTypes.ts b/server/src/data/tmdb/dtos/responseTypes.ts
index 0b27b5e..b560c0c 100644
--- a/server/src/data/tmdb/dtos/responseTypes.ts
+++ b/server/src/data/tmdb/dtos/responseTypes.ts
@@ -1,26 +1,26 @@
 export type MovieResponseTmdb = {
-  adult: boolean,
-  backdrop_path: string | null,
-  id: number,
-  original_language: string,
-  original_title: string,
-  overview: string,
-  popularity: number,
-  poster_path: string | null,
-  release_date: string,
-  title: string,
-  video: boolean,
-  vote_average: number,
-  vote_count: number,
+  adult: boolean
+  backdrop_path: string | null
+  id: number
+  original_language: string
+  original_title: string
+  overview: string
+  popularity: number
+  poster_path: string | null
+  release_date: string
+  title: string
+  video: boolean
+  vote_average: number
+  vote_count: number
   credits: {
     crew: CrewResponseTmdb[]
-  } | undefined,
-  runtime: number | null | undefined,
+  } | undefined
+  runtime: number | null | undefined
 }
 
 export type CrewResponseTmdb = {
-  name: string,
-  job: string,
+  name: string
+  job: string
 }
 
 type CreditsTmdb = {
@@ -28,10 +28,10 @@ type CreditsTmdb = {
 }
 
 export type SearchResponseTmdb = {
-  page: number,
-  results: MovieResponseTmdb[],
-  total_pages: number,
-  total_results: number,
+  page: number
+  results: MovieResponseTmdb[]
+  total_pages: number
+  total_results: number
 }
 
 export function isMovieResponseTmdb (
diff --git a/server/src/helpers/validation.ts b/server/src/helpers/validation.ts
index c24ab73..b52d5a8 100644
--- a/server/src/helpers/validation.ts
+++ b/server/src/helpers/validation.ts
@@ -39,7 +39,7 @@ const mapErrors = (errors: Array<z.ZodIssue>): ErrorResponse => {
 
 type ErrorResponse = {
   errors: {
-    [key: string]: string,
+    [key: string]: string
   }
 }
 
diff --git a/server/src/models/movie.ts b/server/src/models/movie.ts
index d113dd8..4ca006c 100644
--- a/server/src/models/movie.ts
+++ b/server/src/models/movie.ts
@@ -18,17 +18,17 @@ import { timeStringAsMinutes } from '@server/helpers/timeStrings'
 import { Width } from '@server/types/tmdb'
 
 export type MovieConstructor = {
-  title: string,
-  director?: string | null,
-  year?: number | null,
-  length?: number | null,
-  time?: string | null,
-  url?: string | null,
-  posterPath?: string | null,
-  tmdbId?: number | null,
-  notionId?: string | null,
-  theaterName?: string | null,
-  showingUrl?: string | null,
+  title: string
+  director?: string | null
+  year?: number | null
+  length?: number | null
+  time?: string | null
+  url?: string | null
+  posterPath?: string | null
+  tmdbId?: number | null
+  notionId?: string | null
+  theaterName?: string | null
+  showingUrl?: string | null
 }
 
 export type MovieDtoOptions = {
diff --git a/server/src/models/week.ts b/server/src/models/week.ts
index d4c4c75..9910bf7 100644
--- a/server/src/models/week.ts
+++ b/server/src/models/week.ts
@@ -12,14 +12,14 @@ import { DateTime } from 'luxon'
 import { CHICAGO, TZ } from '@server/config/tz'
 
 export type WeekConstructor = {
-  id: string,
-  theme: string,
-  date: DateTime,
-  styledTheme?: RichText[],
-  isSkipped?: boolean,
-  slug?: string | null,
-  movies?: Movie[],
-  lastUpdated?: DateTime,
+  id: string
+  theme: string
+  date: DateTime
+  styledTheme?: RichText[]
+  isSkipped?: boolean
+  slug?: string | null
+  movies?: Movie[]
+  lastUpdated?: DateTime
 }
 
 export type WeekDtoOptions = {
diff --git a/server/src/types/weekProperties.ts b/server/src/types/weekProperties.ts
index 7ffcb72..e300483 100644
--- a/server/src/types/weekProperties.ts
+++ b/server/src/types/weekProperties.ts
@@ -32,10 +32,10 @@ export default interface WeekProperties {
   }
   'Last edited movie time': {
     formula: {
-      type: 'string',
+      type: 'string'
       string: string | null
     } | {
-      type: 'date',
+      type: 'date'
       date: {
         start: string
       }
diff --git a/shared/dtos.ts b/shared/dtos.ts
index d18a60a..61ebe68 100644
--- a/shared/dtos.ts
+++ b/shared/dtos.ts
@@ -1,48 +1,48 @@
 export type MovieDto = {
-  title: string,
-  director: string | null,
-  year: number | null,
-  length: number | null,
-  time: string | null,
-  url: string | null,
-  posterUrl: string,
-  theaterName: string | null,
-  showingUrl: string | null,
-  isFieldTrip: boolean,
-  displayLength: string | null,
+  title: string
+  director: string | null
+  year: number | null
+  length: number | null
+  time: string | null
+  url: string | null
+  posterUrl: string
+  theaterName: string | null
+  showingUrl: string | null
+  isFieldTrip: boolean
+  displayLength: string | null
 }
 
 export type WeekDto = {
-  id: string,
-  weekId: string,
-  theme: string,
-  date: string,
-  isSkipped: boolean,
-  slug: string | null,
-  styledTheme: RichText[],
-  movies: MovieDto[],
+  id: string
+  weekId: string
+  theme: string
+  date: string
+  isSkipped: boolean
+  slug: string | null
+  styledTheme: RichText[]
+  movies: MovieDto[]
 }
 
 export type TextStyle = {
-  bold: boolean;
-  italic: boolean;
-  strikethrough: boolean;
-  underline: boolean;
-  code: boolean;
-  color: 'default' | 'gray' | 'brown' | 'orange' | 'yellow' | 'green' | 'blue' | 'purple' | 'pink' | 'red' | 'gray_background' | 'brown_background' | 'orange_background' | 'yellow_background' | 'green_background' | 'blue_background' | 'purple_background' | 'pink_background' | 'red_background';
+  bold: boolean
+  italic: boolean
+  strikethrough: boolean
+  underline: boolean
+  code: boolean
+  color: 'default' | 'gray' | 'brown' | 'orange' | 'yellow' | 'green' | 'blue' | 'purple' | 'pink' | 'red' | 'gray_background' | 'brown_background' | 'orange_background' | 'yellow_background' | 'green_background' | 'blue_background' | 'purple_background' | 'pink_background' | 'red_background'
 }
 
 export type RichText = {
-  type: 'text',
+  type: 'text'
   text: {
-    content: string;
+    content: string
     link: {
-      url: string;
-    } | null;
-  };
-  annotations: TextStyle;
-  plain_text: string;
-  href: string | null;
+      url: string
+    } | null
+  }
+  annotations: TextStyle
+  plain_text: string
+  href: string | null
 }
 
 export type CacheWeeksOutput = {