fix test data creation with new models

test/conftest.py

@@ -71,14 +71,13 @@ def mocked_db(mocker):
 def test_budget_data():
     with db.session_scope() as session:
         data = _test_data_csv("BudgetTestData.csv")
-        for index, row in enumerate(data):
+        for row in data:
             nren = row["nren"]
             budget = row["budget"]
             year = row["year"]
 
             session.add(
                 model.BudgetEntry(
-                    id=index + 1,
                     nren=nren,
                     budget=float(budget),
                     year=int(year))
@@ -89,7 +88,7 @@ def test_budget_data():
 def test_funding_source_data():
     with db.session_scope() as session:
         data = _test_data_csv("FundingSourceTestData.csv")
-        for index, row in enumerate(data):
+        for row in data:
             nren = row["nren"]
             year = row["year"]
             client = row["client"]
@@ -100,7 +99,6 @@ def test_funding_source_data():
 
             session.add(
                 model.FundingSource(
-                    id=index + 1,
                     nren=nren, year=year,
                     client_institutions=client,
                     european_funding=european,