shitty solution for empty string values

Author: fforres

src/datasources/db/salaries.ts

@@ -3,7 +3,11 @@ import { integer, pgTable, text, uuid } from "drizzle-orm/pg-core";
 import { createInsertSchema, createSelectSchema } from "drizzle-zod";
 
 import { companiesSchema } from "./companies";
-import { createdAndUpdatedAtFields, genderOptions } from "./shared";
+import {
+  createdAndUpdatedAtFields,
+  GenderOptionsEnum,
+  TypescriptEnumAsDBEnumOptions,
+} from "./shared";
 import { usersSchema } from "./users";
 import { workEmailSchema } from "./workEmail";
 import { workSeniorityAndRoleSchema } from "./workSeniorityAndRole";
@@ -26,7 +30,7 @@ export const salariesSchema = pgTable("salaries", {
   workEmailId: uuid("work_email_id").references(() => workEmailSchema.id),
   yearsOfExperience: integer("years_of_experience").notNull(),
   gender: text("gender", {
-    enum: genderOptions,
+    enum: TypescriptEnumAsDBEnumOptions(GenderOptionsEnum),
   }),
   genderOtherText: text("gender_other_text"),
   countryCode: text("country_code").notNull(),

src/datasources/db/shared.ts

@@ -13,19 +13,20 @@ export const createdAndUpdatedAtFieldsSelectZodSchema = {
   deletedAt: z.date().optional(),
 };
 
-export const genderOptions = [
-  "male",
-  "female",
-  "transgender_male",
-  "transgender_female",
-  "non_binary",
-  "genderqueer",
-  "genderfluid",
-  "agender",
-  "two_spirit",
-  "other",
-  "prefer_not_to_say",
-] as const;
+export enum GenderOptionsEnum {
+  Male = "male",
+  Female = "female",
+  TransgenderMale = "transgender_male",
+  TransgenderFemale = "transgender_female",
+  NonBinary = "non_binary",
+  Genderqueer = "genderqueer",
+  Genderfluid = "genderfluid",
+  Agender = "agender",
+  TwoSpirit = "two_spirit",
+  Other = "other",
+  PreferNotToSay = "prefer_not_to_say",
+  empty = "",
+}
 
 export const statusEnumOptions = ["pending", "confirmed", "rejected"] as const;
 

src/datasources/db/users.ts

@@ -10,21 +10,23 @@ import {
 } from "./schema";
 import {
   createdAndUpdatedAtFields,
-  genderOptions,
+  GenderOptionsEnum,
   TypescriptEnumAsDBEnumOptions,
 } from "./shared";
 
 export enum UserStatusEnum {
   active = "active",
   inactive = "inactive",
   blocked = "blocked",
+  empty = "",
 }
 
 export enum PronounsEnum {
   heHim = "él/ellos",
   sheHer = "ella/ellas",
   theyThem = "elle/elles",
   other = "otro",
+  empty = "",
 }
 
 // USERS
@@ -36,7 +38,7 @@ export const usersSchema = pgTable("users", {
   bio: text("bio").default(""),
   email: text("email").unique().notNull(),
   gender: text("gender", {
-    enum: genderOptions,
+    enum: TypescriptEnumAsDBEnumOptions(GenderOptionsEnum),
   }),
   pronouns: text("pronouns", {
     enum: TypescriptEnumAsDBEnumOptions(PronounsEnum),
@@ -74,3 +76,21 @@ export const updateUsersSchema = insertUsersSchema
     username: true,
   })
   .partial();
+
+export const allowedUserUpdateForAuth = insertUsersSchema
+  .pick({
+    name: true,
+    lastName: true,
+    bio: true,
+    pronouns: true,
+    // gender: true,
+    // genderOtherText: true,
+    username: true,
+    externalId: true,
+    imageUrl: true,
+    isEmailVerified: true,
+    publicMetadata: true,
+    updatedAt: true,
+    status: true,
+  })
+  .partial();

src/datasources/queries/users.ts

@@ -4,8 +4,10 @@ import { z } from "zod";
 
 import { ORM_TYPE } from "~/datasources/db";
 import {
+  allowedUserUpdateForAuth,
   insertUsersSchema,
   selectUsersSchema,
+  updateUsersSchema,
   usersSchema,
   UserStatusEnum,
 } from "~/datasources/db/schema";
@@ -55,17 +57,17 @@ export const updateUserProfileInfo = async (
   } else {
     logger.info("User found — updating user");
     // we update the user
+    const updateData = allowedUserUpdateForAuth.parse({
+      externalId: parsedProfileInfo.externalId,
+      name: parsedProfileInfo.name,
+      imageUrl: parsedProfileInfo.imageUrl,
+      isEmailVerified: parsedProfileInfo.isEmailVerified,
+      publicMetadata: parsedProfileInfo.publicMetadata ?? {},
+      status: UserStatusEnum.active,
+    });
     const updatedUsers = await db
       .update(usersSchema)
-      .set({
-        externalId: parsedProfileInfo.externalId,
-        name: parsedProfileInfo.name,
-        imageUrl: parsedProfileInfo.imageUrl,
-        isEmailVerified: parsedProfileInfo.isEmailVerified,
-        publicMetadata: parsedProfileInfo.publicMetadata ?? {},
-        updatedAt: sql`current_timestamp`,
-        status: UserStatusEnum.active,
-      })
+      .set(updateData)
       .where(eq(usersSchema.email, parsedProfileInfo.email))
       .returning();
     const updatedUser = updatedUsers?.[0];
@@ -75,6 +77,8 @@ export const updateUserProfileInfo = async (
       throw new Error("Could not update user");
     }
 
+    logger.info("User updated");
+
     return selectUsersSchema.parse(updatedUser);
   }
 };

src/schema/shared/enums.ts

@@ -1,6 +1,6 @@
 import { builder } from "~/builder";
-import { genderOptions } from "~/datasources/db/shared";
+import { GenderOptionsEnum } from "~/datasources/db/shared";
 
-export const GenderEnum = builder.enumType("Gender", {
-  values: genderOptions,
+export const GenderEnum = builder.enumType(GenderOptionsEnum, {
+  name: "Gender",
 });

src/tests/fixtures/index.ts

@@ -88,7 +88,6 @@ import {
   PronounsEnum,
   UserStatusEnum,
 } from "~/datasources/db/schema";
-import { genderOptions } from "~/datasources/db/shared";
 import {
   insertTicketPriceSchema,
   selectTicketPriceSchema,
@@ -100,6 +99,7 @@ import {
 } from "~/generated/types";
 import { defaultLogger } from "~/logging";
 import { schema } from "~/schema";
+import { GenderEnum } from "~/schema/shared/enums";
 import { getTestDB } from "~/tests/fixtures/databaseHelper";
 
 const insertUserRequest = insertUsersSchema.deepPartial();
@@ -737,7 +737,9 @@ export const insertSalary = async (
       partialInput?.workMetodology ??
       faker.helpers.arrayElement(["remote", "office", "hybrid"] as const),
     yearsOfExperience: partialInput?.yearsOfExperience ?? faker.number.int(),
-    gender: partialInput?.gender ?? faker.helpers.arrayElement(genderOptions),
+    gender:
+      partialInput?.gender ??
+      faker.helpers.arrayElement(Object.values(GenderEnum)),
     genderOtherText: partialInput?.genderOtherText,
     companyId: partialInput?.companyId,
     workEmailId: partialInput?.workEmailId,