Refactored queries.

src/pages/api/teams/[id]/index.ts

@@ -4,7 +4,7 @@ import { useAuth, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, notFound, ok, unauthorized } from 'next-basics';
-import { deleteTeam, getTeamById, updateTeam } from 'queries';
+import { deleteTeam, getTeam, updateTeam } from 'queries';
 import * as yup from 'yup';
 
 export interface TeamRequestQuery {
@@ -44,7 +44,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const team = await getTeamById(teamId, { includeTeamUser: true });
+    const team = await getTeam(teamId, { includeMembers: true });
 
     if (!team) {
       return notFound(res);

src/pages/api/teams/[id]/users/index.ts

@@ -4,7 +4,7 @@ import { pageInfo } from 'lib/schema';
 import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { createTeamUser, getTeamUser, getUsersByTeamId } from 'queries';
+import { createTeamUser, getTeamUser, getTeamUsers } from 'queries';
 import * as yup from 'yup';
 
 export interface TeamUserRequestQuery extends SearchFilter {
@@ -46,7 +46,7 @@ export default async (
 
     const { query, page, pageSize } = req.query;
 
-    const users = await getUsersByTeamId(teamId, {
+    const users = await getTeamUsers(teamId, {
       query,
       page,
       pageSize: +pageSize || undefined,

src/pages/api/teams/[id]/websites/index.ts

@@ -5,7 +5,7 @@ import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
 import { pageInfo } from 'lib/schema';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { createWebsite, getWebsitesByTeamId } from 'queries';
+import { createWebsite, getTeamWebsites } from 'queries';
 import { uuid } from 'lib/crypto';
 
 export interface TeamWebsiteRequestQuery extends SearchFilter {
@@ -46,7 +46,7 @@ export default async (
 
     const { page, query, pageSize } = req.query;
 
-    const websites = await getWebsitesByTeamId(teamId, {
+    const websites = await getTeamWebsites(teamId, {
       page,
       query,
       pageSize: +pageSize || undefined,

src/pages/api/teams/index.ts

@@ -6,7 +6,7 @@ import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
 import { pageInfo } from 'lib/schema';
 import { NextApiResponse } from 'next';
 import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { createTeam, getTeamsByUserId } from 'queries';
+import { createTeam, getUserTeams } from 'queries';
 import * as yup from 'yup';
 
 export interface TeamsRequestQuery extends SearchFilter {}
@@ -37,7 +37,7 @@ export default async (
   if (req.method === 'GET') {
     const { page, query, pageSize } = req.query;
 
-    const results = await getTeamsByUserId(userId, {
+    const results = await getUserTeams(userId, {
       page,
       query,
       pageSize: +pageSize || undefined,

src/pages/api/teams/join.ts

@@ -4,7 +4,7 @@ import { useAuth, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, notFound, ok } from 'next-basics';
-import { createTeamUser, getTeamByAccessCode, getTeamUser } from 'queries';
+import { createTeamUser, findTeam, getTeamUser } from 'queries';
 import * as yup from 'yup';
 export interface TeamsJoinRequestBody {
   accessCode: string;
@@ -26,7 +26,11 @@ export default async (
   if (req.method === 'POST') {
     const { accessCode } = req.body;
 
-    const team = await getTeamByAccessCode(accessCode);
+    const team = await findTeam({
+      where: {
+        accessCode,
+      },
+    });
 
     if (!team) {
       return notFound(res, 'message.team-not-found');