Update db types

kubk · Nov 13, 2023 · d3f4eb7 · d3f4eb7
1 parent 62b151b
commit d3f4eb7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/functions/db/databaseTypes.ts b/functions/db/databaseTypes.ts
@@ -54,7 +54,7 @@ export interface Database {
           id: number
           is_public: boolean
           name: string
-          share_id: string | null
+          share_id: string
         }
         Insert: {
           author_id?: number | null
@@ -63,7 +63,7 @@ export interface Database {
           id?: number
           is_public?: boolean
           name: string
-          share_id?: string | null
+          share_id: string
         }
         Update: {
           author_id?: number | null
@@ -72,7 +72,7 @@ export interface Database {
           id?: number
           is_public?: boolean
           name?: string
-          share_id?: string | null
+          share_id?: string
         }
         Relationships: [
           {
@@ -147,6 +147,7 @@ export interface Database {
           first_name: string | null
           id: number
           is_admin: boolean
+          is_remind_enabled: boolean
           language_code: string | null
           last_name: string | null
           last_reminded_date: string | null
@@ -158,6 +159,7 @@ export interface Database {
           first_name?: string | null
           id?: number
           is_admin?: boolean
+          is_remind_enabled?: boolean
           language_code?: string | null
           last_name?: string | null
           last_reminded_date?: string | null
@@ -169,6 +171,7 @@ export interface Database {
           first_name?: string | null
           id?: number
           is_admin?: boolean
+          is_remind_enabled?: boolean
           language_code?: string | null
           last_name?: string | null
           last_reminded_date?: string | null

diff --git a/functions/upsert-deck.ts b/functions/upsert-deck.ts
@@ -13,6 +13,7 @@ import { createForbiddenRequestResponse } from "./lib/json-response/create-forbi
 import { getDeckByIdAndAuthorId } from "./db/deck/get-deck-by-id-and-author-id.ts";
 import { shortUniqueId } from "./lib/short-unique-id/short-unique-id.ts";
 import { Database } from "./db/databaseTypes.ts";
+import { assert } from "./lib/typescript/assert.ts";
 
 const requestSchema = z.object({
   id: z.number().nullable().optional(),
@@ -45,10 +46,7 @@ export const onRequestPost = handleError(async ({ request, env }) => {
   const envSafe = envSchema.parse(env);
   const db = getDatabase(envSafe);
 
-  const upsertDataDynamic: Pick<
-    InsertDeckDatabaseType,
-    "share_id" | "is_public"
-  > = {};
+  const upsertDataDynamic: { share_id?: string; is_public?: boolean } = {};
 
   // Is edit
   if (input.data.id) {
@@ -67,16 +65,17 @@ export const onRequestPost = handleError(async ({ request, env }) => {
     upsertDataDynamic.share_id = shortUniqueId();
     upsertDataDynamic.is_public = false;
   }
-
-  const upsertData: InsertDeckDatabaseType = Object.assign(
-    {
-      id: input.data.id ? input.data.id : undefined,
-      author_id: user.id,
-      name: input.data.title,
-      description: input.data.description,
-    },
-    upsertDataDynamic,
-  );
+  assert(upsertDataDynamic.share_id !== undefined);
+  assert(upsertDataDynamic.is_public !== undefined);
+
+  const upsertData: InsertDeckDatabaseType = {
+    id: input.data.id ? input.data.id : undefined,
+    author_id: user.id,
+    name: input.data.title,
+    description: input.data.description,
+    share_id: upsertDataDynamic.share_id,
+    is_public: upsertDataDynamic.is_public,
+  };
 
   const upsertDeckResult = await db.from("deck").upsert(upsertData).select();