fix: Operator was not showing on the map

This was due to hardcoded category in the operator municipalities fetching
function. Since we do not have geographical information in the sunshine data,
we need to somehow fetch the links between operator and municipalities from
the energy price cube (which contains municipality information). Previously,
we were filtering the energy price cube observations on category C2. Now
we filter on category for sunshine indicator that are category based, otherwise
we do not put a category filter

Author: ptbrowne

src/graphql/queries.graphql

@@ -176,7 +176,7 @@ query WikiContent($locale: String!, $slug: String!) {
   }
 }
 
-query OperatorMunicipalities($period: String!, $electricityCategory: String!) {
+query OperatorMunicipalities($period: String!, $electricityCategory: String) {
   operatorMunicipalities(
     period: $period
     electricityCategory: $electricityCategory

src/graphql/queries.ts

@@ -375,7 +375,7 @@ export type QueryOperatorArgs = {
 };
 
 export type QueryOperatorMunicipalitiesArgs = {
-  electricityCategory: Scalars["String"]["input"];
+  electricityCategory?: InputMaybe<Scalars["String"]["input"]>;
   period: Scalars["String"]["input"];
 };
 
@@ -854,7 +854,7 @@ export type WikiContentQuery = {
 
 export type OperatorMunicipalitiesQueryVariables = Exact<{
   period: Scalars["String"]["input"];
-  electricityCategory: Scalars["String"]["input"];
+  electricityCategory?: InputMaybe<Scalars["String"]["input"]>;
 }>;
 
 export type OperatorMunicipalitiesQuery = {
@@ -1459,10 +1459,7 @@ export function useWikiContentQuery(
   });
 }
 export const OperatorMunicipalitiesDocument = gql`
-  query OperatorMunicipalities(
-    $period: String!
-    $electricityCategory: String!
-  ) {
+  query OperatorMunicipalities($period: String!, $electricityCategory: String) {
     operatorMunicipalities(
       period: $period
       electricityCategory: $electricityCategory

src/graphql/resolver-types.ts

@@ -391,7 +391,7 @@ export type QueryOperatorArgs = {
 };
 
 export type QueryOperatorMunicipalitiesArgs = {
-  electricityCategory: Scalars["String"]["input"];
+  electricityCategory?: InputMaybe<Scalars["String"]["input"]>;
   period: Scalars["String"]["input"];
 };
 
@@ -1358,10 +1358,7 @@ export type QueryResolvers<
     Array<ResolversTypes["OperatorMunicipality"]>,
     ParentType,
     ContextType,
-    RequireFields<
-      QueryOperatorMunicipalitiesArgs,
-      "electricityCategory" | "period"
-    >
+    RequireFields<QueryOperatorMunicipalitiesArgs, "period">
   >;
   operators?: Resolver<
     Array<ResolversTypes["Operator"]>,

src/graphql/resolvers.ts

@@ -582,7 +582,9 @@ const Query: QueryResolvers = {
     { period, electricityCategory },
     context
   ) => {
-    const category = asElectricityCategory(electricityCategory);
+    const category = electricityCategory
+      ? asElectricityCategory(electricityCategory)
+      : undefined;
     return await getOperatorsMunicipalities(
       period,
       category,

src/graphql/schema.graphql

@@ -221,7 +221,7 @@ type Query {
 
   operatorMunicipalities(
     period: String!
-    electricityCategory: String!
+    electricityCategory: String
   ): [OperatorMunicipality!]! @cacheControl(maxAge: 300)
 
   cubeHealth: CubeHealth

src/hooks/use-enriched-sunshine-data.ts

@@ -2,7 +2,7 @@ import { group } from "d3";
 import { useMemo } from "react";
 
 import { ElectricityCategory } from "src/domain/data";
-import { NetworkLevel } from "src/domain/sunshine";
+import { NetworkLevel, SunshineIndicator } from "src/domain/sunshine";
 import {
   useSunshineDataByIndicatorQuery,
   useOperatorMunicipalitiesQuery,
@@ -13,7 +13,7 @@ interface UseEnrichedSunshineDataParams {
   filter: {
     period: string;
     peerGroup?: string;
-    indicator: string;
+    indicator: SunshineIndicator;
     saidiSaifiType?: string;
     networkLevel: NetworkLevel["id"];
     category: ElectricityCategory;
@@ -56,10 +56,16 @@ export const useEnrichedSunshineData = ({
     pause: !enabled,
   });
 
-  // TODO Should not use hardcoded category
-  // Fetch operator municipalities data for the electricity category C2
+  // Fetch operator municipalities data based on the selected indicator
   // This is needed to link operators with their geographic areas
-  const electricityCategory = "C2" as const;
+  // The Sunshine Data does not contain municipality information
+  // Different indicators require different query parameters:
+  // - netTariffs/energyTariffs: uses category from filter
+  // - All other indicators (networkCosts, saidi, saifi, outageInfo, etc.): do not use a category
+  const electricityCategory =
+    indicator === "netTariffs" || indicator === "energyTariffs"
+      ? category
+      : undefined;
   const [operatorMunicipalitiesQuery] = useOperatorMunicipalitiesQuery({
     variables: {
       period,
@@ -85,8 +91,6 @@ export const useEnrichedSunshineData = ({
       sunshineDataQuery.data.sunshineDataByIndicator?.data || [];
     const median =
       sunshineDataQuery.data.sunshineMedianByIndicator ?? undefined;
-    const operatorMunicipalities =
-      operatorMunicipalitiesQuery.data.operatorMunicipalities;
 
     // Create operator index from the observations data
     const uniqueOperators = Array.from(
@@ -129,6 +133,9 @@ export const useEnrichedSunshineData = ({
       (obs) => obs.operatorId?.toString() || ""
     );
 
+    const operatorMunicipalities =
+      operatorMunicipalitiesQuery.data?.operatorMunicipalities || [];
+
     return {
       observations: enrichedObservations,
       observationsByOperator,

src/rdf/queries.ts

@@ -588,7 +588,7 @@ export const getOperatorDocuments = async ({
 
 export const getOperatorsMunicipalities = async (
   year: string,
-  category: ElectricityCategory | "all",
+  category: ElectricityCategory | undefined,
   client: ParsingClient
 ) => {
   const query = `
@@ -603,7 +603,6 @@ export const getOperatorsMunicipalities = async (
         ? `?source0 <https://energy.ld.admin.ch/elcom/electricityprice/dimension/category> <https://energy.ld.admin.ch/elcom/electricityprice/category/${category}> .`
         : ""
     }
-    ?source0 <https://energy.ld.admin.ch/elcom/electricityprice/dimension/municipality> ?municipality .
     ?municipality <http://schema.org/containedInPlace> ?canton .
     ?canton <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://schema.ld.admin.ch/Canton> .
   }