feat: update company API endpoint, refine pedimento dates model, and adjust Keycloak mapper creation
This commit is contained in:
@@ -7,9 +7,8 @@ from pydantic import BaseModel, ConfigDict, Field
|
||||
class PedimentoDatesBase(BaseModel):
|
||||
"""Base schema for Pedimento Dates"""
|
||||
|
||||
entry_date: Optional[datetime] = Field(None, description="Entry date")
|
||||
pedimento_date: Optional[datetime] = Field(None, description="Pedimento date")
|
||||
payment_date: Optional[datetime] = Field(None, description="Payment date")
|
||||
entry_date: Optional[datetime] = Field(None, description="Entry date")
|
||||
payment_date: datetime = Field(None, description="Payment date")
|
||||
rectification_payment_date: Optional[datetime] = Field(
|
||||
None, description="Rectification payment date"
|
||||
)
|
||||
@@ -19,16 +18,13 @@ class PedimentoDatesBase(BaseModel):
|
||||
original_date: Optional[datetime] = Field(None, description="Original date")
|
||||
start_date: Optional[datetime] = Field(None, description="Start date")
|
||||
end_date: Optional[datetime] = Field(None, description="End date")
|
||||
capture_date: Optional[datetime] = Field(None, description="Capture date")
|
||||
capture_time: Optional[time] = Field(None, description="Capture time")
|
||||
|
||||
|
||||
class PedimentoDatesCreate(BaseModel):
|
||||
"""Schema for creating a new Pedimento Dates - pedimento_id and tenant_id are set by backend"""
|
||||
|
||||
entry_date: Optional[datetime] = Field(None, description="Entry date")
|
||||
pedimento_date: Optional[datetime] = Field(None, description="Pedimento date")
|
||||
payment_date: Optional[datetime] = Field(None, description="Payment date")
|
||||
entry_date: Optional[datetime] = Field(None, description="Entry date")
|
||||
payment_date: datetime = Field(..., description="Payment date")
|
||||
rectification_payment_date: Optional[datetime] = Field(None, description="Rectification payment date")
|
||||
extraction_date: Optional[datetime] = Field(None, description="Extraction date")
|
||||
submission_date: Optional[datetime] = Field(None, description="Submission date")
|
||||
@@ -36,15 +32,12 @@ class PedimentoDatesCreate(BaseModel):
|
||||
original_date: Optional[datetime] = Field(None, description="Original date")
|
||||
start_date: Optional[datetime] = Field(None, description="Start date")
|
||||
end_date: Optional[datetime] = Field(None, description="End date")
|
||||
capture_date: Optional[datetime] = Field(None, description="Capture date")
|
||||
capture_time: Optional[time] = Field(None, description="Capture time")
|
||||
|
||||
|
||||
class PedimentoDatesUpdate(BaseModel):
|
||||
"""Schema for updating a Pedimento Dates"""
|
||||
|
||||
entry_date: Optional[datetime] = None
|
||||
pedimento_date: Optional[datetime] = None
|
||||
entry_date: Optional[datetime] = None
|
||||
payment_date: Optional[datetime] = None
|
||||
rectification_payment_date: Optional[datetime] = None
|
||||
extraction_date: Optional[datetime] = None
|
||||
@@ -53,8 +46,6 @@ class PedimentoDatesUpdate(BaseModel):
|
||||
original_date: Optional[datetime] = None
|
||||
start_date: Optional[datetime] = None
|
||||
end_date: Optional[datetime] = None
|
||||
capture_date: Optional[datetime] = None
|
||||
capture_time: Optional[time] = None
|
||||
|
||||
|
||||
class PedimentoDatesResponse(PedimentoDatesBase):
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from datetime import datetime
|
||||
from datetime import time as datetime_time
|
||||
from typing import TYPE_CHECKING
|
||||
from typing import TYPE_CHECKING, Optional
|
||||
|
||||
from api.v1.common.base_models import TenantScopedMixin, TimestampMixin
|
||||
from core.database import Base
|
||||
@@ -48,16 +48,16 @@ class PedimentoDates(Base, TenantScopedMixin, TimestampMixin):
|
||||
id: Mapped[int] = mapped_column(Integer)
|
||||
pedimento_id: Mapped[int] = mapped_column(Integer, nullable=False)
|
||||
|
||||
entry_date: Mapped[datetime] = mapped_column(DateTime)
|
||||
entry_date: Mapped[Optional[datetime]] = mapped_column(DateTime)
|
||||
pedimento_date: Mapped[datetime] = mapped_column(DateTime)
|
||||
payment_date: Mapped[datetime] = mapped_column(DateTime)
|
||||
rectification_payment_date: Mapped[datetime] = mapped_column(DateTime)
|
||||
extraction_date: Mapped[datetime] = mapped_column(DateTime)
|
||||
submission_date: Mapped[datetime] = mapped_column(DateTime)
|
||||
eucan_date: Mapped[datetime] = mapped_column(DateTime)
|
||||
original_date: Mapped[datetime] = mapped_column(DateTime)
|
||||
start_date: Mapped[datetime] = mapped_column(DateTime)
|
||||
end_date: Mapped[datetime] = mapped_column(DateTime)
|
||||
rectification_payment_date: Mapped[Optional[datetime]] = mapped_column(DateTime)
|
||||
extraction_date: Mapped[Optional[datetime]] = mapped_column(DateTime)
|
||||
submission_date: Mapped[Optional[datetime]] = mapped_column(DateTime)
|
||||
eucan_date: Mapped[Optional[datetime]] = mapped_column(DateTime)
|
||||
original_date: Mapped[Optional[datetime]] = mapped_column(DateTime)
|
||||
start_date: Mapped[Optional[datetime]] = mapped_column(DateTime)
|
||||
end_date: Mapped[Optional[datetime]] = mapped_column(DateTime)
|
||||
capture_date: Mapped[datetime] = mapped_column(DateTime)
|
||||
capture_time: Mapped[datetime_time] = mapped_column(Time)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user