Deck catalog

Author: kubk

functions/catalog-decks.ts

@@ -0,0 +1,23 @@
+import { createJsonResponse } from "./lib/json-response/create-json-response.ts";
+import { getUser } from "./services/get-user.ts";
+import { createAuthFailedResponse } from "./lib/json-response/create-auth-failed-response.ts";
+import { handleError } from "./lib/handle-error/handle-error.ts";
+import { envSchema } from "./env/env-schema.ts";
+import { getCatalogDecksDb } from "./db/deck/get-catalog-decks-db.ts";
+import { DeckWithCardsDbType } from "./db/deck/decks-with-cards-schema.ts";
+
+export type DeckCatalogResponse = {
+  decks: DeckWithCardsDbType[];
+};
+
+export const onRequest = handleError(async ({ request, env }) => {
+  const user = await getUser(request, env);
+  if (!user) return createAuthFailedResponse();
+  const envSafe = envSchema.parse(env);
+
+  const decks = await getCatalogDecksDb(envSafe);
+
+  return createJsonResponse<DeckCatalogResponse>({
+    decks,
+  });
+});

functions/db/databaseTypes.ts

@@ -52,6 +52,7 @@ export interface Database {
       deck: {
         Row: {
           author_id: number | null
+          available_in: string | null
           created_at: string
           description: string | null
           id: number
@@ -63,6 +64,7 @@ export interface Database {
         }
         Insert: {
           author_id?: number | null
+          available_in?: string | null
           created_at?: string
           description?: string | null
           id?: number
@@ -74,6 +76,7 @@ export interface Database {
         }
         Update: {
           author_id?: number | null
+          available_in?: string | null
           created_at?: string
           description?: string | null
           id?: number
@@ -238,6 +241,23 @@ export interface Database {
           type: string
         }[]
       }
+      get_unadded_public_decks: {
+        Args: {
+          user_id: number
+        }
+        Returns: {
+          author_id: number | null
+          available_in: string | null
+          created_at: string
+          description: string | null
+          id: number
+          is_public: boolean
+          name: string
+          share_id: string
+          speak_field: string | null
+          speak_locale: string | null
+        }[]
+      }
       get_user_decks_deck_id: {
         Args: {
           usr_id: number

functions/db/deck/decks-with-cards-schema.ts

@@ -26,6 +26,7 @@ export const deckSchema = z.object({
 export const deckWithCardsSchema = deckSchema.merge(
   z.object({
     deck_card: z.array(deckCardSchema),
+    available_in: z.string().nullable(),
   }),
 );
 

functions/db/deck/get-public-decks-db.ts renamed to functions/db/deck/get-catalog-decks-db.ts

@@ -6,21 +6,23 @@ import {
   DeckWithCardsDbType,
 } from "./decks-with-cards-schema.ts";
 
-export const getPublicDecksDb = async (
+export const getCatalogDecksDb = async (
   env: EnvType,
 ): Promise<DeckWithCardsDbType[]> => {
   const db = getDatabase(env);
 
   const { data, error } = await db
     .from("deck")
-    .select("*,deck_card!deck_card_deck_id_fkey(*)")
+    .select("*")
     .eq("is_public", true)
     .order("id", { ascending: false })
-    .limit(20);
+    .limit(100);
 
   if (error) {
     throw new DatabaseException(error);
   }
 
-  return decksWithCardsSchema.parse(data);
+  return decksWithCardsSchema.parse(
+    data.map((item) => ({ ...item, deck_card: [] })),
+  );
 };

functions/db/deck/get-un-added-public-decks-db.ts

@@ -0,0 +1,20 @@
+import { EnvType } from "../../env/env-schema.ts";
+import { getDatabase } from "../get-database.ts";
+import { DatabaseException } from "../database-exception.ts";
+import { decksWithCardsSchema } from "./decks-with-cards-schema.ts";
+
+export const getUnAddedPublicDecksDb = async (env: EnvType, userId: number) => {
+  const db = getDatabase(env);
+
+  const { data, error } = await db.rpc("get_unadded_public_decks", {
+    user_id: userId,
+  });
+
+  if (error) {
+    throw new DatabaseException(error);
+  }
+
+  return decksWithCardsSchema.parse(
+    data.map((item) => ({ ...item, deck_card: [] })),
+  );
+};

functions/deck-with-cards.ts

@@ -0,0 +1,27 @@
+import { createJsonResponse } from "./lib/json-response/create-json-response.ts";
+import { getUser } from "./services/get-user.ts";
+import { createAuthFailedResponse } from "./lib/json-response/create-auth-failed-response.ts";
+import { handleError } from "./lib/handle-error/handle-error.ts";
+import { envSchema } from "./env/env-schema.ts";
+import { getDeckWithCardsById } from "./db/deck/get-deck-with-cards-by-id-db.ts";
+import { createBadRequestResponse } from "./lib/json-response/create-bad-request-response.ts";
+import { z } from "zod";
+import { deckWithCardsSchema } from "./db/deck/decks-with-cards-schema.ts";
+
+export type DeckWithCardsResponse = z.infer<typeof deckWithCardsSchema>;
+
+export const onRequest = handleError(async ({ request, env }) => {
+  const user = await getUser(request, env);
+  if (!user) return createAuthFailedResponse();
+  const envSafe = envSchema.parse(env);
+
+  const url = new URL(request.url);
+  const deckId = url.searchParams.get("deck_id");
+  if (!deckId) {
+    return createBadRequestResponse();
+  }
+
+  const deck = await getDeckWithCardsById(envSafe, parseInt(deckId));
+
+  return createJsonResponse<DeckWithCardsResponse>(deck);
+});

functions/my-info.ts

@@ -4,13 +4,13 @@ import { createAuthFailedResponse } from "./lib/json-response/create-auth-failed
 import { handleError } from "./lib/handle-error/handle-error.ts";
 import { UserDbType } from "./db/user/upsert-user-db.ts";
 import { DeckWithCardsDbType } from "./db/deck/decks-with-cards-schema.ts";
-import { getPublicDecksDb } from "./db/deck/get-public-decks-db.ts";
 import { envSchema } from "./env/env-schema.ts";
 import { getMyDecksDb } from "./db/deck/get-my-decks-db.ts";
 import {
   CardToReviewDbType,
   getCardsToReviewDb,
 } from "./db/deck/get-cards-to-review-db.ts";
+import { getUnAddedPublicDecksDb } from "./db/deck/get-un-added-public-decks-db.ts";
 
 export type MyInfoResponse = {
   user: UserDbType;
@@ -25,7 +25,7 @@ export const onRequest = handleError(async ({ request, env }) => {
   const envSafe = envSchema.parse(env);
 
   const [publicDecks, myDecks, cardsToReview] = await Promise.all([
-    await getPublicDecksDb(envSafe),
+    await getUnAddedPublicDecksDb(envSafe, user.id),
     await getMyDecksDb(envSafe, user.id),
     await getCardsToReviewDb(envSafe, user.id),
   ]);

functions/review-cards.ts

@@ -53,27 +53,29 @@ export const onRequestPost = handleError(async ({ env, request }) => {
   const upsertReviewsResult = await db
     .from("card_review")
     .upsert(
-      input.data.cards.map((card): Database['public']['Tables']['card_review']['Insert'] => {
-        const previousReview = existingReviews.find(
-          (review) => review.card_id === card.id,
-        );
+      input.data.cards.map(
+        (card): Database["public"]["Tables"]["card_review"]["Insert"] => {
+          const previousReview = existingReviews.find(
+            (review) => review.card_id === card.id,
+          );
 
-        const reviewResult = reviewCard(
-          now,
-          previousReview?.interval,
-          card.outcome,
-          previousReview?.ease_factor,
-          input.data.isInterrupted,
-        );
+          const reviewResult = reviewCard(
+            now,
+            previousReview?.interval,
+            card.outcome,
+            previousReview?.ease_factor,
+            input.data.isInterrupted,
+          );
 
-        return {
-          user_id: user.id,
-          card_id: card.id,
-          last_review_date: now.toJSDate().toISOString(),
-          ease_factor: reviewResult.easeFactor,
-          interval: reviewResult.interval,
-        };
-      }),
+          return {
+            user_id: user.id,
+            card_id: card.id,
+            last_review_date: now.toJSDate().toISOString(),
+            ease_factor: reviewResult.easeFactor,
+            interval: reviewResult.interval,
+          };
+        },
+      ),
     )
     .select();
 

functions/services/review-card.ts

@@ -23,7 +23,6 @@ export const reviewCard = (
   easeFactor: number | undefined = startEaseFactor,
   isInterrupted = false,
 ): Result => {
-
   if (reviewOutcome === "correct") {
     interval = interval === 0 ? startInterval : interval * easeFactor;
     easeFactor = Math.min(easeFactor + easeFactorIncrement, startEaseFactor);

src/api/api.ts

@@ -23,6 +23,8 @@ import {
   RemoveDeckFromMineRequest,
   RemoveDeckFromMineResponse,
 } from "../../functions/remove-deck-from-mine.ts";
+import { DeckCatalogResponse } from "../../functions/catalog-decks.ts";
+import { DeckWithCardsResponse } from "../../functions/deck-with-cards.ts";
 
 export const healthRequest = () => {
   return request<HealthResponse>("/health");
@@ -79,3 +81,11 @@ export const removeDeckFromMine = (body: RemoveDeckFromMineRequest) => {
     body,
   );
 };
+
+export const apiDeckCatalog = () => {
+  return request<DeckCatalogResponse>("/catalog-decks");
+};
+
+export const apiDeckWithCards = (deckId: number) => {
+  return request<DeckWithCardsResponse>(`/deck-with-cards?deck_id=${deckId}`);
+};

src/lib/language-code/language-code.ts

@@ -0,0 +1,6 @@
+// ISO 639-1 two-letter language codes
+export enum LanguageCode {
+  Russian = "ru",
+  English = "en",
+  Spanish = "es",
+}

src/lib/string/camel-case-to-human.ts

@@ -0,0 +1,3 @@
+export const camelCaseToHuman = (str: string) => {
+  return str.replace(/([A-Z])/g, " $1");
+};

src/lib/telegram/cloud-storage.ts

@@ -1,3 +1,5 @@
+import { camelCaseToHuman } from "../string/camel-case-to-human.ts";
+
 export enum SpeakLanguageEnum {
   USEnglish = "en-US",
   Italian = "it-IT",
@@ -41,7 +43,7 @@ export const languageKeyToHuman = (str: string): string => {
   if (str === "USEnglish") {
     return "US English";
   }
-  return str.replace(/([A-Z])/g, " $1").trim();
+  return camelCaseToHuman(str);
 };
 
 export const isSpeechSynthesisSupported =

src/lib/voice-playback/speak.ts

@@ -17,6 +17,8 @@ import {
   useRestoreFullScreenExpand,
 } from "../lib/telegram/prevent-telegram-swipe-down-closing.tsx";
 import { RepeatAllScreen } from "./deck-review/repeat-all-screen.tsx";
+import { DeckCatalog } from "./deck-catalog/deck-catalog.tsx";
+import { DeckCatalogStoreContextProvider } from "../store/deck-catalog-store-context.tsx";
 
 export const App = observer(() => {
   useRestoreFullScreenExpand();
@@ -70,6 +72,13 @@ export const App = observer(() => {
           </UserSettingsStoreProvider>
         </PreventTelegramSwipeDownClosingIos>
       )}
+      {screenStore.screen.type === "deckCatalog" && (
+        <PreventTelegramSwipeDownClosingIos>
+          <DeckCatalogStoreContextProvider>
+            <DeckCatalog />
+          </DeckCatalogStoreContextProvider>
+        </PreventTelegramSwipeDownClosingIos>
+      )}
     </div>
   );
 });