continue le dev les entreprise, et améliore la page principale des entre

softpython2884 · softpython2884 · commit 36dc85a1f1d7 · 2025-07-06T13:32:10.000Z
diff --git a/src/app/companies/[companyId]/page.tsx b/src/app/companies/[companyId]/page.tsx
@@ -10,6 +10,7 @@ import { Avatar, AvatarFallback } from '@/components/ui/avatar';
 import { InvestDialog } from '@/components/invest-dialog';
 import { getSession } from '@/lib/session';
 import { ManageCompanyAssetsDialog } from '@/components/manage-company-assets-dialog';
+import { AddCompanyCashDialog } from '@/components/add-company-cash-dialog';
 
 
 function getInitials(name: string) {
@@ -44,9 +45,16 @@ export default async function CompanyDetailPage({ params }: { params: { companyI
           <h1 className="text-2xl font-bold tracking-tight">{company.name}</h1>
           <p className="text-muted-foreground">{company.description}</p>
         </div>
-        <InvestDialog company={company}>
-            <Button>Investir</Button>
-        </InvestDialog>
+        <div className="flex items-center gap-2">
+            {isCEO && (
+                <AddCompanyCashDialog companyId={company.id}>
+                    <Button variant="outline">Ajouter des fonds</Button>
+                </AddCompanyCashDialog>
+            )}
+            <InvestDialog company={company}>
+                <Button>Investir</Button>
+            </InvestDialog>
+        </div>
       </div>
 
       <div className="grid gap-6 md:grid-cols-2 lg:grid-cols-4">
diff --git a/src/components/add-company-cash-dialog.tsx b/src/components/add-company-cash-dialog.tsx
@@ -0,0 +1,102 @@
+'use client';
+
+import { useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { z } from 'zod';
+import { Button } from '@/components/ui/button';
+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from '@/components/ui/dialog';
+import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form';
+import { Input } from '@/components/ui/input';
+import { usePortfolio } from '@/context/portfolio-context';
+import { useToast } from '@/hooks/use-toast';
+import { Loader2 } from 'lucide-react';
+import { addCashToCompany } from '@/lib/actions/companies';
+
+interface AddCompanyCashDialogProps {
+  companyId: number;
+  children: React.ReactNode;
+}
+
+const formSchema = z.object({
+  amount: z.coerce.number().positive({ message: 'Le montant doit être supérieur à zéro.' }),
+});
+
+export function AddCompanyCashDialog({ companyId, children }: AddCompanyCashDialogProps) {
+  const [open, setOpen] = useState(false);
+  const { cash } = usePortfolio();
+  const { toast } = useToast();
+  const form = useForm<z.infer<typeof formSchema>>({
+    resolver: zodResolver(formSchema),
+    defaultValues: {
+        amount: undefined,
+    }
+  });
+
+  const amount = form.watch('amount') || 0;
+  
+  async function onSubmit(values: z.infer<typeof formSchema>) {
+    const result = await addCashToCompany(companyId, values.amount);
+    if (result.error) {
+      toast({ variant: 'destructive', title: 'Erreur', description: result.error });
+    } else if (result.success) {
+      toast({ title: 'Succès', description: result.success });
+      setOpen(false);
+      form.reset();
+    }
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={(isOpen) => {
+        setOpen(isOpen)
+        if (!isOpen) form.reset();
+    }}>
+      <DialogTrigger asChild>{children}</DialogTrigger>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Ajouter des fonds à la Trésorerie</DialogTitle>
+          <DialogDescription>
+            Transférez des fonds de votre solde personnel vers la trésorerie de l'entreprise.
+            Fonds disponibles : ${cash.toFixed(2)}
+          </DialogDescription>
+        </DialogHeader>
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
+             <FormField
+              control={form.control}
+              name="amount"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Montant à ajouter</FormLabel>
+                  <div className="relative">
+                    <FormControl>
+                      <Input 
+                        type="number" 
+                        step="0.01" 
+                        placeholder="0.00" 
+                        {...field} 
+                        value={field.value ?? ''}
+                        onChange={e => field.onChange(e.target.value === '' ? undefined : e.target.valueAsNumber)} />
+                    </FormControl>
+                     <Button type="button" variant="ghost" size="sm" className="absolute right-1 top-1/2 -translate-y-1/2 h-7" onClick={() => form.setValue('amount', cash, { shouldValidate: true })}>
+                        Max
+                      </Button>
+                  </div>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            
+            <DialogFooter>
+               <Button type="button" variant="secondary" onClick={() => setOpen(false)}>Annuler</Button>
+               <Button type="submit" disabled={form.formState.isSubmitting || amount > cash || !form.formState.isValid}>
+                {form.formState.isSubmitting && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
+                Ajouter ${amount > 0 ? amount.toFixed(2) : '0.00'}
+              </Button>
+            </DialogFooter>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/src/components/create-company-dialog.tsx b/src/components/create-company-dialog.tsx
@@ -28,6 +28,7 @@ import { Textarea } from '@/components/ui/textarea';
 import { useToast } from '@/hooks/use-toast';
 import { createCompany } from '@/lib/actions/companies';
 import { Loader2 } from 'lucide-react';
+import { usePortfolio } from '@/context/portfolio-context';
 
 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."),
@@ -42,6 +43,8 @@ interface CreateCompanyDialogProps {
 export function CreateCompanyDialog({ onCompanyCreated }: CreateCompanyDialogProps) {
   const [open, setOpen] = useState(false);
   const { toast } = useToast();
+  const { cash } = usePortfolio();
+  const creationCost = 1000;
 
   const form = useForm<z.infer<typeof companyFormSchema>>({
     resolver: zodResolver(companyFormSchema),
@@ -77,7 +80,8 @@ export function CreateCompanyDialog({ onCompanyCreated }: CreateCompanyDialogPro
         <DialogHeader>
           <DialogTitle>Lancer une Nouvelle Entreprise</DialogTitle>
           <DialogDescription>
-            Créez votre propre entreprise virtuelle. Gérez des actifs et distribuez des dividendes à vos actionnaires.
+            La création d'une entreprise coûte {creationCost.toLocaleString()}$. Cette somme constituera sa trésorerie initiale.
+            Vous serez nommé PDG.
           </DialogDescription>
         </DialogHeader>
         <Form {...form}>
@@ -125,9 +129,9 @@ export function CreateCompanyDialog({ onCompanyCreated }: CreateCompanyDialogPro
                 
                 <DialogFooter>
                     <Button type="button" variant="secondary" onClick={() => setOpen(false)}>Annuler</Button>
-                    <Button type="submit" disabled={form.formState.isSubmitting}>
+                    <Button type="submit" disabled={form.formState.isSubmitting || cash < creationCost}>
                         {form.formState.isSubmitting && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
-                        Créer l'entreprise
+                        Créer l'entreprise (${creationCost.toLocaleString()})
                     </Button>
                 </DialogFooter>
             </form>
diff --git a/src/lib/actions/companies.ts b/src/lib/actions/companies.ts
@@ -19,6 +19,8 @@ export async function createCompany(values: z.infer<typeof createCompanySchema>)
   if (!session?.id) {
     return { error: "Vous devez être connecté pour créer une entreprise." };
   }
+  
+  const creationCost = 1000;
 
   const validatedFields = createCompanySchema.safeParse(values);
   if (!validatedFields.success) {
@@ -27,13 +29,26 @@ export async function createCompany(values: z.infer<typeof createCompanySchema>)
   const { name, industry, description } = validatedFields.data;
 
   try {
-    await db.transaction(async (tx) => {
-      // Create the company
+    const result = await db.transaction(async (tx) => {
+      const user = await tx.query.users.findFirst({ where: eq(users.id, session.id), columns: { cash: true } });
+      if (!user) throw new Error("Utilisateur non trouvé.");
+      
+      const userCash = parseFloat(user.cash);
+      if (userCash < creationCost) throw new Error(`Fonds insuffisants. La création d'une entreprise coûte ${creationCost.toLocaleString()}$.`);
+
+      // Deduct cost from user
+      const newUserCash = userCash - creationCost;
+      await tx.update(users).set({ cash: newUserCash.toFixed(2) }).where(eq(users.id, session.id));
+
+      // Create the company with initial treasury
       const [newCompany] = await tx.insert(companies).values({
         name,
         industry,
         description,
         creatorId: session.id,
+        cash: creationCost.toFixed(2),
+        totalShares: '10000.00000000',
+        sharePrice: '0.10'
       }).returning();
 
       // Add the creator as the CEO
@@ -42,17 +57,20 @@ export async function createCompany(values: z.infer<typeof createCompanySchema>)
         userId: session.id,
         role: 'ceo',
       });
+
+      return { success: `L'entreprise "${name}" a été créée avec succès ! ${creationCost.toLocaleString()}$ ont été transférés à la trésorerie.` };
     });
 
     revalidatePath('/companies');
-    return { success: `L'entreprise "${name}" a été créée avec succès !` };
+    revalidatePath('/portfolio');
+    return result;
   } catch (error: any) {
     // Check for unique constraint violation
     if (error?.code === '23505') {
         return { error: "Une entreprise avec ce nom existe déjà." };
     }
     console.error("Error creating company:", error);
-    return { error: "Une erreur est survenue lors de la création de l'entreprise." };
+    return { error: error.message || "Une erreur est survenue lors de la création de l'entreprise." };
   }
 }
 
@@ -128,7 +146,7 @@ export async function getCompanyById(companyId: number) {
     const companyCash = parseFloat(company.cash);
     const companyValue = companyCash + portfolioValue;
     const totalShares = parseFloat(company.totalShares);
-    const sharePrice = totalShares > 0 ? companyValue / totalShares : 0;
+    const sharePrice = totalShares > 0 ? companyValue / totalShares : parseFloat(company.sharePrice);
 
     return {
       ...company,
@@ -165,33 +183,17 @@ export async function investInCompany(companyId: number, amount: number): Promis
             if (!user) throw new Error("Utilisateur non trouvé.");
             if (parseFloat(user.cash) < amount) throw new Error("Fonds insuffisants.");
 
-            const company = await tx.query.companies.findFirst({
-                where: eq(companies.id, companyId),
-                with: { holdings: true }
-            });
-            if (!company) throw new Error("Entreprise non trouvée.");
-
-            const allAssets = await tx.query.assets.findMany();
-            const priceMap = allAssets.reduce((map, asset) => {
-                map[asset.ticker] = parseFloat(asset.price);
-                return map;
-            }, {} as Record<string, number>);
-
-            const portfolioValue = company.holdings.reduce((sum, holding) => {
-                const currentPrice = priceMap[holding.ticker] || parseFloat(holding.avgCost);
-                return sum + (parseFloat(holding.quantity) * currentPrice);
-            }, 0);
-
-            const companyValue = parseFloat(company.cash) + portfolioValue;
-            const totalShares = parseFloat(company.totalShares);
-            const preInvestmentSharePrice = totalShares > 0 ? companyValue / totalShares : parseFloat(company.sharePrice);
+            const companyData = await getCompanyById(companyId);
+            if (!companyData) throw new Error("Entreprise non trouvée.");
+            
+            const preInvestmentSharePrice = companyData.sharePrice;
 
             if (amount <= 0) throw new Error("Le montant de l'investissement doit être positif.");
             if (preInvestmentSharePrice <= 0) throw new Error("Le prix de l'action est nul, l'investissement est impossible.");
 
             const sharesToBuy = amount / preInvestmentSharePrice;
-            const newCompanyCash = parseFloat(company.cash) + amount;
-            const newTotalShares = totalShares + sharesToBuy;
+            const newCompanyCash = companyData.cash + amount;
+            const newTotalShares = companyData.totalShares + sharesToBuy;
             
             await tx.update(users).set({ cash: (parseFloat(user.cash) - amount).toFixed(2) }).where(eq(users.id, session.id));
             await tx.update(companies).set({ 
@@ -216,7 +218,7 @@ export async function investInCompany(companyId: number, amount: number): Promis
                 });
             }
             
-            return { success: `Vous avez investi ${amount.toFixed(2)}$ dans ${company.name} !` };
+            return { success: `Vous avez investi ${amount.toFixed(2)}$ dans ${companyData.name} !` };
         });
 
         revalidatePath(`/companies/${companyId}`);
@@ -343,3 +345,37 @@ export async function sellAssetForCompany(companyId: number, holdingId: number,
         return { error: error.message || "Une erreur est survenue lors de la vente." };
     }
 }
+
+
+export async function addCashToCompany(companyId: number, amount: number): Promise<{ success?: string; error?: string }> {
+    const session = await getSession();
+    if (!session?.id) return { error: "Vous devez être connecté." };
+    if (amount <= 0) return { error: "Le montant doit être positif." };
+
+    try {
+        const result = await db.transaction(async (tx) => {
+            const member = await tx.query.companyMembers.findFirst({ where: and(eq(companyMembers.companyId, companyId), eq(companyMembers.userId, session.id)) });
+            if (!member || member.role !== 'ceo') throw new Error("Seul le PDG peut ajouter des fonds à la trésorerie.");
+
+            const user = await tx.query.users.findFirst({ where: eq(users.id, session.id), columns: { cash: true } });
+            if (!user) throw new Error("Utilisateur non trouvé.");
+            if (parseFloat(user.cash) < amount) throw new Error("Fonds personnels insuffisants.");
+
+            const company = await tx.query.companies.findFirst({ where: eq(companies.id, companyId), columns: { cash: true } });
+            if (!company) throw new Error("Entreprise non trouvée.");
+
+            await tx.update(users).set({ cash: (parseFloat(user.cash) - amount).toFixed(2) }).where(eq(users.id, session.id));
+            await tx.update(companies).set({ cash: (parseFloat(company.cash) + amount).toFixed(2) }).where(eq(companies.id, companyId));
+
+            return { success: `${amount.toFixed(2)}$ ajoutés à la trésorerie de l'entreprise.` };
+        });
+
+        revalidatePath(`/companies/${companyId}`);
+        revalidatePath('/portfolio');
+        revalidatePath('/profile');
+        return result;
+
+    } catch (error: any) {
+        return { error: error.message || "Une erreur est survenue." };
+    }
+}
diff --git a/src/lib/db/schema.ts b/src/lib/db/schema.ts
@@ -187,8 +187,8 @@ export const companies = pgTable('companies', {
   description: text('description').notNull(),
   cash: numeric('cash', { precision: 15, scale: 2 }).default('0.00').notNull(),
   creatorId: integer('creator_id').notNull().references(() => users.id, { onDelete: 'restrict' }),
-  sharePrice: numeric('share_price', { precision: 10, scale: 2 }).default('10.00').notNull(),
-  totalShares: numeric('total_shares', { precision: 20, scale: 2 }).default('1000000').notNull(),
+  sharePrice: numeric('share_price', { precision: 10, scale: 2 }).default('0.10').notNull(),
+  totalShares: numeric('total_shares', { precision: 20, scale: 8 }).default('10000.00').notNull(),
   createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(),
 });
 
