made version 2

app/db/models.py

@@ -1,11 +1,17 @@
-import datetime
 import enum
 
-from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, Table, Text
-from sqlalchemy.orm import relationship
+from db.db import Base
+from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, Table, Text, func
+from sqlalchemy.orm import declarative_mixin, relationship
 from sqlalchemy.types import Enum
 
-from db.db import Base
+
+@declarative_mixin
+class TimestampMixin:
+    created_at = Column(
+        DateTime(timezone=True), server_default=func.now(), nullable=False
+    )
+    updated_at = Column(DateTime(timezone=True), onupdate=func.now())
 
 
 class InvestmentStage(enum.Enum):
@@ -16,6 +22,7 @@ class InvestmentStage(enum.Enum):
     GROWTH = "GROWTH"
     LATE_STAGE = "LATE_STAGE"
 
+
 # Association table for many-to-many relationship between investors and companies
 investor_company_association = Table(
     "investor_companies",
@@ -34,7 +41,15 @@ investor_sector_association = Table(
 )
 
 
-class InvestorTable(Base):
+company_sector_association = Table(
+    "company_sector",
+    Base.metadata,
+    Column("company_id", Integer, ForeignKey("companies.id")),
+    Column("sector_id", Integer, ForeignKey("sectors.id")),
+)
+
+
+class InvestorTable(Base, TimestampMixin):
     __tablename__ = "investors"
 
     id = Column(Integer, primary_key=True, index=True)
@@ -46,12 +61,6 @@ class InvestorTable(Base):
     geographic_focus = Column(String, nullable=False)
     stage_focus = Column(Enum(InvestmentStage), nullable=False)
     number_of_investments = Column(Integer, default=0)
-    created_at = Column(DateTime, default=datetime.datetime.now(datetime.UTC))
-    updated_at = Column(
-        DateTime,
-        default=datetime.datetime.now(datetime.UTC),
-        onupdate=datetime.datetime.now(datetime.UTC),
-    )
 
     # Relationship to portfolio companies
     portfolio_companies = relationship(
@@ -59,7 +68,7 @@ class InvestorTable(Base):
         secondary=investor_company_association,
         back_populates="investors",
     )
-    team_members = relationship("InvestorTeamMember", back_populates="investor")
+    team_members = relationship("InvestorMember", back_populates="investor")
     sectors = relationship(
         "SectorTable",
         secondary=investor_sector_association,
@@ -67,22 +76,29 @@ class InvestorTable(Base):
     )
 
 
-class CompanyTable(Base):
+class InvestorMember(Base, TimestampMixin):
+    __tablename__ = "investor_members"
+    id = Column(Integer, primary_key=True, index=True)
+    name = Column(String, nullable=False)
+    role = Column(String, nullable=False)
+    email = Column(String, nullable=False)
+
+    investor_id = Column(Integer, ForeignKey("investors.id"))
+    investor = relationship("InvestorTable", back_populates="team_members")
+
+
+class CompanyTable(Base, TimestampMixin):
     __tablename__ = "companies"
 
     id = Column(Integer, primary_key=True, index=True)
     name = Column(String, nullable=False)
     industry = Column(String, nullable=False)
     location = Column(String, nullable=False)
+    description = Column(String, nullable=True)
     founded_year = Column(Integer, nullable=True)
     website = Column(String, nullable=True)
-    created_at = Column(DateTime, default=datetime.datetime.now(datetime.UTC))
-    updated_at = Column(
-        DateTime,
-        default=datetime.datetime.now(datetime.UTC),
-        onupdate=datetime.datetime.now(datetime.UTC),
-    )
 
+    members = relationship("CompanyMember", back_populates="company")
     # Relationship back to investors
     investors = relationship(
         "InvestorTable",
@@ -90,8 +106,23 @@ class CompanyTable(Base):
         back_populates="portfolio_companies",
     )
 
+    sectors = relationship(
+        "SectorTable", secondary=company_sector_association, back_populates="companies"
+    )
 
-class SectorTable(Base):
+
+class CompanyMember(Base, TimestampMixin):
+    __tablename__ = "company_members"
+    id = Column(Integer, primary_key=True)
+    name = Column(String)
+    linkedin = Column(String)
+    role = Column(String)
+    company_id = Column(Integer, ForeignKey("companies.id"), nullable=False)
+
+    company = relationship("CompanyTable", back_populates="members")
+
+
+class SectorTable(Base, TimestampMixin):
     __tablename__ = "sectors"
 
     id = Column(Integer, primary_key=True, index=True)
@@ -104,13 +135,6 @@ class SectorTable(Base):
         back_populates="sectors",
     )
 
-
-class InvestorTeamMember(Base):
-    __tablename__ = "investor_team"
-    id = Column(Integer, primary_key=True, index=True)
-    name = Column(String, nullable=False)
-    role = Column(String, nullable=False)
-    email = Column(String, nullable=False)
-
-    investor_id = Column(Integer, ForeignKey("investors.id"))
-    investor = relationship("InvestorTable", back_populates="team_members")
+    companies = relationship(
+        "CompanyTable", secondary=company_sector_association, back_populates="sectors"
+    )