diff --git a/src/dispatch/incident/models.py b/src/dispatch/incident/models.py index dcb94a4a8381..7710c5a554ab 100644 --- a/src/dispatch/incident/models.py +++ b/src/dispatch/incident/models.py @@ -46,7 +46,7 @@ from dispatch.report.enums import ReportTypes from dispatch.report.models import ReportRead from dispatch.storage.models import StorageRead -from dispatch.tag.models import TagRead, TagReadMinimal +from dispatch.tag.models import TagRead from dispatch.task.enums import TaskStatus from dispatch.term.models import TermRead from dispatch.ticket.models import TicketRead @@ -299,7 +299,7 @@ class IncidentReadMinimal(IncidentBase): reporter: Optional[ParticipantReadMinimal] reporters_location: Optional[str] stable_at: Optional[datetime] = None - tags: Optional[List[TagReadMinimal]] = [] + tags: Optional[List[TagRead]] = [] total_cost: Optional[float] @@ -347,7 +347,6 @@ class IncidentRead(IncidentBase): created_at: Optional[datetime] = None documents: Optional[List[DocumentRead]] = [] duplicates: Optional[List[IncidentReadMinimal]] = [] - duplicates: Optional[List[IncidentReadMinimal]] = [] events: Optional[List[EventRead]] = [] incident_costs: Optional[List[IncidentCostRead]] = [] incident_priority: IncidentPriorityRead @@ -365,8 +364,8 @@ class IncidentRead(IncidentBase): reporters_location: Optional[str] stable_at: Optional[datetime] = None storage: Optional[StorageRead] = None - tasks: Optional[List[TaskRead]] = [] tags: Optional[List[TagRead]] = [] + tasks: Optional[List[TaskRead]] = [] terms: Optional[List[TermRead]] = [] ticket: Optional[TicketRead] = None total_cost: Optional[float] diff --git a/src/dispatch/tag/models.py b/src/dispatch/tag/models.py index 7910d791e7d5..2ee97dad2453 100644 --- a/src/dispatch/tag/models.py +++ b/src/dispatch/tag/models.py @@ -9,7 +9,7 @@ from dispatch.database.core import Base from dispatch.models import DispatchBase, TimeStampMixin, ProjectMixin, PrimaryKey from dispatch.project.models import ProjectRead -from dispatch.tag_type.models import TagTypeRead, TagTypeCreate, TagTypeUpdate, TagTypeReadMinimal +from dispatch.tag_type.models import TagTypeRead, TagTypeCreate, TagTypeUpdate class Tag(Base, TimeStampMixin, ProjectMixin): @@ -57,16 +57,6 @@ class TagRead(TagBase): project: ProjectRead -class TagReadMinimal(DispatchBase): - id: PrimaryKey - name: Optional[str] = Field(None, nullable=True) - source: Optional[str] = Field(None, nullable=True) - uri: Optional[str] = Field(None, nullable=True) - discoverable: Optional[bool] = True - description: Optional[str] = Field(None, nullable=True) - tag_type: Optional[TagTypeRead] - - class TagPagination(DispatchBase): items: List[TagRead] total: int diff --git a/src/dispatch/tag_type/models.py b/src/dispatch/tag_type/models.py index 65def62d376f..7a000184bd8e 100644 --- a/src/dispatch/tag_type/models.py +++ b/src/dispatch/tag_type/models.py @@ -40,13 +40,6 @@ class TagTypeRead(TagTypeBase): project: ProjectRead -class TagTypeReadMinimal(DispatchBase): - id: PrimaryKey - name: NameStr - exclusive: Optional[bool] = False - description: Optional[str] = Field(None, nullable=True) - - class TagTypePagination(DispatchBase): items: List[TagTypeRead] total: int