want to match? (#283)

Author: aster-void

.gitignore

@@ -19,3 +19,5 @@ tsconfig.tsbuildinfo
 /.direnv
 /.envrc
 /shell.nix
+
+server/node_modules/.cache

common/zod/schema.ts

@@ -49,6 +49,8 @@ const BaseUserSchema = z.object({
   isForeignStudent: z.boolean().default(false),
   grade: GradeSchema,
 
+  wantToMatch: z.boolean().default(true),
+
   hobby: HobbySchema,
   introduction: IntroductionSchema,
 });

server/prisma/schema.prisma

@@ -17,6 +17,7 @@ model User {
   grade            Grade
   hobby            String
   introduction     String
+  wantToMatch      Boolean  @default(true)
   // universityId     String
   // university       University @relation(fields: [universityId], references: [university])
   divisionId       String

server/routes/community.ts

@@ -16,17 +16,22 @@ const router = new Hono().get(
       exchangeQuery: z.enum(["exchange", "japanese", "all"]).default("all"),
       searchQuery: z.string().default(""),
       marker: z.union([MarkerSchema, z.literal("notBlocked")]).optional(),
+      wantsToMatch: z.enum(["true"]).optional(),
     }),
   ),
   zValidator("header", z.object({ Authorization: z.string() })),
   async (c) => {
     const requester = await getUserID(c);
-    const { except, page, exchangeQuery, searchQuery, marker: markerQuery } = c.req.valid("query");
+    const { except, page, exchangeQuery, searchQuery, marker: markerQuery, wantsToMatch } = c.req.valid("query");
     const take = 15; //TODO: web側で指定できるようにする
     const skip = (page - 1) * take;
 
     const whereCondition: Prisma.UserWhereInput = {};
 
+    if (wantsToMatch) {
+      whereCondition.wantToMatch = wantsToMatch === "true";
+    }
+
     // 言語交換フィルター
     if (exchangeQuery === "exchange") {
       whereCondition.isForeignStudent = true;
@@ -111,6 +116,7 @@ const router = new Hono().get(
           gender: true,
           isForeignStudent: true,
           imageUrl: true,
+          wantToMatch: true,
           campus: {
             select: { university: true, id: true, jaName: true, enName: true },
           },

server/routes/users/index.ts

@@ -35,6 +35,7 @@ const router = new Hono()
           imageUrl: true,
           isForeignStudent: true,
           grade: true,
+          wantToMatch: true,
 
           hobby: true,
           introduction: true,

web/messages/en.json

@@ -74,6 +74,7 @@
       "male": "Male",
       "female": "Female",
       "other": "Other",
+      "want-to-match": "Want to match more?",
       "photo": "Photo",
       "photoUpload": "Upload"
     },

web/messages/ja.json

@@ -74,6 +74,7 @@
       "male": "男性",
       "female": "女性",
       "other": "その他",
+      "want-to-match": "新規にマッチングしたいですか？",
       "photo": "写真",
       "photoUpload": "アップロード"
     },

web/src/app/[locale]/(auth)/community/page.tsx

@@ -101,6 +101,7 @@ export default function Page() {
               exchangeQuery: query.exchange,
               searchQuery: query.search,
               marker: query.marker === "favorite" ? "favorite" : "notBlocked",
+              wantsToMatch: "true",
             },
             header: { Authorization },
           },

web/src/app/[locale]/(auth)/settings/basic/page.tsx

@@ -36,6 +36,16 @@ export default function Page() {
           <option value="other"> {t("basic.other")}</option>
         </select>
       </label>
+      <label className={styles.label}>
+        <span className={styles.labelSpan}>{t("basic.want-to-match")}</span>
+        <input
+          type="checkbox"
+          name="wanttomatch"
+          className={styles.inputToggle}
+          value={ctx.formData.name}
+          onChange={ctx.handleChange}
+        />
+      </label>
       <div className={styles.label}>
         <input
           type="file"

web/src/app/[locale]/(auth)/settings/components/SubmitButton.tsx

@@ -4,26 +4,31 @@ import { useTranslations } from "next-intl";
 import { styles } from "../shared-class.ts";
 
 export function SubmitButton({ status }: { status: Status }) {
-  const t = useTranslations("settings");
   return (
     <div className={styles.submitButtonWrapperDiv}>
-      <button
-        type="submit"
-        className={clsx(styles.submitButton, {
-          "btn-primary": status === "ready",
-          "btn-error": status === "error",
-          "btn-success": status === "success",
-        })}
-        disabled={status !== "ready"}
-      >
-        {status === "ready"
-          ? t("register")
-          : status === "processing"
-            ? t("isRegister")
-            : status === "success"
-              ? t("success")
-              : t("failed")}
-      </button>
+      <SubmitButtonItem status={status} />
     </div>
   );
 }
+export function SubmitButtonItem({ status }: { status: Status }) {
+  const t = useTranslations("settings");
+  return (
+    <button
+      type="submit"
+      className={clsx(styles.submitButton, {
+        "btn-primary": status === "ready",
+        "btn-error": status === "error",
+        "btn-success": status === "success",
+      })}
+      disabled={status !== "ready"}
+    >
+      {status === "ready"
+        ? t("register")
+        : status === "processing"
+          ? t("isRegister")
+          : status === "success"
+            ? t("success")
+            : t("failed")}
+    </button>
+  );
+}