fix testcases

compendium_v2/routes/budget.py

@@ -2,7 +2,6 @@ import logging
 from typing import Any
 
 from flask import Blueprint, jsonify, current_app
-from sqlalchemy.orm import joinedload
 
 from compendium_v2 import db
 from compendium_v2.db import model

compendium_v2/routes/funding.py

 import logging
 
 from flask import Blueprint, jsonify, current_app
-from sqlalchemy.orm import joinedload
 
 from compendium_v2 import db
 from compendium_v2.routes import common

test/conftest.py

@@ -162,9 +162,13 @@ def client(data_config_filename, mocked_db, mocked_survey_db):
 @pytest.fixture
 def test_charging_structure_data():
     with db.session_scope() as session:
-        data = _test_data_csv("ChargingStructureTestData.csv")
+        data = [row for row in _test_data_csv("ChargingStructureTestData.csv")]
+        nren_names = set([row["nren"] for row in data])
+        nren_dict = {nren_name: model.NREN(name=nren_name) for nren_name in nren_names}
+        session.add_all(nren_dict.values())
+
         for row in data:
-            nren = row["nren"]
+            nren = nren_dict[row["nren"]]
             year = row["year"]
             fee_type = row["fee_type"]
             if fee_type == "null":

test/test_survey_publisher_2022.py

@@ -36,29 +36,33 @@ def test_publisher(client, mocker, dummy_config):
     mocker.patch('compendium_v2.publishers.survey_publisher_2022.query_funding_sources',  # noqa
                  funding_source_data)
 
+    with db.session_scope() as session:
+        nren_names = ['Nren1', 'Nren2', 'Nren3', 'Nren4', 'SURF', 'KIFU', 'UoM/RicerkaNet', 'ASNET-AM']
+        session.add_all([model.NREN(name=nren_name) for nren_name in nren_names])
+
     _cli(dummy_config)
 
     with db.session_scope() as session:
         budgets = session.query(model.BudgetEntry).order_by(
             model.BudgetEntry.nren_id.asc()).all()
         assert len(budgets) == 3
-        assert budgets[0].nren.name == 'nren1'
+        assert budgets[0].nren.name.lower() == 'nren1'
         assert budgets[0].budget == 100
 
         funding_sources = session.query(model.FundingSource).order_by(
             model.FundingSource.nren_id.asc()).all()
         assert len(funding_sources) == 3
-        assert funding_sources[0].nren.name == 'nren1'
+        assert funding_sources[0].nren.name.lower() == 'nren1'
         assert funding_sources[0].client_institutions == 10
         assert funding_sources[0].european_funding == 50
         assert funding_sources[0].other == 40
 
-        assert funding_sources[1].nren.name == 'nren2'
+        assert funding_sources[1].nren.name.lower() == 'nren2'
         assert funding_sources[1].client_institutions == 80
         assert funding_sources[1].european_funding == 20
         assert funding_sources[1].other == 0
 
-        assert funding_sources[2].nren.name == 'nren3'
+        assert funding_sources[2].nren.name.lower() == 'nren3'
         assert funding_sources[2].client_institutions == 30
         assert funding_sources[2].european_funding == 30
         assert funding_sources[2].other == 30

test/test_survey_publisher_v1.py

@@ -13,6 +13,10 @@ def test_publisher(client, mocker, dummy_config):
     mocker.patch('compendium_v2.background_task.parse_excel_data.EXCEL_FILE',
                  EXCEL_FILE)
 
+    with db.session_scope() as session:
+        nren_names = ['SURF', 'KIFU', 'UoM/RicerkaNet', 'ASNET-AM']
+        session.add_all([model.NREN(name=nren_name) for nren_name in nren_names])
+
     _cli(dummy_config)
 
     with db.session_scope() as session: