continue a dev les entreprise et ajouter les fonctionalitée pas encore m

softpython2884 · softpython2884 · commit ca5378e04a3c · 2025-07-06T13:46:42.000Z
diff --git a/src/app/companies/page.tsx b/src/app/companies/page.tsx
@@ -1,85 +1,129 @@
-'use client';
-
-import { useEffect, useState, useCallback } from 'react';
-import { getCompanies, Company } from '@/lib/actions/companies';
+import { getCompaniesForUserDashboard, ManagedCompany, InvestedCompany, OtherCompany } from '@/lib/actions/companies';
 import { Card, CardHeader, CardTitle, CardDescription, CardContent } from "@/components/ui/card";
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
 import { Badge } from "@/components/ui/badge";
 import { CreateCompanyDialog } from '@/components/create-company-dialog';
 import { Button } from '@/components/ui/button';
 import Link from 'next/link';
-import { Loader2 } from 'lucide-react';
-
-export default function CompaniesPage() {
-  const [companies, setCompanies] = useState<Company[]>([]);
-  const [loading, setLoading] = useState(true);
+import { InvestDialog } from '@/components/invest-dialog';
+import type { CompanyWithDetails } from '@/lib/actions/companies';
 
-  const fetchCompanies = useCallback(async () => {
-    setLoading(true);
-    const companiesData = await getCompanies();
-    setCompanies(companiesData);
-    setLoading(false);
-  }, []);
 
-  useEffect(() => {
-    fetchCompanies();
-  }, [fetchCompanies]);
+function CompanyTableRow({ company, type }: { company: any, type: 'managed' | 'invested' | 'other' }) {
+    return (
+        <TableRow>
+            <TableCell>
+                <div className="font-medium">{company.name}</div>
+                <div className="text-sm text-muted-foreground">{company.industry}</div>
+            </TableCell>
+            {type === 'managed' && (
+                 <TableCell>
+                    <Badge variant="secondary">{company.role.toUpperCase()}</Badge>
+                </TableCell>
+            )}
+            {type === 'invested' && (
+                <>
+                    <TableCell className="font-mono">{company.sharesHeld.toFixed(4)}</TableCell>
+                    <TableCell className="font-mono">${company.sharesValue.toFixed(2)}</TableCell>
+                </>
+            )}
+            {(type === 'managed' || type === 'other') && (
+                <TableCell className="font-mono">${company.cash.toFixed(2)}</TableCell>
+            )}
+             {type === 'other' && (
+                <TableCell className="font-mono">${company.marketCap.toLocaleString(undefined, { maximumFractionDigits: 0})}</TableCell>
+            )}
+            <TableCell className="text-right space-x-2">
+                <Button asChild variant="outline" size="sm">
+                  <Link href={`/companies/${company.id}`}>Détails</Link>
+                </Button>
+                {type === 'other' && (
+                    <InvestDialog company={company as CompanyWithDetails}>
+                        <Button size="sm">Investir</Button>
+                    </InvestDialog>
+                )}
+            </TableCell>
+        </TableRow>
+    )
+}
 
-  if (loading) {
+function CompanyTable({ title, description, companies, type }: { title: string, description: string, companies: any[], type: 'managed' | 'invested' | 'other' }) {
+    const headers = {
+        managed: ["Entreprise", "Mon Rôle", "Trésorerie", ""],
+        invested: ["Entreprise", "Parts Détenues", "Valeur des Parts", ""],
+        other: ["Entreprise", "Trésorerie", "Cap. Boursière", ""]
+    }
+    
     return (
-        <div className="flex h-64 items-center justify-center">
-            <Loader2 className="h-8 w-8 animate-spin" />
-        </div>
+        <Card>
+            <CardHeader>
+                <CardTitle>{title}</CardTitle>
+                <CardDescription>{description}</CardDescription>
+            </CardHeader>
+            <CardContent>
+                <Table>
+                    <TableHeader>
+                        <TableRow>
+                            {headers[type].map((header, i) => (
+                                <TableHead key={i} className={i === headers[type].length - 1 ? 'text-right' : ''}>{header}</TableHead>
+                            ))}
+                        </TableRow>
+                    </TableHeader>
+                    <TableBody>
+                        {companies.length > 0 ? (
+                            companies.map((company) => <CompanyTableRow key={company.id} company={company} type={type} />)
+                        ) : (
+                            <TableRow>
+                                <TableCell colSpan={headers[type].length} className="h-24 text-center text-muted-foreground">
+                                    {type === 'managed' ? "Vous ne gérez aucune entreprise." : type === 'invested' ? "Vous n'avez investi dans aucune entreprise." : "Aucune autre entreprise disponible."}
+                                </TableCell>
+                            </TableRow>
+                        )}
+                    </TableBody>
+                </Table>
+            </CardContent>
+        </Card>
     )
-  }
+}
 
-  return (
-    <Card>
-      <CardHeader className="flex-row items-center justify-between">
-        <div>
-          <CardTitle>Entreprises</CardTitle>
-          <CardDescription>Créez ou investissez dans des entreprises, influencez la gestion et gagnez des dividendes.</CardDescription>
-        </div>
-        <CreateCompanyDialog onCompanyCreated={fetchCompanies} />
-      </CardHeader>
-      <CardContent>
-        <Table>
-          <TableHeader>
-            <TableRow>
-              <TableHead>Entreprise</TableHead>
-              <TableHead>Industrie</TableHead>
-              <TableHead>Trésorerie</TableHead>
-              <TableHead className="text-right">Actions</TableHead>
-            </TableRow>
-          </TableHeader>
-          <TableBody>
-            {companies.length > 0 ? (
-              companies.map((company) => (
-                <TableRow key={company.id}>
-                  <TableCell>
-                    <div className="font-medium">{company.name}</div>
-                  </TableCell>
-                  <TableCell>
-                    <Badge variant="secondary">{company.industry}</Badge>
-                  </TableCell>
-                  <TableCell className="font-mono">${parseFloat(company.cash).toFixed(2)}</TableCell>
-                  <TableCell className="text-right space-x-2">
-                    <Button asChild variant="outline" size="sm">
-                      <Link href={`/companies/${company.id}`}>Détails</Link>
-                    </Button>
-                  </TableCell>
-                </TableRow>
-              ))
-            ) : (
-              <TableRow>
-                <TableCell colSpan={4} className="h-24 text-center text-muted-foreground">
-                  Aucune entreprise n'a encore été créée. Soyez le premier !
-                </TableCell>
-              </TableRow>
+
+export default async function CompaniesPage() {
+    const { managedCompanies, investedCompanies, otherCompanies } = await getCompaniesForUserDashboard();
+    
+    return (
+        <div className="space-y-6">
+            <div className="flex items-center justify-between">
+                <div>
+                    <h1 className="text-2xl font-bold tracking-tight">Espace Entreprises</h1>
+                    <p className="text-muted-foreground">Créez, gérez et investissez dans des entreprises dirigées par des joueurs.</p>
+                </div>
+                <CreateCompanyDialog />
+            </div>
+
+            {managedCompanies.length > 0 && (
+                <CompanyTable 
+                    title="Mes Entreprises (Dirigeant)"
+                    description="Les entreprises que vous gérez directement."
+                    companies={managedCompanies}
+                    type="managed"
+                />
             )}
-          </TableBody>
-        </Table>
-      </CardContent>
-    </Card>
-  );
+
+            {investedCompanies.length > 0 && (
+                <CompanyTable
+                    title="Mes Investissements"
+                    description="Les entreprises dans lesquelles vous détenez des parts."
+                    companies={investedCompanies}
+                    type="invested"
+                />
+            )}
+            
+            <CompanyTable
+                title="Marché des Entreprises"
+                description="Toutes les entreprises disponibles à l'investissement."
+                companies={otherCompanies}
+                type="other"
+            />
+        </div>
+    );
 }
diff --git a/src/components/create-company-dialog.tsx b/src/components/create-company-dialog.tsx
@@ -17,7 +17,6 @@ import {
 import {
   Form,
   FormControl,
-  FormDescription,
   FormField,
   FormItem,
   FormLabel,
@@ -29,21 +28,19 @@ import { useToast } from '@/hooks/use-toast';
 import { createCompany } from '@/lib/actions/companies';
 import { Loader2 } from 'lucide-react';
 import { usePortfolio } from '@/context/portfolio-context';
+import { useRouter } from 'next/navigation';
 
 const companyFormSchema = z.object({
   name: z.string().min(3, "Le nom doit faire au moins 3 caractères.").max(50, "Le nom ne doit pas dépasser 50 caractères."),
   industry: z.string().min(3, "L'industrie doit faire au moins 3 caractères.").max(50, "L'industrie ne doit pas dépasser 50 caractères."),
   description: z.string().min(10, "La description doit faire au moins 10 caractères.").max(200, "La description ne doit pas dépasser 200 caractères."),
 });
 
-interface CreateCompanyDialogProps {
-  onCompanyCreated: () => void;
-}
-
-export function CreateCompanyDialog({ onCompanyCreated }: CreateCompanyDialogProps) {
+export function CreateCompanyDialog() {
   const [open, setOpen] = useState(false);
   const { toast } = useToast();
   const { cash } = usePortfolio();
+  const router = useRouter();
   const creationCost = 1000;
 
   const form = useForm<z.infer<typeof companyFormSchema>>({
@@ -64,7 +61,7 @@ export function CreateCompanyDialog({ onCompanyCreated }: CreateCompanyDialogPro
       toast({ title: "Succès", description: result.success });
       setOpen(false);
       form.reset();
-      onCompanyCreated();
+      router.refresh();
     }
   }
 
@@ -80,7 +77,7 @@ export function CreateCompanyDialog({ onCompanyCreated }: CreateCompanyDialogPro
         <DialogHeader>
           <DialogTitle>Lancer une Nouvelle Entreprise</DialogTitle>
           <DialogDescription>
-            La création d'une entreprise coûte {creationCost.toLocaleString()}$. Cette somme constituera sa trésorerie initiale.
+            La création d'une entreprise coûte ${creationCost.toLocaleString()}. Cette somme constituera sa trésorerie initiale.
             Vous serez nommé PDG.
           </DialogDescription>
         </DialogHeader>
diff --git a/src/components/manage-company-assets-dialog.tsx b/src/components/manage-company-assets-dialog.tsx
@@ -15,6 +15,7 @@ import { useToast } from '@/hooks/use-toast';
 import { Loader2 } from 'lucide-react';
 import { buyAssetForCompany, sellAssetForCompany } from '@/lib/actions/companies';
 import type { CompanyWithDetails } from '@/lib/actions/companies';
+import { useRouter } from 'next/navigation';
 
 interface ManageCompanyAssetsDialogProps {
   company: CompanyWithDetails;
@@ -34,8 +35,9 @@ const sellFormSchema = z.object({
 export function ManageCompanyAssetsDialog({ company, children }: ManageCompanyAssetsDialogProps) {
   const [open, setOpen] = useState(false);
   const [activeTab, setActiveTab] = useState("buy");
-  const { assets, getAssetByTicker, refreshData } = useMarketData();
+  const { assets, getAssetByTicker } = useMarketData();
   const { toast } = useToast();
+  const router = useRouter();
   
   const buyForm = useForm<z.infer<typeof buyFormSchema>>({
     resolver: zodResolver(buyFormSchema),
@@ -70,7 +72,7 @@ export function ManageCompanyAssetsDialog({ company, children }: ManageCompanyAs
       toast({ variant: 'destructive', title: 'Erreur', description: result.error });
     } else if (result.success) {
       toast({ title: 'Succès', description: result.success });
-      await refreshData();
+      router.refresh();
       setOpen(false);
     }
   }
@@ -89,7 +91,7 @@ export function ManageCompanyAssetsDialog({ company, children }: ManageCompanyAs
       toast({ variant: 'destructive', title: 'Erreur', description: result.error });
     } else if (result.success) {
       toast({ title: 'Succès', description: result.success });
-      await refreshData();
+      router.refresh();
       setOpen(false);
     }
   }
diff --git a/src/lib/actions/companies.ts b/src/lib/actions/companies.ts
@@ -5,7 +5,7 @@ import { db } from '@/lib/db';
 import { companies, companyMembers, users, companyShares, companyHoldings, assets as assetsSchema } from '@/lib/db/schema';
 import { getSession } from '../session';
 import { revalidatePath } from 'next/cache';
-import { eq, and } from 'drizzle-orm';
+import { eq, and, desc } from 'drizzle-orm';
 import { updatePriceFromTrade } from './assets';
 
 const createCompanySchema = z.object({
@@ -74,19 +74,72 @@ export async function createCompany(values: z.infer<typeof createCompanySchema>)
   }
 }
 
-export async function getCompanies() {
-  try {
-    const allCompanies = await db.query.companies.findMany({
-        orderBy: (companies, { desc }) => [desc(companies.createdAt)],
-    });
-    return allCompanies;
-  } catch (error) {
-    console.error("Error fetching companies:", error);
-    return [];
+export async function getCompaniesForUserDashboard() {
+  const session = await getSession();
+
+  const allCompanies = await db.query.companies.findMany({
+      orderBy: (companies, { desc }) => [desc(companies.createdAt)],
+  });
+
+  const companiesWithMarketData = allCompanies.map(company => {
+      const cash = parseFloat(company.cash);
+      const totalShares = parseFloat(company.totalShares);
+      const sharePrice = parseFloat(company.sharePrice);
+      const marketCap = totalShares * sharePrice;
+      
+      return {
+          ...company,
+          cash: cash,
+          marketCap: marketCap,
+          sharePrice: sharePrice,
+          totalShares: totalShares,
+      }
+  });
+
+
+  if (!session?.id) {
+    return {
+      managedCompanies: [],
+      investedCompanies: [],
+      otherCompanies: companiesWithMarketData,
+    };
   }
+
+  const [userMemberships, userShares] = await Promise.all([
+    db.query.companyMembers.findMany({ where: eq(companyMembers.userId, session.id) }),
+    db.query.companyShares.findMany({ where: eq(companyShares.userId, session.id) }),
+  ]);
+
+  const managedCompanyIds = new Set(userMemberships.map(m => m.companyId));
+  const investedCompanyIds = new Set(userShares.map(s => s.companyId));
+
+  const managedCompanies: any[] = [];
+  const investedCompanies: any[] = [];
+  const otherCompanies: any[] = [];
+
+  companiesWithMarketData.forEach(company => {
+    if (managedCompanyIds.has(company.id)) {
+      const membership = userMemberships.find(m => m.companyId === company.id);
+      managedCompanies.push({ ...company, role: membership?.role });
+    } else if (investedCompanyIds.has(company.id)) {
+      const share = userShares.find(s => s.companyId === company.id);
+      const sharesHeld = parseFloat(share?.quantity || '0');
+      investedCompanies.push({ 
+          ...company, 
+          sharesHeld: sharesHeld,
+          sharesValue: sharesHeld * company.sharePrice,
+      });
+    } else {
+      otherCompanies.push(company);
+    }
+  });
+
+  return { managedCompanies, investedCompanies, otherCompanies };
 }
 
-export type Company = Awaited<ReturnType<typeof getCompanies>>[0];
+export type ManagedCompany = Awaited<ReturnType<typeof getCompaniesForUserDashboard>>['managedCompanies'][0];
+export type InvestedCompany = Awaited<ReturnType<typeof getCompaniesForUserDashboard>>['investedCompanies'][0];
+export type OtherCompany = Awaited<ReturnType<typeof getCompaniesForUserDashboard>>['otherCompanies'][0];
 
 
 export async function getCompanyById(companyId: number) {
