fix failing tests

Zenmo · Apr 9, 2024 · 61ab452 · 61ab452
1 parent fe92f7d
commit 61ab452
Show file tree

Hide file tree

Showing 20 changed files with 96 additions and 49 deletions.
diff --git a/.devcontainer/.env.example b/.devcontainer/.env.example
@@ -7,7 +7,6 @@ SECRET_KEY=django-insecure-vzl9-zm-@ds!frap*7)zy0ppb5b1zh+#7%aq94jj@yh(@jtf&!
 ALLOWED_HOSTS=localhost
 
 #Anylogic
-AL_API_KEY=al_api_key
 RETURN_SCENARIO=True # setting that is used in the HOLON view to determine whether to send back the used scenario (through the serializer) or not
 
 #DATABASE

diff --git a/.github/workflows/django-code-quality.yml b/.github/workflows/django-code-quality.yml
@@ -19,7 +19,6 @@ jobs:
       DB_HOST: localhost # default host value for the database
       DB_NAME: djtesting
       DB_PORT: 5432
-      AL_API_KEY: test-api-key
     services:
       postgres_main:
         image: postgres:13.9

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.1"
+
 services:
   # Setup to run a reverse proxy in front of the app
   # to run them from a single domain.
@@ -75,6 +75,29 @@ services:
       DJANGO_SETTINGS_MODULE: pipit.settings.prod
     env_file: ./docker/config/python.env
 
+  python-test:
+    build:
+      context: ./src
+      dockerfile: Dockerfile
+    entrypoint: "python manage.py"
+    command: "test"
+    volumes:
+      - "./src:/app"
+    depends_on:
+      - db
+    environment:
+      ALLOWED_HOSTS: "*"
+      DB_HOST: db
+      DB_USER: postgres
+      DB_NAME: djangotest
+      DB_PASSWORD: postgres
+      RETURN_SCENARIO: false
+      SECRET_KEY: 5746384
+      DOMAIN_HOST: http://localhost:8000
+      N_WORKERS: 2
+      DJANGO_SETTINGS_MODULE: pipit.settings.test
+    env_file: ./docker/config/python.env
+
   db:
     image: postgres:13.9
     volumes:

diff --git a/docker/config/python.example.env b/docker/config/python.example.env
@@ -11,6 +11,6 @@ SENTRY_ENVIRONMENT=development
 SECRET_KEY=asdfasdf
 ALLOWED_HOSTS=*
 DOMAIN_HOST="https://pizzaoven.holontool.nl"
-# Set to enable remote debugging with PyCharm
+# Set to enable remote debugging with PyCharm or IntelliJ
 PYCHARM_IP=172.17.0.1
 PYCHARM_PORT=9222
diff --git a/src/holon/fixtures/archive/scenario-config-fixture.json b/src/holon/fixtures/archive/scenario-config-fixture.json
@@ -54,7 +54,7 @@
             "scenario": 1,
             "module": "upscaling",
             "name": "National upscaling",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 2203642
         }
     },
@@ -65,7 +65,7 @@
             "scenario": 1,
             "module": "cost",
             "name": "Cost module",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 2175158
         }
     },
@@ -76,7 +76,7 @@
             "scenario": 1,
             "module": "upscaling",
             "name": "Regional upscaling",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 2203666
         }
     },
@@ -87,7 +87,7 @@
             "scenario": 1,
             "module": "costbenefit",
             "name": "",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 987511684
         }
     },
@@ -312,4 +312,4 @@
             "wildcard_JSON": null
         }
     }
-]
+]
diff --git a/src/holon/fixtures/gillis/latest-datamodel-POST-MIGRATION.json b/src/holon/fixtures/gillis/latest-datamodel-POST-MIGRATION.json
diff --git a/src/holon/fixtures/gillis/ref/bedrijventerrein-POSTCONFIG.json b/src/holon/fixtures/gillis/ref/bedrijventerrein-POSTCONFIG.json
@@ -2295,7 +2295,7 @@
             "scenario": 1,
             "module": "upscaling",
             "name": "National upscaling",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 2203642
         }
     },
@@ -2306,7 +2306,7 @@
             "scenario": 1,
             "module": "cost",
             "name": "Cost module",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 2175158
         }
     },
@@ -2317,7 +2317,7 @@
             "scenario": 1,
             "module": "upscaling",
             "name": "Regional upscaling",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 2203666
         }
     },
@@ -2328,7 +2328,7 @@
             "scenario": 1,
             "module": "costbenefit",
             "name": "",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 987511684
         }
     },

diff --git a/src/holon/fixtures/jorrit/ref/tvw-CLEANSMALL.json b/src/holon/fixtures/jorrit/ref/tvw-CLEANSMALL.json
diff --git a/src/holon/fixtures/jorrit/ref/tvw-POSTCLEANUP.json b/src/holon/fixtures/jorrit/ref/tvw-POSTCLEANUP.json
@@ -90043,7 +90043,7 @@
             "scenario": 1,
             "module": "upscaling",
             "name": "National upscaling",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 123456
         }
     },
@@ -90054,7 +90054,7 @@
             "scenario": 1,
             "module": "cost",
             "name": "Gebiedskosten",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 123456
         }
     },
@@ -90065,7 +90065,7 @@
             "scenario": 1,
             "module": "costbenefit",
             "name": "National upscaling",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 123456
         }
     },
@@ -90076,7 +90076,7 @@
             "scenario": 1,
             "module": "costbenefit",
             "name": "Cost module",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 123456
         }
     },
@@ -90461,4 +90461,4 @@
             "wildcard_JSON": null
         }
     }
-]
+]
diff --git a/src/holon/fixtures/jorrit/ref/tvw-POSTSCALEUP.json b/src/holon/fixtures/jorrit/ref/tvw-POSTSCALEUP.json
diff --git a/src/holon/fixtures/jorrit/ref/tvw-PRESCALEUP.json b/src/holon/fixtures/jorrit/ref/tvw-PRESCALEUP.json
@@ -5362,7 +5362,7 @@
             "scenario": 1,
             "module": "upscaling",
             "name": "National upscaling",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 123456
         }
     },
@@ -5373,7 +5373,7 @@
             "scenario": 1,
             "module": "cost",
             "name": "Gebiedskosten",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 123456
         }
     },
@@ -5384,7 +5384,7 @@
             "scenario": 1,
             "module": "costbenefit",
             "name": "National upscaling",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 123456
         }
     },
@@ -5395,7 +5395,7 @@
             "scenario": 1,
             "module": "costbenefit",
             "name": "Cost module",
-            "api_url": "https://beta-engine.energytransitionmodel.com/api/v3/scenarios/",
+            "api_url": "https://engine.energytransitionmodel.com/api/v3/scenarios/",
             "etm_scenario_id": 123456
         }
     },
@@ -5785,4 +5785,4 @@
             "wildcard_JSON": null
         }
     }
-]
+]
diff --git a/src/holon/fixtures/pizza.json b/src/holon/fixtures/pizza.json
diff --git a/src/holon/migrations/0003_actor_anylogiccloudconfig_contract_energyasset_and_more.py b/src/holon/migrations/0003_actor_anylogiccloudconfig_contract_energyasset_and_more.py
@@ -1316,7 +1316,7 @@ class Migration(migrations.Migration):
                 (
                     "api_url",
                     models.URLField(
-                        default="https://beta-engine.energytransitionmodel.com/api/v3/scenarios/"
+                        default="https://engine.energytransitionmodel.com/api/v3/scenarios/"
                     ),
                 ),
                 ("etm_scenario_id", models.IntegerField()),

diff --git a/src/holon/migrations/0061_alter_queryandconvertconfig_api_url.py b/src/holon/migrations/0061_alter_queryandconvertconfig_api_url.py
@@ -13,6 +13,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='queryandconvertconfig',
             name='api_url',
-            field=models.URLField(db_comment='This is currently not used and should be removed', default='https://beta-engine.energytransitionmodel.com/api/v3/scenarios/'),
+            field=models.URLField(db_comment='This is currently not used and should be removed', default='https://engine.energytransitionmodel.com/api/v3/scenarios/'),
         ),
     ]
diff --git a/src/holon/migrations/0062_alter_queryandconvertconfig_api_url.py b/src/holon/migrations/0062_alter_queryandconvertconfig_api_url.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.6 on 2024-04-09 07:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("holon", "0061_alter_queryandconvertconfig_api_url"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="queryandconvertconfig",
+            name="api_url",
+            field=models.URLField(
+                default="https://engine.energytransitionmodel.com/api/v3/scenarios/"
+            ),
+        ),
+    ]
diff --git a/src/holon/models/config/query_and_convert.py b/src/holon/models/config/query_and_convert.py
@@ -20,7 +20,7 @@ class QueryAndConvertConfig(ClusterableModel):
     name = models.CharField(max_length=255, null=False, blank=True)
 
     api_url = models.URLField(
-        # or https://beta-engine.energytransitionmodel.com/api/v3/scenarios/
+        # or https://engine.energytransitionmodel.com/api/v3/scenarios/
         default="https://engine.energytransitionmodel.com/api/v3/scenarios/",
     )
     etm_scenario_id = models.IntegerField()

diff --git a/src/holon/rule_engine/repositories/repository_base.py b/src/holon/rule_engine/repositories/repository_base.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from polymorphic import utils
-from typing import Type
+from typing import Type, Iterator
 from django.db.models import Model
 from polymorphic.models import PolymorphicModel
 from modelcluster.models import ClusterableModel
@@ -227,14 +227,19 @@ def add(self, new_object: Model) -> Model:
 
         # copy object and set new id
         cloned_new_object = deepcopy(new_object)
-        cloned_new_object.pk = cloned_new_object.id = next(self.id_counter)
+
+        new_id = next(self.id_counter)
+        while new_id <= new_object.id:
+            new_id = next(self.id_counter)
+
+        cloned_new_object.pk = cloned_new_object.id = new_id
 
         # add new object to list and return new object
         self.objects.append(cloned_new_object)
 
         return cloned_new_object
 
-    def id_counter_generator(self, objects: list[Model]) -> list[int]:
+    def id_counter_generator(self, objects: list[Model]) -> Iterator[int]:
         """Generator to keep track of new ids"""
 
         max_id = max([object.id for object in objects], default=0)

diff --git a/src/holon/tests/aggregate/test_add.py b/src/holon/tests/aggregate/test_add.py
@@ -24,7 +24,7 @@ def setUp(self) -> None:
             insulation_label=InsulationLabel.A,
             heating_type=HeatingType.GASBURNER,
             type=BuildingType.LOGISTICS,
-            id=0,
+            # id=0,
         )
         self.gridconnection_1: BuildingGridConnection = BuildingGridConnection.objects.create(
             owner_actor=self.actor1,
@@ -33,7 +33,7 @@ def setUp(self) -> None:
             insulation_label=InsulationLabel.A,
             heating_type=HeatingType.GASBURNER,
             type=BuildingType.LOGISTICS,
-            id=1,
+            # id=1,
         )
         self.gridconnection_2: BuildingGridConnection = BuildingGridConnection.objects.create(
             owner_actor=self.actor2,
@@ -42,7 +42,7 @@ def setUp(self) -> None:
             insulation_label=InsulationLabel.A,
             heating_type=HeatingType.GASBURNER,
             type=BuildingType.LOGISTICS,
-            id=2,
+            # id=2,
         )
         self.asset1 = ElectricHeatConversionAsset.objects.create(
             gridconnection=self.gridconnection_0,
@@ -51,7 +51,7 @@ def setUp(self) -> None:
             eta_r=0.95,
             deliveryTemp_degC=70.0,
             capacityElectricity_kW=30.0,
-            id=1,
+            # id=1,
         )
         self.asset2 = ElectricHeatConversionAsset.objects.create(
             gridconnection=self.gridconnection_0,
@@ -60,7 +60,7 @@ def setUp(self) -> None:
             eta_r=0.95,
             deliveryTemp_degC=70.0,
             capacityElectricity_kW=30.0,
-            id=2,
+            # id=2,
         )
         self.asset3 = ElectricHeatConversionAsset.objects.create(
             gridconnection=self.gridconnection_1,
@@ -69,7 +69,7 @@ def setUp(self) -> None:
             eta_r=0.95,
             deliveryTemp_degC=70.0,
             capacityElectricity_kW=30.0,
-            id=3,
+            # id=3,
         )
         self.asset4 = ElectricHeatConversionAsset.objects.create(
             gridconnection=self.gridconnection_2,
@@ -78,7 +78,7 @@ def setUp(self) -> None:
             eta_r=0.95,
             deliveryTemp_degC=70.0,
             capacityElectricity_kW=30.0,
-            id=4,
+            # id=4,
         )
 
         self.scenario_aggregate = ScenarioAggregate(self.scenario)
@@ -100,12 +100,13 @@ def test_add_asset(self):
         )
         new_object = self.scenario_aggregate.add_object(asset5)
 
-        self.scenario_aggregate.repositories[ModelType.ENERGYASSET.value].get(
-            new_object.id
-        ) == new_object
+        self.assertEqual(
+            self.scenario_aggregate.repositories[ModelType.ENERGYASSET.value].get(new_object.id),
+            new_object,
+        )
 
         assert self.scenario_aggregate.repositories[ModelType.ENERGYASSET.value].len() == 5
-        assert new_object != asset5
+        self.assertNotEqual(new_object, asset5)
 
     def test_add_empty_repo_type(self):
         gridnode = GridNode(id=22)