From e71594406e8e3602c9eb77c02dcc0516dfc8832c Mon Sep 17 00:00:00 2001 From: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> Date: Fri, 20 Aug 2021 11:01:54 -0700 Subject: [PATCH] Uses correct enum when setting resource type for executive report documents (#1568) --- src/dispatch/messaging/strings.py | 2 +- src/dispatch/report/flows.py | 5 ++--- src/dispatch/report/scheduled.py | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dispatch/messaging/strings.py b/src/dispatch/messaging/strings.py index 624297d4180e..90bad1822c99 100644 --- a/src/dispatch/messaging/strings.py +++ b/src/dispatch/messaging/strings.py @@ -146,8 +146,8 @@ class MessageType(DispatchEnum): DocumentResourceReferenceTypes.conversation: INCIDENT_CONVERSATION_REFERENCE_DOCUMENT_DESCRIPTION, DocumentResourceReferenceTypes.faq: INCIDENT_FAQ_DOCUMENT_DESCRIPTION, DocumentResourceTypes.executive: INCIDENT_EXECUTIVE_REPORT_DOCUMENT_DESCRIPTION, - DocumentResourceTypes.review: INCIDENT_REVIEW_DOCUMENT_DESCRIPTION, DocumentResourceTypes.incident: INCIDENT_INVESTIGATION_DOCUMENT_DESCRIPTION, + DocumentResourceTypes.review: INCIDENT_REVIEW_DOCUMENT_DESCRIPTION, DocumentResourceTypes.tracking: INCIDENT_INVESTIGATION_SHEET_DESCRIPTION, } diff --git a/src/dispatch/report/flows.py b/src/dispatch/report/flows.py index dbad3e3c1a01..17294a4938a0 100644 --- a/src/dispatch/report/flows.py +++ b/src/dispatch/report/flows.py @@ -4,10 +4,10 @@ from pydantic.error_wrappers import ErrorWrapper, ValidationError -from dispatch.enums import DocumentResourceTemplateTypes from dispatch.decorators import background_task from dispatch.document import service as document_service from dispatch.document.models import DocumentCreate +from dispatch.enums import DocumentResourceTypes from dispatch.event import service as event_service from dispatch.exceptions import InvalidConfigurationError from dispatch.incident import service as incident_service @@ -87,7 +87,6 @@ def create_executive_report( db_session=None, ): """Creates an executive report.""" - current_date = date.today().strftime("%B %d, %Y") current_status = executive_report_in.current_status @@ -163,7 +162,7 @@ def create_executive_report( executive_report_document.update( { "name": executive_report_document_name, - "resource_type": DocumentResourceTemplateTypes.executive, + "resource_type": DocumentResourceTypes.executive, } ) diff --git a/src/dispatch/report/scheduled.py b/src/dispatch/report/scheduled.py index 6f358f9d378a..9af4729c2ff9 100644 --- a/src/dispatch/report/scheduled.py +++ b/src/dispatch/report/scheduled.py @@ -1,17 +1,18 @@ import logging from datetime import datetime from schedule import every -from dispatch.database.core import SessionLocal +from dispatch.database.core import SessionLocal from dispatch.decorators import scheduled_project_task from dispatch.incident import service as incident_service -from dispatch.project.models import Project from dispatch.incident.enums import IncidentStatus +from dispatch.project.models import Project from dispatch.scheduler import scheduler from .messaging import send_incident_report_reminder from .models import ReportTypes + log = logging.getLogger(__name__)