diff options
4 files changed, 12 insertions, 29 deletions
diff --git a/app/[lng]/evcp/data-room/owner-companies/[id]/page.tsx b/app/[lng]/evcp/data-room/owner-companies/[id]/page.tsx index cc1901e4..7793fb71 100644 --- a/app/[lng]/evcp/data-room/owner-companies/[id]/page.tsx +++ b/app/[lng]/evcp/data-room/owner-companies/[id]/page.tsx @@ -5,6 +5,7 @@ import { eq } from "drizzle-orm"; import { notFound } from "next/navigation"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { OwnerCompanyForm } from "@/lib/owner-companies/owner-company-form"; +import {getTargetOwnerCompany, getOwnerCompanyUsers} from "@/lib/owner-companies/service" export default async function EditOwnerCompanyPage({ params, @@ -13,11 +14,7 @@ export default async function EditOwnerCompanyPage({ }) { const companyId = parseInt(params.id); - const [company] = await db - .select() - .from(ownerCompanies) - .where(eq(ownerCompanies.id, companyId)) - .limit(1); + const company = await getTargetOwnerCompany(companyId) if (!company) { notFound(); diff --git a/app/[lng]/evcp/data-room/owner-companies/[id]/users/new/page.tsx b/app/[lng]/evcp/data-room/owner-companies/[id]/users/new/page.tsx index f78794c1..58bcca2f 100644 --- a/app/[lng]/evcp/data-room/owner-companies/[id]/users/new/page.tsx +++ b/app/[lng]/evcp/data-room/owner-companies/[id]/users/new/page.tsx @@ -1,10 +1,9 @@ // app/evcp/data-room/owner-companies/[id]/users/new/page.tsx -import db from "@/db/db"; -import { ownerCompanies } from "@/db/schema"; -import { eq } from "drizzle-orm"; + import { notFound } from "next/navigation"; import { Card, CardContent, CardHeader, CardTitle, CardDescription } from "@/components/ui/card"; import { OwnerCompanyUserForm } from "@/lib/owner-companies/owner-company-user-form"; +import {getTargetOwnerCompany} from "@/lib/owner-companies/service" export default async function NewOwnerCompanyUserPage({ params, @@ -13,11 +12,7 @@ export default async function NewOwnerCompanyUserPage({ }) { const companyId = parseInt(params.id); - const [company] = await db - .select() - .from(ownerCompanies) - .where(eq(ownerCompanies.id, companyId)) - .limit(1); + const company = await getTargetOwnerCompany(companyId) if (!company) { notFound(); diff --git a/app/[lng]/evcp/data-room/owner-companies/[id]/users/page.tsx b/app/[lng]/evcp/data-room/owner-companies/[id]/users/page.tsx index 87ebb364..e3682cd7 100644 --- a/app/[lng]/evcp/data-room/owner-companies/[id]/users/page.tsx +++ b/app/[lng]/evcp/data-room/owner-companies/[id]/users/page.tsx @@ -1,13 +1,13 @@ // app/(admin)/owner-companies/[id]/users/page.tsx -import db from "@/db/db"; -import { users, ownerCompanies } from "@/db/schema"; -import { eq } from "drizzle-orm"; + import { Button } from "@/components/ui/button"; import Link from "next/link"; import { notFound } from "next/navigation"; import { ArrowLeft, Plus } from "lucide-react"; import { OwnerCompanyUserList } from "@/lib/owner-companies/owner-company-user-list"; +import {getTargetOwnerCompany, getOwnerCompanyUsers} from "@/lib/owner-companies/service" + export default async function OwnerCompanyUsersPage({ params, }: { @@ -15,21 +15,13 @@ export default async function OwnerCompanyUsersPage({ }) { const companyId = parseInt(params.id); - const [company] = await db - .select() - .from(ownerCompanies) - .where(eq(ownerCompanies.id, companyId)) - .limit(1); + const company = await getTargetOwnerCompany(companyId) if (!company) { notFound(); } - const companyUsers = await db - .select() - .from(users) - .where(eq(users.ownerCompanyId, companyId)) - .orderBy(users.createdAt); + const companyUsers = await getOwnerCompanyUsers(companyId) return ( <div className="container mx-auto py-8"> diff --git a/app/[lng]/evcp/data-room/owner-companies/page.tsx b/app/[lng]/evcp/data-room/owner-companies/page.tsx index 483d58bf..0315af3f 100644 --- a/app/[lng]/evcp/data-room/owner-companies/page.tsx +++ b/app/[lng]/evcp/data-room/owner-companies/page.tsx @@ -1,13 +1,12 @@ // app/evcp/data-room/owner-companies/page.tsx -import db from "@/db/db"; -import { ownerCompanies } from "@/db/schema"; import { Button } from "@/components/ui/button"; import { OwnerCompanyList } from "@/lib/owner-companies/owner-company-list"; import Link from "next/link"; import { Plus } from "lucide-react"; +import {getOwnerCompanyList} from "@/lib/owner-companies/service" export default async function OwnerCompaniesPage() { - const companies = await db.select().from(ownerCompanies).orderBy(ownerCompanies.createdAt); + const companies = await getOwnerCompanyList() return ( <div className="container mx-auto py-8"> |