prettier format revert

Author: katconnors

package-lock.json

@@ -93,7 +93,6 @@
     "lint-staged": "^13.1.0",
     "nextjs-server-modules": "^4.7.0",
     "nodemailer-mock": "^2.0.1",
-    "prettier": "^2.8.8",
     "rewiremock": "^3.14.5",
     "storybook": "^8.1.11",
     "testcontainers": "^9.8.0",

package.json

@@ -7,7 +7,7 @@ import {
 import { InsertObject, Selectable } from "kysely";
 
 const mapStoredUserToAdapterUser = (
-  user: Selectable<ZapatosTableNameToKyselySchema<"user">>,
+  user: Selectable<ZapatosTableNameToKyselySchema<"user">>
 ): AdapterUser => ({
   id: user.user_id,
   email: user.email,
@@ -17,7 +17,7 @@ const mapStoredUserToAdapterUser = (
 });
 
 const mapStoredSessionToAdapterSession = (
-  session: Selectable<ZapatosTableNameToKyselySchema<"session">>,
+  session: Selectable<ZapatosTableNameToKyselySchema<"session">>
 ): AdapterSession => ({
   sessionToken: session.session_token,
   userId: session.user_id,
@@ -32,7 +32,7 @@ const mapStoredSessionToAdapterSession = (
  * See https://next-auth.js.org/tutorials/creating-a-database-adapter
  */
 export const createPersistedAuthAdapter = (
-  db: KyselyDatabaseInstance,
+  db: KyselyDatabaseInstance
 ): Adapter => ({
   async createUser(user) {
     const numOfUsers = await db
@@ -149,7 +149,7 @@ export const createPersistedAuthAdapter = (
       .insertInto("account")
       .values(data)
       .onConflict((b) =>
-        b.columns(["provider_name", "provider_account_id"]).doUpdateSet(data),
+        b.columns(["provider_name", "provider_account_id"]).doUpdateSet(data)
       )
       .execute();
   },

src/backend/auth/adapter.ts

@@ -4,7 +4,7 @@ import { KyselyDatabaseInstance } from "../lib";
 import type { NextAuthOptions } from "next-auth";
 
 export const getNextAuthOptions = (
-  db: KyselyDatabaseInstance,
+  db: KyselyDatabaseInstance
 ): NextAuthOptions => ({
   providers: [
     GoogleProvider({

src/backend/auth/options.ts

@@ -23,7 +23,7 @@ export type tRPCContext = ReturnType<typeof getDb> & {
 };
 
 export const createContext = async (
-  options: CreateNextContextOptions,
+  options: CreateNextContextOptions
 ): Promise<tRPCContext> => {
   const env = (options.req.env as unknown as Env) ?? process.env;
   const {
@@ -40,7 +40,7 @@ export const createContext = async (
   const session = await getServerSession(
     options.req,
     options.res,
-    getNextAuthOptions(db),
+    getNextAuthOptions(db)
   );
   if (session && session.user?.email) {
     const user = await db

src/backend/context.ts

@@ -11,11 +11,11 @@ interface MigrateOptions {
 
 export const migrate = async (
   databaseUrl: string,
-  { silent = false, shouldGenerateTypes = true }: MigrateOptions = {},
+  { silent = false, shouldGenerateTypes = true }: MigrateOptions = {}
 ) => {
   const migrationsDirectory = path.join(
     process.cwd(),
-    "src/backend/db/migrations",
+    "src/backend/db/migrations"
   );
   const zapatosDirectory = path.join(process.cwd(), "src/backend/db");
 

src/backend/db/lib/migrate.ts

@@ -20,7 +20,7 @@ test("seedfile works with current schema", async (t) => {
     t.fail(
       `Seedfile execution failed: ${
         error instanceof Error ? error.message : String(error)
-      }`,
+      }`
     );
   } finally {
     await db.destroy();

src/backend/db/lib/seed.test.ts

@@ -20,7 +20,7 @@ export async function createPara(
   case_manager_id: string,
   from_email: string,
   to_email: string,
-  env: Env,
+  env: Env
 ): Promise<user.Selectable | undefined> {
   const { first_name, last_name, email } = para;
 
@@ -48,7 +48,7 @@ export async function createPara(
       to_email,
       first_name,
       case_manager_id,
-      env,
+      env
     );
   }
 
@@ -63,7 +63,7 @@ export async function sendInviteEmail(
   toEmail: string,
   first_name: string,
   caseManagerName: string,
-  env: Env,
+  env: Env
 ): Promise<void> {
   await getTransporter(env).sendMail({
     from: fromEmail,
@@ -92,7 +92,7 @@ Thank you for the key role you play in improving student outcomes!`,
 export async function assignParaToCaseManager(
   para_id: string,
   case_manager_id: string,
-  db: KyselyDatabaseInstance,
+  db: KyselyDatabaseInstance
 ): Promise<void> {
   await db
     .insertInto("paras_assigned_to_case_manager")
@@ -112,10 +112,10 @@ type createStudentProps = {
 };
 
 export const STUDENT_ASSIGNED_TO_YOU_ERR = new Error(
-  "This student is already assigned to you",
+  "This student is already assigned to you"
 );
 export const STUDENT_ALREADY_ASSIGNED_ERR = new Error(
-  "This student is already assigned to another case manager.",
+  "This student is already assigned to another case manager."
 );
 
 /**
@@ -164,7 +164,7 @@ export async function createAndAssignStudent({
       oc
         .column("email")
         .doUpdateSet({ assigned_case_manager_id: userId })
-        .where("student.assigned_case_manager_id", "is", null),
+        .where("student.assigned_case_manager_id", "is", null)
     )
     .returningAll()
     .executeTakeFirstOrThrow();

src/backend/lib/db_helpers/case_manager.ts

@@ -4,7 +4,7 @@ import { substituteTransactionOnContext } from "./utils/context";
 
 const deleteFileWithoutTransaction = async (
   fileId: string,
-  ctx: tRPCContext,
+  ctx: tRPCContext
 ) => {
   if (ctx.auth.type === "none") {
     throw new Error("File deletion requires authentication.");
@@ -21,7 +21,7 @@ const deleteFileWithoutTransaction = async (
     new DeleteObjectCommand({
       Bucket: ctx.env.S3_USER_UPLOADS_BUCKET_NAME,
       Key: ext_s3_path,
-    }),
+    })
   );
 };
 
@@ -33,7 +33,7 @@ export const deleteFile = async (fileId: string, ctx: tRPCContext) => {
   await ctx.db.transaction().execute(async (trx) => {
     await deleteFileWithoutTransaction(
       fileId,
-      substituteTransactionOnContext(trx, ctx),
+      substituteTransactionOnContext(trx, ctx)
     );
   });
 };

src/backend/lib/files.ts

@@ -9,8 +9,8 @@ export const logger = winston.createLogger({
         winston.format.timestamp(),
         winston.format.printf(
           ({ level, message, timestamp }) =>
-            `${timestamp as string} ${level}: ${message as string}`,
-        ),
+            `${timestamp as string} ${level}: ${message as string}`
+        )
       ),
     }),
   ],

src/backend/lib/logger.ts

@@ -4,7 +4,7 @@ import { KyselySchema } from "../types";
 
 export const substituteTransactionOnContext = (
   trx: Transaction<KyselySchema>,
-  context: tRPCContext,
+  context: tRPCContext
 ): tRPCContext => ({
   ...context,
   db: trx,

src/backend/lib/utils/context.ts

@@ -4,7 +4,7 @@ import { adminProcedure, router } from "../trpc";
 export const admin = router({
   getPostgresInfo: adminProcedure.query(async (req) => {
     const result = await sql<{ version: string }>`SELECT version()`.execute(
-      req.ctx.db,
+      req.ctx.db
     );
 
     return result.rows[0].version;

src/backend/routers/admin.ts

@@ -93,7 +93,7 @@ test("addStudent - student doesn't exist in db", async (t) => {
       .selectFrom("student")
       .where("first_name", "=", "Foo")
       .selectAll()
-      .executeTakeFirst(),
+      .executeTakeFirst()
   );
 
   await trpc.case_manager.addStudent.mutate({
@@ -119,7 +119,7 @@ test("addStudent - student exists in db but is unassigned", async (t) => {
       .selectFrom("student")
       .where("first_name", "=", seed.student.first_name)
       .selectAll()
-      .executeTakeFirst(),
+      .executeTakeFirst()
   );
 
   await trpc.case_manager.addStudent.mutate({
@@ -138,7 +138,7 @@ test("addStudent - student exists in db but is unassigned", async (t) => {
       .where("student_id", "=", seed.student.student_id)
       .where("assigned_case_manager_id", "=", seed.case_manager.user_id)
       .selectAll()
-      .executeTakeFirstOrThrow(),
+      .executeTakeFirstOrThrow()
   );
 });
 
@@ -167,7 +167,7 @@ test("addStudent - student exists in db and is already assigned to user", async
       last_name: seed.student.last_name,
       email: seed.student.email,
       grade: seed.student.grade,
-    }),
+    })
   );
 
   t.is(err?.message, STUDENT_ASSIGNED_TO_YOU_ERR.message);
@@ -221,7 +221,7 @@ test("addStudent - student exists in db but is assigned to another case manager"
       last_name: newStudent.last_name,
       email: newStudent.email,
       grade: newStudent.grade,
-    }),
+    })
   );
 
   t.is(err?.message, STUDENT_ALREADY_ASSIGNED_ERR.message);
@@ -241,7 +241,7 @@ test("addStudent - student exists in db but is assigned to another case manager"
       last_name: newStudent.last_name,
       email: newStudent.email,
       grade: newStudent.grade,
-    }),
+    })
   );
 
   t.is(redundantErr?.message, STUDENT_ASSIGNED_TO_YOU_ERR.message);
@@ -258,7 +258,7 @@ test("addStudent - invalid email", async (t) => {
       last_name: "Bar",
       email: "invalid-email",
       grade: 6,
-    }),
+    })
   );
   // should be zod error
   t.is(typeof err?.message, "string");