add retrofit data and logic

IN-CORE · Dec 18, 2023 · b41ea0b · b41ea0b
1 parent 514e93d
commit b41ea0b
Show file tree

Hide file tree

Showing 4 changed files with 24,910 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,6 +51,7 @@ original/
 *.json
 !tests/data/*/*.json
 !tests/data/*.json
+!tests/data/retrofit/*.csv
 
 # Seaside ipopt constants
 pyincore/analyses/seasidecge/solverconstants/ipopt_cons.py

diff --git a/pyincore/dfr3service.py b/pyincore/dfr3service.py
@@ -206,8 +206,9 @@ def match_inventory(self, mapping: MappingSet, inventories: list, entry_key: str
                     if inventory["properties"].get("guid") is not None and \
                             add_info_row.get("guid") is not None and \
                             inventory["properties"].get("guid") == add_info_row.get("guid"):
-                        # convert {"retrofit_key":xxx, retrofit_value:yyy} to {xxx:yyy}
+                        # convert {"retrofit_key":xxx, retrofit_value:yyy} to {retrofit_key:xxx, xxx:yyy}
                         inventory["properties"].update({
+                            "retrofit_key": add_info_row["retrofit_key"],
                             add_info_row["retrofit_key"]: add_info_row["retrofit_value"]})
                         break  # assume no duplicated guid
 
@@ -218,7 +219,7 @@ def match_inventory(self, mapping: MappingSet, inventories: list, entry_key: str
                     if self._property_match_legacy(rules=m.rules, properties=inventory["properties"]):
                         # if retrofit key exist, use retrofit key
                         if "retrofit_key" in inventory["properties"]:
-                            entry_key = "retrofit_key"
+                            entry_key = inventory["properties"]["retrofit_key"]
 
                         curve = m.entry[entry_key]
                         dfr3_sets[inventory['id']] = curve