Back 62 afegir nivells de prioritat de empreses

alembic/versions/2024-09-23_22-37__20bff18796a3.py → alembic/versions/2024-09-23_23-42__eb5796b93841.py

@@ -1,15 +1,15 @@
 """empty message
 
-Revision ID: 20bff18796a3
+Revision ID: eb5796b93841
 Revises: 83b72cd40dab
-Create Date: 2024-09-23 22:37:39.866908
+Create Date: 2024-09-23 23:42:10.913359
 
 """
 from alembic import op
 import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
-revision = '20bff18796a3'
+revision = 'eb5796b93841'
 down_revision = '83b72cd40dab'
 branch_labels = None
 depends_on = None
@@ -18,6 +18,7 @@
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.add_column('company', sa.Column('tier', sa.Integer(), nullable=True))
+    op.execute("UPDATE company SET tier=0")
     # ### end Alembic commands ###
 
 

src/impl/Company/model.py

@@ -14,7 +14,7 @@ class Company(BaseModel):
     telephone: str = Column(String)
     website: str = Column(String)
     image: str = Column(String)
-    tier: int = Column(Integer)
+    tier: int = Column(Integer, default=0, nullable=False)
     # is_image_url: bool = Column(Boolean, default=False)
     linkdin: str = Column(String)
     leader_id: int = Column(Integer, ForeignKey('my_user.id'))

src/impl/Company/router_v1.py

@@ -2,7 +2,7 @@
 
 from fastapi import APIRouter, Depends
 
-from src.impl.Company.schema import CompanyCreate, CompanyGetByTier
+from src.impl.Company.schema import CompanyCreate
 from src.impl.Company.schema import CompanyGet
 from src.impl.Company.schema import CompanyGetAll
 from src.impl.Company.schema import CompanyUpdate
@@ -80,6 +80,6 @@ def get_events(companyId: int, token: BaseToken = Depends(JWTBearer())):
     return company_service.get_company_events(companyId)
 
 
-@router.get("/{tier}", response_model=CompanyGetByTier)
+@router.get("/tier/{tier}/", response_model=list[CompanyGet])
 def get_by_tier(tier: int):
     return company_service.get_by_tier(tier)

src/impl/Company/schema.py

@@ -24,6 +24,7 @@ def tier_validator(cls, v):
 
 
 class CompanyGet(BaseSchema):
+    id: int
     name: str
     description: str
     website: str
@@ -35,18 +36,6 @@ class CompanyGet(BaseSchema):
     telephone: str
 
 
-class CompanyGetByTier(BaseSchema):
-    name: str
-    description: str
-    website: str
-    tier: int
-    image: Optional[str] = None
-    #is_image_url: Optional[bool] = None
-    address: str
-    linkdin: str
-    telephone: str
-
-
 class CompanyGetAll(CompanyGet):
     id: int
 

src/impl/Company/service.py

@@ -30,9 +30,7 @@ def get_company(self, companyId: int):
         return self.get_by_id(companyId)
 
     def get_by_tier(self, tier: int):
-        companies = db.session.query(ModelCompany).filter(
-            ModelCompany.tier == tier)
-        return companies
+        return db.session.query(Company).filter(Company.tier == tier).all()
 
     def add_company(self, payload: CompanyCreate, data: BaseToken):
         if not data.check([UserType.LLEIDAHACKER]):