Showing
7 changed files
with
13 additions
and
9 deletions
| ... | @@ -10,7 +10,7 @@ from sqlalchemy import ( | ... | @@ -10,7 +10,7 @@ from sqlalchemy import ( |
| 10 | MetaData, | 10 | MetaData, |
| 11 | ) | 11 | ) |
| 12 | 12 | ||
| 13 | -class ProyectoResumenes(Base): | 13 | +class UbigeoResumenes(Base): |
| 14 | __tablename__ = "ubigeo_resumenes" | 14 | __tablename__ = "ubigeo_resumenes" |
| 15 | __table_args__ = ( | 15 | __table_args__ = ( |
| 16 | Index("idx_proyecto_resumenes_gestion", "gestion"), | 16 | Index("idx_proyecto_resumenes_gestion", "gestion"), |
| ... | @@ -27,3 +27,4 @@ class ProyectoResumenes(Base): | ... | @@ -27,3 +27,4 @@ class ProyectoResumenes(Base): |
| 27 | monto: Mapped[float | None] = mapped_column(Numeric(30, 15)) | 27 | monto: Mapped[float | None] = mapped_column(Numeric(30, 15)) |
| 28 | per_capita: Mapped[float | None] = mapped_column(Numeric) | 28 | per_capita: Mapped[float | None] = mapped_column(Numeric) |
| 29 | ranking: Mapped[int | None] = mapped_column(Integer) | 29 | ranking: Mapped[int | None] = mapped_column(Integer) |
| 30 | + n_entidades: Mapped[int | None] = mapped_column(Integer) | ... | ... |
| ... | @@ -70,10 +70,10 @@ def fetch_ubigeo_todo( | ... | @@ -70,10 +70,10 @@ def fetch_ubigeo_todo( |
| 70 | db: Session = Depends(model.get_db), | 70 | db: Session = Depends(model.get_db), |
| 71 | query: schema.QueryParams = Depends(), | 71 | query: schema.QueryParams = Depends(), |
| 72 | ): | 72 | ): |
| 73 | - gestion = query.gestion is not None else 0 | 73 | + gestion = query.gestion if (query.gestion is not None) else 0 |
| 74 | 74 | ||
| 75 | UbigeoResumenesSchema = schemas.ubigeo.UbigeoResumenes | 75 | UbigeoResumenesSchema = schemas.ubigeo.UbigeoResumenes |
| 76 | - UbigeoResumenes = model.ubigeo.UbigeoResumenes | 76 | + UbigeoResumenes = models.ubigeo.UbigeoResumenes |
| 77 | 77 | ||
| 78 | schema_fields = UbigeoResumenesSchema.model_fields.keys() | 78 | schema_fields = UbigeoResumenesSchema.model_fields.keys() |
| 79 | cols = [getattr(UbigeoResumenes, name) for name in schema_fields] | 79 | cols = [getattr(UbigeoResumenes, name) for name in schema_fields] | ... | ... |
| ... | @@ -32,8 +32,9 @@ class ActecoEstado(OrmBaseModel): | ... | @@ -32,8 +32,9 @@ class ActecoEstado(OrmBaseModel): |
| 32 | class ActecoEntidad(OrmBaseModel): | 32 | class ActecoEntidad(OrmBaseModel): |
| 33 | gestion: int | 33 | gestion: int |
| 34 | acteco: str | 34 | acteco: str |
| 35 | - entidad: int | ||
| 36 | nivel: str | None | 35 | nivel: str | None |
| 36 | + entidad: int | ||
| 37 | + entidad_desc: str | None | ||
| 37 | monto: float | None | 38 | monto: float | None |
| 38 | per_capita: float | None | 39 | per_capita: float | None |
| 39 | ranking: int | None | 40 | ranking: int | None | ... | ... |
| ... | @@ -40,8 +40,9 @@ class FinfunEntidad(OrmBaseModel): | ... | @@ -40,8 +40,9 @@ class FinfunEntidad(OrmBaseModel): |
| 40 | gestion: int | 40 | gestion: int |
| 41 | finfun: str | 41 | finfun: str |
| 42 | entidad: int | 42 | entidad: int |
| 43 | - nivel: str | None | ||
| 44 | monto: float | None | 43 | monto: float | None |
| 44 | + entidad_desc: str | None | ||
| 45 | + nivel: str | None | ||
| 45 | per_capita: float | None | 46 | per_capita: float | None |
| 46 | ranking: int | None | 47 | ranking: int | None |
| 47 | prop: float | None | 48 | prop: float | None | ... | ... |
| ... | @@ -40,8 +40,9 @@ class ObjetoEntidad(OrmBaseModel): | ... | @@ -40,8 +40,9 @@ class ObjetoEntidad(OrmBaseModel): |
| 40 | gestion: int | 40 | gestion: int |
| 41 | objeto: str | 41 | objeto: str |
| 42 | entidad: int | 42 | entidad: int |
| 43 | - nivel: str | None | ||
| 44 | monto: float | None | 43 | monto: float | None |
| 44 | + entidad_desc: str | None | ||
| 45 | + nivel: str | None | ||
| 45 | per_capita: float | None | 46 | per_capita: float | None |
| 46 | ranking: int | None | 47 | ranking: int | None |
| 47 | prop: float | None | 48 | prop: float | None | ... | ... |
| ... | @@ -9,7 +9,7 @@ class UbigeoResumenes(OrmBaseModel): | ... | @@ -9,7 +9,7 @@ class UbigeoResumenes(OrmBaseModel): |
| 9 | ubigeo: str | 9 | ubigeo: str |
| 10 | desc_ubigeo: str | 10 | desc_ubigeo: str |
| 11 | desc_departamento: str | 11 | desc_departamento: str |
| 12 | - mont: float | 12 | + monto: float |
| 13 | - per_capita: str | 13 | + per_capita: float |
| 14 | ranking: int | 14 | ranking: int |
| 15 | n_entidades: int | 15 | n_entidades: int | ... | ... |
-
Please register or login to post a comment