Skip to content

Commit a33e4e7

Browse files
authored
キャンパスとか学部の更新の修正と、関係ないバグの修正 (#292)
* wip * fixed it?
1 parent c3be4e4 commit a33e4e7

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

server/routes/users/me.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ const route = new Hono()
6666
learningLanguages: {
6767
select: { language: true },
6868
},
69+
campus: {
70+
include: {
71+
university: true,
72+
},
73+
},
74+
division: true,
6975
},
7076
});
7177

web/src/features/settings/UserFormController.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { formatCardUser } from "@/features/format";
55
import { type MYDATA, useUserContext } from "@/features/user/userProvider";
66
import type { CreateUser, FlatCardUser } from "common/zod/schema";
77
import { useLocale, useTranslations } from "next-intl";
8-
import { useRouter } from "next/navigation";
98
import { createContext, useCallback, useContext, useEffect, useState } from "react";
109
import { useRef } from "react";
1110
import { useAuthContext } from "../auth/providers/AuthProvider.tsx";
@@ -56,7 +55,6 @@ export const UserFormProvider = ({
5655
}) => {
5756
const t = useTranslations();
5857
const toast = useToast();
59-
const router = useRouter();
6058
const locale = useLocale();
6159
let me: MYDATA | null = null;
6260
const setMyData = useRef<((data: Partial<MYDATA>) => void) | null>(null);
@@ -212,12 +210,11 @@ export const UserFormProvider = ({
212210
}
213211
} catch (err) {
214212
console.error("ユーザー情報の取得に失敗しました", err);
215-
router.push("/login");
216213
}
217214
};
218215

219216
fetchMyData();
220-
}, [me, loadPreviousData, router]);
217+
}, [me, loadPreviousData]);
221218

222219
const refetchFavoriteUsers = useCallback(async () => {
223220
try {
@@ -227,7 +224,6 @@ export const UserFormProvider = ({
227224
query: {
228225
except: me.id,
229226
marker: "favorite",
230-
wantsToMatch: "ignore",
231227
},
232228
});
233229

0 commit comments

Comments
 (0)