Merge pull request #22 from atsuh1r0/develop

20231023リリース

Author: ko-shiro-hap

src/app/api/users/[uuid]/route.ts

@@ -10,6 +10,7 @@ export async function GET(request: Request, {params}: {params: {uuid: string}})
   .from('users')
   .select(`
     id,
+    auth_id,
     name,
     icon_path,
     posses(id, posse),

src/app/api/users/route.ts

@@ -9,6 +9,7 @@ export async function GET(request: NextRequest) {
   .from('users')
   .select(`
     id,
+    auth_id,
     name,
     icon_path,
     posses(id, posse),

src/app/auth/sign-in/route.ts

@@ -1,4 +1,3 @@
-import { getLoginUserWithStatuses } from '@/services/getLoginUserWithStatuses'
 import { createRouteHandlerClient } from '@supabase/auth-helpers-nextjs'
 import { cookies } from 'next/headers'
 import { NextResponse } from 'next/server'
@@ -46,7 +45,7 @@ export async function POST(request: Request) {
     )
   }
 
-  return NextResponse.redirect(requestUrl.origin, {
+  return NextResponse.redirect(`${requestUrl.origin}?id=${publicLoginUserData.data.auth_id}`, {
     // a 301 status is required to redirect from a POST to a GET route
     status: 301,
   })

src/app/features/top/Top.tsx

@@ -11,12 +11,12 @@ import { Loading } from "@/components/common/Loading";
 import { FirstView } from "@/app/features/top/FirstView";
 import { ToggleContents } from "@/app/features/top/ToggleContents";
 import { RecordStatusModal } from "@/app/features/top/RecordStatusModal";
-
-// 仮
-const loginUserId = 1;
-
+import { useSearchParams } from "next/navigation";
 
 export const Top: FC = () => {
+  const searchParams = useSearchParams();
+  const uuid = searchParams.get("id");
+
   const [isModalOpened, setIsModalOpened] = useState(false)
   const [isEntered, setIsEntered] = useState(false);
   const [usersData, setUsersData] = useState<User[]>([]);
@@ -27,18 +27,23 @@ export const Top: FC = () => {
   useEffect(() => {
     const fetchUsersData = async () => {
       const usersWithStatusesDataRes = await getUsersWithTodayStatuses();
-      const loginUserWithStatusesData = usersWithStatusesDataRes.filter((userData: User) => userData.id === loginUserId);
+      const loginUserWithStatusesData = usersWithStatusesDataRes.filter((userData: User) => userData.auth_id === uuid);
       const placesDataRes = await getPlaces();
       const workingStatusesDataRes = await getWorkingStatuses();
 
       setUsersData(usersWithStatusesDataRes);
       setLoginUserData(loginUserWithStatusesData[0]);
       setPlacesData(placesDataRes);
       setWorkingStatusesData(workingStatusesDataRes);
-      setIsEntered(loginUserWithStatusesData[0].statuses.length > 0 ? loginUserWithStatusesData[0].statuses[0].is_entered : false);
+      if(loginUserWithStatusesData.length === 0) {
+        window.location.href = '/login';
+        setIsEntered(false);
+      } else {
+        setIsEntered(loginUserWithStatusesData[0].statuses.length > 0 ? loginUserWithStatusesData[0].statuses[0].is_entered : false);
+      }
     }
     fetchUsersData();
-  }, []);
+  }, [uuid]);
 
   return (
     <>

src/app/register/page.tsx

@@ -110,7 +110,7 @@ export default function Register() {
     }
 
     setOnSubmitLoading(false)
-    router.push('/')
+    router.push(`/?id=${uuid}`)
   }
 
   return (

src/types/supabase/index.ts

@@ -1,5 +1,6 @@
 export type User = {
   id: number,
+  auth_id: string,
   name: string,
   icon_path: string
   posses: Posse,