Add starting balance field in schema

app/db/models_family.py

@@ -13,8 +13,7 @@ class Family(Base):
     id = Column(Integer, primary_key=True, index=True)
     family_code = Column(String(10), unique=True, index=True, nullable=False)
     head_id = Column(Integer, ForeignKey("user_accounts.id"), nullable=False)
-
-    total_balance = Column(Float, default=0.0)
+    starting_balance = Column(Float, nullable=False)
     monthly_budget = Column(Float, default=0.0)
     expected_members = Column(String, nullable=True)
     created_at = Column(DateTime(timezone=True), server_default=func.now())

app/routers/family.py

@@ -26,41 +26,50 @@ def family_setup(
     if current_user.role != "head":
         raise HTTPException(403, "Only family head can create family")
 
-    # Prevent duplicate setup
-    existing = db.query(Family).filter(Family.head_id == current_user.id).first()
+    # ❗ Prevent duplicate family creation
+    existing = db.query(Family).filter(
+        Family.head_id == current_user.id
+    ).first()
+
     if existing:
         raise HTTPException(400, "Family already created")
 
-    # 1️⃣ Create Family
-    fam = Family(
+    # ---------------- 1️⃣ CREATE FAMILY (ONE TIME) ----------------
+    family = Family(
         family_code=current_user.family_code,
         head_id=current_user.id,
-        total_balance=payload.total_balance,
+        total_balance=payload.starting_balance,
         expected_members=",".join(payload.members)
     )
 
-    db.add(fam)
+    db.add(family)
     db.commit()
-    db.refresh(fam)
+    db.refresh(family)
 
-    # 2️⃣ Insert Family Members
+    # ---------------- 2️⃣ CREATE FAMILY MEMBERS ----------------
     for name in payload.members:
-        db.add(FamilyMember(
-            family_code=fam.family_code,
-            name=name,
-            role="member",
-            allocated_budget=0,
-            spent_amount=0
-        ))
+        db.add(
+            FamilyMember(
+                family_code=family.family_code,
+                name=name.strip(),
+                role="member",
+                allocated_budget=0,
+                spent_amount=0
+            )
+        )
     db.commit()
 
-    # 3️⃣ Create Monthly Budget & Income Record
+    # ---------------- 3️⃣ CREATE FIRST MONTHLY RECORD ----------------
+    closing_balance = payload.starting_balance + payload.monthly_income
+
     monthly = FamilyMonthly(
-        family_id=fam.id,
+        family_id=family.id,
         year=payload.year,
         month=payload.month,
+        starting_balance=payload.starting_balance,
         monthly_income=payload.monthly_income,
-        monthly_budget=payload.monthly_budget
+        monthly_budget=payload.monthly_budget,
+        closing_balance=closing_balance
     )
 
     db.add(monthly)
@@ -68,17 +77,22 @@ def family_setup(
 
     return {
         "status": True,
-        "message": "Family + Monthly Budget setup completed",
+        "message": "Family setup completed successfully",
         "family": {
-            "family_code": fam.family_code,
-            "members": payload.members,
-            "monthly_budget": payload.monthly_budget,
-            "monthly_income": payload.monthly_income,
+            "family_code": family.family_code,
+            "members": payload.members
+        },
+        "monthly": {
             "year": payload.year,
-            "month": payload.month
+            "month": payload.month,
+            "starting_balance": payload.starting_balance,
+            "monthly_income": payload.monthly_income,
+            "monthly_budget": payload.monthly_budget,
+            "closing_balance": closing_balance
         }
     }
 
+
 @router.post("/monthly-setup")
 def monthly_setup(
     payload: MonthlySetupRequest,

app/schemas/schemas.py

@@ -58,13 +58,11 @@ class FamilySummary(BaseModel):
     needs_monthly_setup: bool
 
 class FamilySetupRequest(BaseModel):
-    total_balance: float
-    total_income: float
-    monthly_income: float        # ⬅ NEW
-    monthly_budget: float        # ⬅ NEW
-    year: int                    # ⬅ NEW
-    month: int                   # ⬅ NEW (1–12)
-    
+    starting_balance: float      # 🔑 renamed from opening_balance
+    monthly_income: float
+    monthly_budget: float
+    year: int
+    month: int                   # 1–12
     members: List[str]
 
 class UpdateFamilyMemberRequest(BaseModel):