-
Category: {{ alt_resource.name }}
+
+
+ {{ alt_tech.organization_name }}
+ {% if alt_tech.organization_url %}
+
+
+
+ {% endif %}
+ |
+ {% if alt_tech.organization_flag %}{{ alt_tech.organization_flag }} {% endif %}{{ alt_tech.organization_country_code }} • {{ alt_tech.organization_region_label }}
+
{{ alt_tech.product_name }}
@@ -816,6 +841,7 @@
{{ alt_tech.product_name }}
const applyFiltersBtn = document.getElementById("applyFilters");
const clearFiltersBtn = document.getElementById("clearFilters");
const resourceTypeSelect = document.getElementById("resourceTypeSelect");
+ const regionSelect = document.getElementById("regionSelect");
const openSourceSwitch = document.getElementById("openSourceSwitch");
const enterpriseSupportSwitch = document.getElementById(
"enterpriseSupportSwitch"
@@ -828,6 +854,7 @@
{{ alt_tech.product_name }}
applyFiltersBtn &&
clearFiltersBtn &&
resourceTypeSelect &&
+ regionSelect &&
openSourceSwitch &&
enterpriseSupportSwitch &&
searchInput &&
@@ -866,6 +893,7 @@
{{ alt_tech.product_name }}
function applyAlternativeFilters() {
const selectedResourceType = resourceTypeSelect.value;
+ const selectedRegion = regionSelect.value;
const isOpenSource = openSourceSwitch.checked;
const hasEnterpriseSupport = enterpriseSupportSwitch.checked;
const searchQuery = searchInput.value.trim().toLowerCase();
@@ -874,6 +902,9 @@
{{ alt_tech.product_name }}
const matchesResourceType =
selectedResourceType === "all" ||
box.dataset.resourceType === selectedResourceType;
+ const matchesRegion =
+ selectedRegion === "all" ||
+ box.dataset.orgRegion === selectedRegion;
const matchesOpenSource =
!isOpenSource || box.dataset.openSource === "true";
const matchesEnterpriseSupport =
@@ -883,6 +914,7 @@
{{ alt_tech.product_name }}
box.dataset.filtered =
matchesResourceType &&
+ matchesRegion &&
matchesOpenSource &&
matchesEnterpriseSupport &&
matchesSearch
@@ -899,6 +931,7 @@
{{ alt_tech.product_name }}
clearFiltersBtn.addEventListener("click", function () {
resourceTypeSelect.value = "all";
+ regionSelect.value = "all";
openSourceSwitch.checked = false;
enterpriseSupportSwitch.checked = false;
searchInput.value = "";
diff --git a/core/engine.py b/core/engine.py
index ca59b9f..6acade9 100644
--- a/core/engine.py
+++ b/core/engine.py
@@ -437,6 +437,9 @@ def generate_report(
risk_definitions = load_data("risk", db_path=db_path)
alternatives = load_data("alternative", db_path=db_path)
alternative_technologies = load_data("alternativetechnology", db_path=db_path)
+ alternative_technology_organizations = load_data(
+ "alternativetechnologyorganization", db_path=db_path
+ )
resource_inventory = load_data("resource_inventory", db_path=db_path)
cost_data = load_data("cost_inventory", db_path=db_path)
risk_data = load_data("risk_inventory", db_path=db_path)
@@ -481,6 +484,7 @@ def generate_report(
alternatives,
alternative_technologies,
exit_strategy,
+ alternative_technology_organizations,
)
# Generate PDF report
diff --git a/core/utils_db.py b/core/utils_db.py
index b3202b9..462c4ee 100644
--- a/core/utils_db.py
+++ b/core/utils_db.py
@@ -17,6 +17,7 @@
"scoring_data",
"alternative",
"alternativetechnology",
+ "alternativetechnologyorganization",
"risk",
}
diff --git a/core/utils_report.py b/core/utils_report.py
index f68d2b6..270f531 100644
--- a/core/utils_report.py
+++ b/core/utils_report.py
@@ -73,6 +73,7 @@ def generate_html_report(
alternatives: list[dict[str, Any]],
alternative_technologies: list[dict[str, Any]],
exit_strategy: int,
+ alternative_technology_organizations: list[dict[str, Any]] | None = None,
) -> str:
# Transform resource inventory
@@ -117,7 +118,11 @@ def generate_html_report(
# Transform alternative technologies
alternative_technologies_data = transform_alt_tech_for_html(
- resource_inventory, alternatives, alternative_technologies, exit_strategy
+ resource_inventory,
+ alternatives,
+ alternative_technologies,
+ exit_strategy,
+ alternative_technology_organizations=alternative_technology_organizations,
)
# Scoring Data
diff --git a/core/utils_report_common.py b/core/utils_report_common.py
index cac8368..8766613 100644
--- a/core/utils_report_common.py
+++ b/core/utils_report_common.py
@@ -8,6 +8,73 @@
"EUR": "€",
}
+EU_COUNTRY_CODES = {
+ "AT",
+ "BE",
+ "BG",
+ "HR",
+ "CY",
+ "CZ",
+ "DK",
+ "EE",
+ "FI",
+ "FR",
+ "DE",
+ "GR",
+ "HU",
+ "IE",
+ "IT",
+ "LV",
+ "LT",
+ "LU",
+ "MT",
+ "NL",
+ "PL",
+ "PT",
+ "RO",
+ "SK",
+ "SI",
+ "ES",
+ "SE",
+}
+
+REGION_LABELS = {
+ "european-union": "European Union",
+ "united-kingdom": "United Kingdom",
+ "switzerland": "Switzerland",
+ "united-states": "United States",
+ "other": "Other",
+}
+
+
+def normalize_country_code(country_code: Any) -> str | None:
+ if not isinstance(country_code, str):
+ return None
+ normalized = country_code.strip().upper()
+ return normalized if len(normalized) == 2 and normalized.isalpha() else None
+
+
+def country_code_to_region(country_code: Any) -> str:
+ normalized = normalize_country_code(country_code)
+ if not normalized:
+ return "other"
+ if normalized in EU_COUNTRY_CODES:
+ return "european-union"
+ if normalized == "GB":
+ return "united-kingdom"
+ if normalized == "CH":
+ return "switzerland"
+ if normalized == "US":
+ return "united-states"
+ return "other"
+
+
+def country_code_to_flag(country_code: Any) -> str:
+ normalized = normalize_country_code(country_code)
+ if not normalized:
+ return ""
+ return chr(127397 + ord(normalized[0])) + chr(127397 + ord(normalized[1]))
+
def sort_cost_data(cost_data: list[dict[str, Any]]) -> list[dict[str, Any]]:
return sorted(cost_data, key=lambda x: datetime.strptime(x["month"], "%Y-%m-%d"))
@@ -119,6 +186,7 @@ def summarize_alternative_technologies(
alternatives: list[dict[str, Any]],
alternative_technologies: list[dict[str, Any]],
exit_strategy: int,
+ alternative_technology_organizations: list[dict[str, Any]] | None = None,
) -> dict[str, list[dict[str, Any]]]:
active_technologies = {
tech["id"]: tech
@@ -129,6 +197,9 @@ def summarize_alternative_technologies(
grouped_alt_tech: dict[str, list[dict[str, Any]]] = {
str(resource["resource_type"]): [] for resource in resource_inventory
}
+ organization_by_id = {
+ org["id"]: org for org in (alternative_technology_organizations or [])
+ }
for alt in alternatives:
if str(alt["strategy_type"]) != str(exit_strategy):
@@ -138,6 +209,11 @@ def summarize_alternative_technologies(
tech = active_technologies.get(alt["alternative_technology"])
if not tech or resource_type not in grouped_alt_tech:
continue
+ organization = organization_by_id.get(tech.get("organization_id"))
+ organization_country_code = normalize_country_code(
+ organization.get("country_code") if organization else None
+ )
+ organization_region = country_code_to_region(organization_country_code)
grouped_alt_tech[resource_type].append(
{
@@ -147,6 +223,16 @@ def summarize_alternative_technologies(
"open_source": tech["open_source"] == "t",
"support_plan": tech["support_plan"] == "t",
"status": tech["status"] == "t",
+ "organization_name": (
+ organization.get("name") if organization else "Unknown Organization"
+ ),
+ "organization_url": organization.get("url") if organization else None,
+ "organization_country_code": organization_country_code or "N/A",
+ "organization_region": organization_region,
+ "organization_region_label": REGION_LABELS.get(
+ organization_region, "Other"
+ ),
+ "organization_flag": country_code_to_flag(organization_country_code),
}
)
diff --git a/core/utils_report_html.py b/core/utils_report_html.py
index 18f20d8..6c626c3 100644
--- a/core/utils_report_html.py
+++ b/core/utils_report_html.py
@@ -42,6 +42,7 @@ def transform_alt_tech_for_html(
alternatives: list[dict[str, Any]],
alternative_technologies: list[dict[str, Any]],
exit_strategy: int,
+ alternative_technology_organizations: list[dict[str, Any]] | None = None,
) -> list[dict[str, Any]]:
alt_tech_data = []
grouped_alt_tech = summarize_alternative_technologies(
@@ -49,6 +50,7 @@ def transform_alt_tech_for_html(
alternatives,
alternative_technologies,
exit_strategy,
+ alternative_technology_organizations=alternative_technology_organizations,
)
for resource in resource_inventory:
resource_type = str(resource.get("resource_type"))
diff --git a/tests/report_fixtures.py b/tests/report_fixtures.py
index 63071fc..a3ff6d7 100644
--- a/tests/report_fixtures.py
+++ b/tests/report_fixtures.py
@@ -57,6 +57,17 @@ def build_report_fixture():
"open_source": "t",
"support_plan": "t",
"status": "t",
+ "organization_id": 10,
+ }
+ ]
+ alternative_technology_organizations = [
+ {
+ "id": 10,
+ "name": "OpenInfra Foundation",
+ "url": "https://openinfra.org/",
+ "country_code": "US",
+ "stability_tier": 5,
+ "years_in_business": 14,
}
]
return {
@@ -69,6 +80,7 @@ def build_report_fixture():
"risk_data": risk_data,
"alternatives": alternatives,
"alternative_technologies": alternative_technologies,
+ "alternative_technology_organizations": alternative_technology_organizations,
"exit_strategy": 1,
}
@@ -96,6 +108,7 @@ def build_empty_report_fixture():
"risk_data": [],
"alternatives": [],
"alternative_technologies": [],
+ "alternative_technology_organizations": [],
"exit_strategy": 1,
}
diff --git a/tests/test_report_pipeline.py b/tests/test_report_pipeline.py
index edafb4e..536bad6 100644
--- a/tests/test_report_pipeline.py
+++ b/tests/test_report_pipeline.py
@@ -33,6 +33,7 @@ def test_generate_html_report_creates_expected_output(self):
fixture["alternatives"],
fixture["alternative_technologies"],
fixture["exit_strategy"],
+ fixture["alternative_technology_organizations"],
)
self.assertTrue(Path(html_path).exists())
@@ -41,6 +42,9 @@ def test_generate_html_report_creates_expected_output(self):
self.assertIn("Smoke Test Assessment", html)
self.assertIn("Amazon Web Services", html)
self.assertIn("OpenStack", html)
+ self.assertIn("OpenInfra Foundation", html)
+ self.assertIn("All Regions", html)
+ self.assertIn("data-org-region", html)
self.assertIn("EC2 Instance", html)
def test_generate_html_report_renders_empty_state_output(self):
@@ -59,6 +63,7 @@ def test_generate_html_report_renders_empty_state_output(self):
fixture["alternatives"],
fixture["alternative_technologies"],
fixture["exit_strategy"],
+ fixture["alternative_technology_organizations"],
)
self.assertTrue(Path(html_path).exists())
diff --git a/tests/test_report_transforms.py b/tests/test_report_transforms.py
index 3a7e908..0efb361 100644
--- a/tests/test_report_transforms.py
+++ b/tests/test_report_transforms.py
@@ -86,6 +86,7 @@ def build_alternative_technologies():
"open_source": "t",
"support_plan": "t",
"status": "t",
+ "organization_id": 10,
},
{
"id": 2,
@@ -95,6 +96,7 @@ def build_alternative_technologies():
"open_source": "t",
"support_plan": "f",
"status": "t",
+ "organization_id": 20,
},
{
"id": 3,
@@ -108,6 +110,23 @@ def build_alternative_technologies():
]
+def build_alternative_technology_organizations():
+ return [
+ {
+ "id": 10,
+ "name": "OpenInfra Foundation",
+ "url": "https://openinfra.org/",
+ "country_code": "US",
+ },
+ {
+ "id": 20,
+ "name": "European Storage Collective",
+ "url": "https://example.eu/",
+ "country_code": "DE",
+ },
+ ]
+
+
class HtmlTransformTests(unittest.TestCase):
def test_transform_cost_inventory_for_html_sorts_and_sums_costs(self):
months, cost_values, total_cost, currency_code, currency_symbol = (
@@ -151,6 +170,7 @@ def test_transform_alt_tech_for_html_filters_by_strategy_and_status(self):
build_alternatives(),
build_alternative_technologies(),
exit_strategy=1,
+ alternative_technology_organizations=build_alternative_technology_organizations(),
)
self.assertEqual(len(transformed), 2)
@@ -158,6 +178,9 @@ def test_transform_alt_tech_for_html_filters_by_strategy_and_status(self):
self.assertEqual(transformed[1]["product_name"], "MinIO")
self.assertTrue(transformed[0]["open_source"])
self.assertFalse(transformed[1]["support_plan"])
+ self.assertEqual(transformed[0]["organization_name"], "OpenInfra Foundation")
+ self.assertEqual(transformed[0]["organization_region"], "united-states")
+ self.assertEqual(transformed[1]["organization_region"], "european-union")
class JsonTransformTests(unittest.TestCase):