added calculations and postgres

Author: ericsalesdeandrade

mortgage_calculator/app/crud/mortgage_crud.py

@@ -10,8 +10,15 @@ def create_mortgage_crud(
     payload: schemas.MortgageCreateModel, db: Session = Depends(get_db)
 ):
     try:
+        # Debug print the payload
+        print(f"Payload: {payload}")
+
+        # Create a new mortgage object from the payload
         new_mortgage = models.MortgageOrm(**payload.model_dump())
 
+        # Debug print the new mortgage object
+        print(f"New Mortgage: {new_mortgage}")
+
         # Check whether the property exists in the DB
         property_data = (
             db.query(models.PropertyOrm)
@@ -24,12 +31,25 @@ def create_mortgage_crud(
                 detail="Property not found.",
             )
 
+        # Get Purchase Price of the property and calculate mortgage amount (LTV * Purchase Price)
+        purchase_price = float(property_data.purchase_price)  # Convert to float
+        loan_to_value = float(new_mortgage.loan_to_value)  # Ensure this is float
+        mortgage_amount = (purchase_price * loan_to_value) / 100
+        new_mortgage.mortgage_amount = mortgage_amount
+
+        # Debug print the mortgage amount
+        print(f"Calculated Mortgage Amount: {mortgage_amount}")
+
         db.add(new_mortgage)
         db.commit()
         db.refresh(new_mortgage)
 
+        # Validate the new mortgage object
         mortgage_data = schemas.MortgageModel.model_validate(new_mortgage)
 
+        # Debug print the validated mortgage data
+        print(f"Validated Mortgage Data: {mortgage_data}")
+
         return schemas.MortgageResponseModel(
             status=schemas.Status.Success,
             message="Mortgage created successfully.",

mortgage_calculator/app/crud/property_crud.py

@@ -11,6 +11,7 @@ def create_property_crud(
 ):
     try:
         new_property = models.PropertyOrm(**payload.model_dump())
+        print(new_property.admin_costs)
         db.add(new_property)
         db.commit()
         db.refresh(new_property)

mortgage_calculator/app/custom/calculations.py

@@ -9,7 +9,7 @@ def calculate_interest_only_payment(
     :return: Monthly interest payment.
     """
     monthly_interest_rate = annual_interest_rate / 100 / 12
-    return loan_amount * monthly_interest_rate
+    return round(loan_amount * monthly_interest_rate, 2)
 
 
 def calculate_repayment_mortgage_payment(
@@ -32,4 +32,4 @@ def calculate_repayment_mortgage_payment(
         * (monthly_interest_rate * (1 + monthly_interest_rate) ** total_payments)
         / ((1 + monthly_interest_rate) ** total_payments - 1)
     )
-    return monthly_payment
+    return round(monthly_payment, 2)

mortgage_calculator/app/custom/db_queries.py

@@ -26,12 +26,12 @@ def get_mortgage_payment(mortgage_id: str, db: Session):
 
     if mortgage.mortgage_type == MortgageType.interest_only.value:
         monthly_payment = calculate_interest_only_payment(
-            property.purchase_price, mortgage.interest_rate
+            mortgage.mortgage_amount, mortgage.interest_rate
         )
     elif mortgage.mortgage_type == MortgageType.repayment.value:
         # Assuming a fixed loan term, e.g., 30 years. This could also be dynamically fetched or adjusted.
         monthly_payment = calculate_repayment_mortgage_payment(
-            property.purchase_price, mortgage.interest_rate, 30
+            mortgage.mortgage_amount, mortgage.interest_rate, mortgage.loan_term
         )
     else:
         raise HTTPException(

mortgage_calculator/app/database.py

@@ -1,10 +1,11 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker, declarative_base
 
-SQLITE_DATABASE_URL = "sqlite:///./mortgage.db"
+# SQLITE_DATABASE_URL = "sqlite:///./mortgage.db"
+SQLALCHEMY_DATABASE_URL = "postgresql://myuser:mypassword@localhost/mydatabase"
 
 engine = create_engine(
-    SQLITE_DATABASE_URL, echo=True, connect_args={"check_same_thread": False}
+    SQLALCHEMY_DATABASE_URL,
 )
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 

mortgage_calculator/app/models.py

@@ -40,6 +40,7 @@ class MortgageOrm(Base):
     interest_rate = Column(Numeric(5, 2), nullable=False)
     mortgage_type = Column(SQLAlchemyEnum(MortgageType), nullable=False)
     loan_term = Column(Numeric(5, 2), nullable=True)
+    mortgage_amount = Column(Numeric(10, 2), nullable=False)
 
     property = relationship("PropertyOrm", back_populates="mortgages")
 

mortgage_calculator/app/routes.py

@@ -17,6 +17,7 @@
 import app.schemas as schemas
 from sqlalchemy.orm import Session
 from app.database import get_db
+from typing import Dict
 
 router = APIRouter()
 
@@ -28,7 +29,7 @@
 )
 def create_property(
     property: schemas.PropertyCreateModel, db: Session = Depends(get_db)
-):
+) -> schemas.PropertyResponseModel:
     """
     Create a new property.
     """
@@ -40,7 +41,9 @@ def create_property(
     status_code=status.HTTP_200_OK,
     response_model=schemas.PropertyResponseModel,
 )
-def get_property(property_id: str, db: Session = Depends(get_db)):
+def get_property(
+    property_id: str, db: Session = Depends(get_db)
+) -> schemas.PropertyResponseModel:
     """
     Get a property by ID.
     """
@@ -56,7 +59,7 @@ def update_property(
     property_id: str,
     property: schemas.PropertyUpdateModel,
     db: Session = Depends(get_db),
-):
+) -> schemas.PropertyResponseModel:
     """
     Update a property by ID.
     """
@@ -68,7 +71,9 @@ def update_property(
     status_code=status.HTTP_202_ACCEPTED,
     response_model=schemas.PropertyDeleteModel,
 )
-def delete_property(property_id: str, db: Session = Depends(get_db)):
+def delete_property(
+    property_id: str, db: Session = Depends(get_db)
+) -> schemas.PropertyDeleteModel:
     """
     Delete a property by ID.
     """
@@ -80,7 +85,7 @@ def delete_property(property_id: str, db: Session = Depends(get_db)):
     status_code=status.HTTP_200_OK,
     response_model=schemas.PropertyListResponseModel,
 )
-def get_properties(db: Session = Depends(get_db)):
+def get_properties(db: Session = Depends(get_db)) -> schemas.PropertyListResponseModel:
     """
     Get all properties.
     """
@@ -94,7 +99,7 @@ def get_properties(db: Session = Depends(get_db)):
 )
 def create_mortgage(
     mortgage: schemas.MortgageCreateModel, db: Session = Depends(get_db)
-):
+) -> schemas.MortgageResponseModel:
     """
     Create a new mortgage.
     """
@@ -106,7 +111,9 @@ def create_mortgage(
     status_code=status.HTTP_200_OK,
     response_model=schemas.MortgageResponseModel,
 )
-def get_mortgage(mortgage_id: str, db: Session = Depends(get_db)):
+def get_mortgage(
+    mortgage_id: str, db: Session = Depends(get_db)
+) -> schemas.MortgageResponseModel:
     """
     Get a mortgage by ID.
     """
@@ -122,7 +129,7 @@ def update_mortgage(
     mortgage_id: str,
     mortgage: schemas.MortgageUpdateModel,
     db: Session = Depends(get_db),
-):
+) -> schemas.MortgageResponseModel:
     """
     Update a mortgage by ID.
     """
@@ -134,7 +141,9 @@ def update_mortgage(
     status_code=status.HTTP_202_ACCEPTED,
     response_model=schemas.MortgageDeleteModel,
 )
-def delete_mortgage(mortgage_id: str, db: Session = Depends(get_db)):
+def delete_mortgage(
+    mortgage_id: str, db: Session = Depends(get_db)
+) -> schemas.MortgageDeleteModel:
     """
     Delete a mortgage by ID.
     """
@@ -146,15 +155,15 @@ def delete_mortgage(mortgage_id: str, db: Session = Depends(get_db)):
     status_code=status.HTTP_200_OK,
     response_model=schemas.MortgageListResponseModel,
 )
-def get_mortgages(db: Session = Depends(get_db)):
+def get_mortgages(db: Session = Depends(get_db)) -> schemas.MortgageListResponseModel:
     """
     Get all mortgages.
     """
     return get_mortgages_crud(db=db)
 
 
-@router.post("/mortgage/{mortgage_id}/payment", response_model=dict)
-def get_mortgage_interest_payment(mortgage_id: str, db: Session = Depends(get_db)):
+@router.post("/mortgage/{mortgage_id}/payment", response_model=Dict)
+def calculate_mortgage_payment(mortgage_id: str, db: Session = Depends(get_db)) -> Dict:
     """
     Retrieve the monthly payment for a given mortgage.
     """

mortgage_calculator/app/schemas.py

@@ -63,6 +63,8 @@ class PropertyCreateModel(PropertyBaseModel):
     rental_income: float
     renovation_cost: float
     property_name: str
+    admin_costs: float
+    management_fees: float
 
 
 class PropertyUpdateModel(PropertyBaseModel):
@@ -125,13 +127,21 @@ class MortgageBaseModel(BaseModel):
             "description": "Loan term in years",
         },
     )
+    mortgage_amount: Optional[float] = Field(
+        default=None,
+        json_schema_extra={
+            "example": 225000.00,
+            "description": "Amount of the mortgage. Calculated based on loan to value and purchase price.",
+        },
+    )
 
     model_config = ConfigDict(from_attributes=True)
 
 
 class MortgageCreateModel(MortgageBaseModel):
     loan_to_value: float
     interest_rate: float
+    loan_term: int
     mortgage_type: MortgageType
     property_id: UUID
 

mortgage_calculator/docker/docker-compose.yml

@@ -0,0 +1,17 @@
+version: '3.8'
+
+services:
+  db:
+    image: postgres:latest
+    container_name: postgres_local
+    environment:
+      POSTGRES_USER: myuser
+      POSTGRES_PASSWORD: mypassword
+      POSTGRES_DB: mydatabase
+    ports:
+      - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+
+volumes:
+  postgres_data: