From e94f9a88960474f6b5256c788d127f9fcad83fca Mon Sep 17 00:00:00 2001 From: Remco Tukker <remco.tukker@geant.org> Date: Fri, 15 Sep 2023 14:57:37 +0200 Subject: [PATCH] better name for enum file --- .../db/{model_enums.py => presentation_model_enums.py} | 0 compendium_v2/db/presentation_models.py | 5 +++-- compendium_v2/publishers/excel_parser.py | 2 +- compendium_v2/publishers/survey_publisher.py | 2 +- compendium_v2/publishers/survey_publisher_old_db_2022.py | 2 +- test/test_db_survey_publisher_2022.py | 8 ++++---- test/test_survey_publisher.py | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) rename compendium_v2/db/{model_enums.py => presentation_model_enums.py} (100%) diff --git a/compendium_v2/db/model_enums.py b/compendium_v2/db/presentation_model_enums.py similarity index 100% rename from compendium_v2/db/model_enums.py rename to compendium_v2/db/presentation_model_enums.py diff --git a/compendium_v2/db/presentation_models.py b/compendium_v2/db/presentation_models.py index 5464188b..de573493 100644 --- a/compendium_v2/db/presentation_models.py +++ b/compendium_v2/db/presentation_models.py @@ -11,8 +11,9 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship from sqlalchemy.schema import ForeignKey from compendium_v2.db import db -from compendium_v2.db.model_enums import CarryMechanism, CommarcialChargingLevel, UserCategory, ServiceCategory, \ - ConnectivityCoverage, ConnectionMethod, YesNoPlanned, MonitoringMethod, CommercialConnectivityCoverage, FeeType +from compendium_v2.db.presentation_model_enums import CarryMechanism, CommarcialChargingLevel, UserCategory, \ + ConnectivityCoverage, ConnectionMethod, YesNoPlanned, MonitoringMethod, CommercialConnectivityCoverage, \ + FeeType, ServiceCategory logger = logging.getLogger(__name__) diff --git a/compendium_v2/publishers/excel_parser.py b/compendium_v2/publishers/excel_parser.py index 1e964be8..41f7c014 100644 --- a/compendium_v2/publishers/excel_parser.py +++ b/compendium_v2/publishers/excel_parser.py @@ -2,7 +2,7 @@ import logging import openpyxl import os -from compendium_v2.db.model_enums import FeeType +from compendium_v2.db.presentation_model_enums import FeeType from compendium_v2.environment import setup_logging setup_logging() diff --git a/compendium_v2/publishers/survey_publisher.py b/compendium_v2/publishers/survey_publisher.py index 604d2723..6946aa10 100644 --- a/compendium_v2/publishers/survey_publisher.py +++ b/compendium_v2/publishers/survey_publisher.py @@ -18,7 +18,7 @@ from compendium_v2.db import db from compendium_v2.db.presentation_models import BudgetEntry, ChargingStructure, ECProject, ExternalConnections, \ InstitutionURLs, NrenStaff, ParentOrganization, Policy, SubOrganization, TrafficVolume, ExternalConnection, \ FundingSource -from compendium_v2.db.model_enums import FeeType +from compendium_v2.db.presentation_model_enums import FeeType from compendium_v2.db.survey_models import ResponseStatus, SurveyResponse diff --git a/compendium_v2/publishers/survey_publisher_old_db_2022.py b/compendium_v2/publishers/survey_publisher_old_db_2022.py index 322e06e1..c4c1bb86 100644 --- a/compendium_v2/publishers/survey_publisher_old_db_2022.py +++ b/compendium_v2/publishers/survey_publisher_old_db_2022.py @@ -17,7 +17,7 @@ from sqlalchemy import delete, text from collections import defaultdict import compendium_v2 -from compendium_v2.db.model_enums import FeeType +from compendium_v2.db.presentation_model_enums import FeeType from compendium_v2.environment import setup_logging from compendium_v2.config import load from compendium_v2.publishers.helpers import extract_urls diff --git a/test/test_db_survey_publisher_2022.py b/test/test_db_survey_publisher_2022.py index bcec6c98..1d0fbcd1 100644 --- a/test/test_db_survey_publisher_2022.py +++ b/test/test_db_survey_publisher_2022.py @@ -1,6 +1,6 @@ from sqlalchemy import select -from compendium_v2.db import db, presentation_models, model_enums +from compendium_v2.db import db, presentation_model_enums, presentation_models from compendium_v2.publishers.survey_publisher_old_db_2022 import _cli, FundingSource, \ StaffQuestion, OrgQuestion, ChargingStructure, ECQuestion @@ -282,11 +282,11 @@ def test_publisher(app_with_survey_db, mocker, dummy_config): ).all() assert len(charging_structures) == 3 assert charging_structures[0].nren.name.lower() == 'nren1' - assert charging_structures[0].fee_type == model_enums.FeeType.no_charge + assert charging_structures[0].fee_type == presentation_model_enums.FeeType.no_charge assert charging_structures[1].nren.name.lower() == 'nren2' - assert charging_structures[1].fee_type == model_enums.FeeType.usage_based_fee + assert charging_structures[1].fee_type == presentation_model_enums.FeeType.usage_based_fee assert charging_structures[2].nren.name.lower() == 'nren3' - assert charging_structures[2].fee_type == model_enums.FeeType.other + assert charging_structures[2].fee_type == presentation_model_enums.FeeType.other _ec_data = db.session.scalars( select(presentation_models.ECProject).order_by(presentation_models.ECProject.nren_id.asc()) diff --git a/test/test_survey_publisher.py b/test/test_survey_publisher.py index b1ca4534..e6cc54f6 100644 --- a/test/test_survey_publisher.py +++ b/test/test_survey_publisher.py @@ -5,7 +5,7 @@ import os from sqlalchemy import func, select from compendium_v2 import db -from compendium_v2.db import presentation_models, model_enums +from compendium_v2.db import presentation_model_enums, presentation_models from compendium_v2.publishers.survey_publisher import _map_2023 @@ -53,7 +53,7 @@ def test_v2_publisher_full(app): assert funding_source.other == Decimal("10") charging_structure = db.session.scalar(select(presentation_models.ChargingStructure.fee_type)) - assert charging_structure == model_enums.FeeType.usage_based_fee + assert charging_structure == presentation_model_enums.FeeType.usage_based_fee staff = db.session.scalar(select(presentation_models.NrenStaff)) assert staff.permanent_fte == Decimal("5.6") -- GitLab