Merge pull request #299 from technologiestiftung/staging

staging to master (baumkataster 2025)

Author: ff6347

.github/workflows/deploy-to-supabase-production.yml

@@ -22,7 +22,7 @@ jobs:
 
       - uses: supabase/setup-cli@v1
         with:
-          version: 1.142.2
+          version: 2.20.3
 
       - run: |
           supabase link --project-ref $PRODUCTION_PROJECT_ID

.github/workflows/deploy-to-supabase-staging.yml

@@ -22,7 +22,7 @@ jobs:
 
       - uses: supabase/setup-cli@v1
         with:
-          version: 1.142.2
+          version: 2.20.3
 
       - run: |
           supabase link --project-ref $STAGING_PROJECT_ID

.gitignore

@@ -281,3 +281,6 @@ cython_debug/
 sql/trees_trees_2022-11-09T12-28-18.sql
 sql/trees_bezirk_mitte_table_2022-11-08T16-32-58.sql
 sql/*.dump
+# user specific cursor rules
+.cursor/rules/*
+.cursor/mcp.json

.tool-versions

@@ -0,0 +1,2 @@
+supabase-cli 2.20.3
+direnv 2.35.0

README.md

@@ -168,6 +168,40 @@ npm test
 
 On CI the Supabase is started automagically. See [.github/workflows/tests.yml](.github/workflows/tests.yml)
 
+
+## Database Caveats
+
+To not hardcode values in the edge functions we are using materialized views.
+
+- `most_frequent_tree_species`
+- `total_tree_species_count`
+- `waterings_with_location`
+
+In case you need to restore the data from a backup you need to disable the triggers first.
+
+```sql
+ALTER TABLE trees DISABLE TRIGGER tg_refresh_trees_count_mv;
+ALTER TABLE trees DISABLE TRIGGER tg_refresh_most_frequent_tree_species_mv;
+ALTER TABLE trees DISABLE TRIGGER tg_refresh_total_tree_species_count_mv;
+```
+
+After restore is done, refresh the materialized views and re-enable our specific triggers.
+
+```sql
+-- Manually refresh all materialized views
+REFRESH MATERIALIZED VIEW CONCURRENTLY total_tree_species_count;
+REFRESH MATERIALIZED VIEW CONCURRENTLY most_frequent_tree_species;
+REFRESH MATERIALIZED VIEW CONCURRENTLY trees_count;
+
+-- Re-enable our specific triggers
+ALTER TABLE trees ENABLE TRIGGER tg_refresh_trees_count_mv;
+ALTER TABLE trees ENABLE TRIGGER tg_refresh_most_frequent_tree_species_mv;
+ALTER TABLE trees ENABLE TRIGGER tg_refresh_total_tree_species_count_mv;
+```
+
+
+
+
 ## Contributors ✨
 
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

package.json

@@ -6,10 +6,12 @@
 	"scripts": {
 		"test": "jest --runInBand",
 		"lint": "eslint ./**/*.ts ",
-		"format": "prettier ./**/*.ts --write"
+		"format": "prettier ./**/*.ts --write",
+		"dev:supabase:functions": "supabase functions serve --no-verify-jwt --env-file supabase/.env",
+		"supabase:types:local": "supabase gen types --local > src/database.ts"
 	},
 	"engines": {
-		"node": ">=18"
+		"node": ">=20"
 	},
 	"dependencies": {
 		"@supabase/supabase-js": "2.43.5"

src/database.ts

@@ -34,22 +34,7 @@ export type Database = {
           id?: string
           user_id?: string
         }
-        Relationships: [
-          {
-            foreignKeyName: "contact_requests_contact_id_fkey"
-            columns: ["contact_id"]
-            isOneToOne: false
-            referencedRelation: "users"
-            referencedColumns: ["id"]
-          },
-          {
-            foreignKeyName: "contact_requests_user_id_fkey"
-            columns: ["user_id"]
-            isOneToOne: false
-            referencedRelation: "users"
-            referencedColumns: ["id"]
-          },
-        ]
+        Relationships: []
       }
       daily_weather_data: {
         Row: {
@@ -124,15 +109,7 @@ export type Database = {
           id?: string
           username?: string | null
         }
-        Relationships: [
-          {
-            foreignKeyName: "fk_users_profiles"
-            columns: ["id"]
-            isOneToOne: false
-            referencedRelation: "users"
-            referencedColumns: ["id"]
-          },
-        ]
+        Relationships: []
       }
       radolan_data: {
         Row: {
@@ -368,7 +345,25 @@ export type Database = {
       }
     }
     Views: {
-      [_ in never]: never
+      most_frequent_tree_species: {
+        Row: {
+          gattung_deutsch: string | null
+          percentage: number | null
+        }
+        Relationships: []
+      }
+      total_tree_species_count: {
+        Row: {
+          count: number | null
+        }
+        Relationships: []
+      }
+      trees_count: {
+        Row: {
+          count: number | null
+        }
+        Relationships: []
+      }
     }
     Functions: {
       accumulated_weather_per_month: {
@@ -391,12 +386,20 @@ export type Database = {
           avg_wind_gust_speed_kmh: number
         }[]
       }
+      calculate_adoptions: {
+        Args: Record<PropertyKey, never>
+        Returns: {
+          total_adoptions: number
+          very_thirsty_adoptions: number
+        }[]
+      }
       calculate_avg_waterings_per_month: {
         Args: Record<PropertyKey, never>
         Returns: {
           month: string
           watering_count: number
           avg_amount_per_watering: number
+          total_sum: number
         }[]
       }
       calculate_top_tree_species: {
@@ -413,6 +416,15 @@ export type Database = {
         }
         Returns: number
       }
+      get_monthly_weather: {
+        Args: Record<PropertyKey, never>
+        Returns: {
+          month: string
+          avg_temperature_celsius: number
+          max_temperature_celsius: number
+          total_rainfall_liters: number
+        }[]
+      }
       get_user_data_for_id: {
         Args: {
           u_id: string
@@ -430,6 +442,22 @@ export type Database = {
           watered: number
         }[]
       }
+      get_waterings_with_location: {
+        Args: Record<PropertyKey, never>
+        Returns: {
+          id: string
+          lat: number
+          lng: number
+          amount: number
+          timestamp: string
+        }[]
+      }
+      is_username_taken: {
+        Args: {
+          given_username: string
+        }
+        Returns: boolean
+      }
       remove_account: {
         Args: Record<PropertyKey, never>
         Returns: undefined
@@ -557,3 +585,18 @@ export type Enums<
     ? PublicSchema["Enums"][PublicEnumNameOrOptions]
     : never
 
+export type CompositeTypes<
+  PublicCompositeTypeNameOrOptions extends
+    | keyof PublicSchema["CompositeTypes"]
+    | { schema: keyof Database },
+  CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
+    schema: keyof Database
+  }
+    ? keyof Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"]
+    : never = never,
+> = PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
+  ? Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName]
+  : PublicCompositeTypeNameOrOptions extends keyof PublicSchema["CompositeTypes"]
+    ? PublicSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
+    : never
+

supabase/config.toml

@@ -7,9 +7,8 @@ project_id = "giessdenkiez-de-supabase"
 port = 54321
 # Schemas to expose in your API. Tables, views and stored procedures in this schema will get API
 # endpoints. public and storage are always included.
-schemas = []
-# Extra schemas to add to the search_path of every request.
-extra_search_path = ["extensions"]
+schemas = ["public", "storage", "graphql_public"]
+extra_search_path = ["public", "extensions"]
 # The maximum number of rows returns from a view, table, or stored procedure. Limits payload size
 # for accidental or malicious requests.
 max_rows = 10000

supabase/functions/_shared/errors.ts

@@ -5,6 +5,9 @@ export enum ErrorTypes {
 	GdkStatsAdoption = "gdk_stats_adoptions",
 	GdkStatsTreeSpecie = "gdk_stats_tree_species",
 	GdkStatsWeather = "gdk_stats_weather",
+	GdkStatsTreeCount = "gdk_stats_tree_count",
+	GdkStatsTreeSpeciesCount = "gdk_stats_tree_species_count",
+	GdkStatsMostFrequentTreeSpecies = "gdk_stats_most_frequent_tree_species",
 }
 
 export class GdkError extends Error {

supabase/functions/gdk_stats/index.ts

@@ -15,48 +15,63 @@ const ENV_VARS = ["SUPABASE_URL", "SUPABASE_SERVICE_ROLE_KEY", "PUMPS_URL"];
 const [SUPABASE_URL, SUPABASE_SERVICE_ROLE_KEY, PUMPS_URL] =
 	loadEnvVars(ENV_VARS);
 
-// As trees table barely changes, we can hardcode the values
-// It would be too expensive to calculate on each request
-
-// SELECT COUNT(1) FROM trees;
-const TREE_COUNT = 885825;
-
-// SELECT trees.gattung_deutsch, (COUNT(1) * 100.0) / (SELECT COUNT(1) FROM trees) AS percentage
-// FROM trees
-// GROUP BY trees.gattung_deutsch
-// ORDER BY COUNT(1) DESC
-// LIMIT 20;
-const MOST_FREQUENT_TREE_SPECIES: TreeSpecies[] = [
-	{ speciesName: "AHORN", percentage: 22.8128580701605848 },
-	{ speciesName: "LINDE", percentage: 21.5930911861823724 },
-	{ speciesName: "EICHE", percentage: 10.5370699630288149 },
-	{ speciesName: undefined, percentage: 4.1923630513927695 },
-	{ speciesName: "ROBINIE", percentage: 3.9515705698078063 },
-	{ speciesName: "ROSSKASTANIE", percentage: 3.6574944260999633 },
-	{ speciesName: "BIRKE", percentage: 3.610419665283775 },
-	{ speciesName: "HAINBUCHE", percentage: 3.4514717918324726 },
-	{ speciesName: "PLATANE", percentage: 3.3499844777467333 },
-	{ speciesName: "PAPPEL", percentage: 2.8882679987582197 },
-	{ speciesName: "ESCHE", percentage: 2.7732339909124263 },
-	{ speciesName: "KIEFER", percentage: 2.4801738492365874 },
-	{ speciesName: "ULME", percentage: 1.946998560663788 },
-	{ speciesName: "BUCHE", percentage: 1.7521519487483419 },
-	{ speciesName: "HASEL", percentage: 1.1728050122766912 },
-	{ speciesName: "WEIßDORN", percentage: 1.1243755820844975 },
-	{ speciesName: "WEIDE", percentage: 1.0893799565376909 },
-	{ speciesName: "MEHLBEERE", percentage: 0.90469336494228544013 },
-	{ speciesName: "ERLE", percentage: 0.80907628481923630514 },
-	{ speciesName: "APFEL", percentage: 0.70092851296813704739 },
-];
-
-// SELECT COUNT(gattung_deutsch) FROM trees GROUP BY gattung_deutsch;
-const TOTAL_TREE_SPECIES_COUNT = 97;
-
 const supabaseServiceRoleClient = createClient(
 	SUPABASE_URL,
 	SUPABASE_SERVICE_ROLE_KEY
 );
 
+const getMostFrequentTreeSpecies = async (): Promise<TreeSpecies[]> => {
+	const { data, error } = await supabaseServiceRoleClient
+		.from("most_frequent_tree_species")
+		.select("*");
+
+	// rename all fields from gattung_deutsch to speciesName
+	const renamedData = data.map((species) => ({
+		speciesName: species.gattung_deutsch,
+		percentage: species.percentage,
+	}));
+
+	if (error) {
+		throw new GdkError(
+			error.message,
+			ErrorTypes.GdkStatsMostFrequentTreeSpecies
+		);
+	}
+
+	return renamedData;
+};
+
+const getTotalTreeSpeciesCount = async (): Promise<number> => {
+	const { data, error } = await supabaseServiceRoleClient
+		.from("total_tree_species_count")
+		.select("*");
+
+	if (error) {
+		throw new GdkError(error.message, ErrorTypes.GdkStatsTreeSpeciesCount);
+	}
+
+	return data[0].count ?? 0;
+};
+
+const getTreeCount = async (): Promise<number> => {
+	const { data, error } = await supabaseServiceRoleClient
+		.from("trees_count")
+		.select("count");
+
+	if (error) {
+		throw new GdkError(error.message, ErrorTypes.GdkStatsTreeCount);
+	}
+
+	if (data === null) {
+		throw new GdkError(
+			"Could not fetch count of trees_count table",
+			ErrorTypes.GdkStatsTreeCount
+		);
+	}
+
+	return data[0].count ?? 0;
+};
+
 const getUserProfilesCount = async (): Promise<number> => {
 	const { count } = await supabaseServiceRoleClient
 		.from("profiles")
@@ -181,6 +196,9 @@ const handler = async (request: Request): Promise<Response> => {
 			monthlyWaterings,
 			waterings,
 			monthlyWeather,
+			treeCount,
+			totalTreeSpeciesCount,
+			mostFrequentTreeSpecies,
 		] = await Promise.all([
 			getUserProfilesCount(),
 			getWateringsCount(),
@@ -189,17 +207,20 @@ const handler = async (request: Request): Promise<Response> => {
 			getMonthlyWaterings(),
 			getWaterings(),
 			getMonthlyWeather(),
+			getTreeCount(),
+			getTotalTreeSpeciesCount(),
+			getMostFrequentTreeSpecies(),
 		]);
 
 		const stats: GdkStats = {
-			numTrees: TREE_COUNT,
+			numTrees: treeCount,
 			numPumps: numPumps,
 			numActiveUsers: usersCount,
 			numWateringsThisYear: wateringsCount,
 			monthlyWaterings: monthlyWaterings,
 			treeAdoptions: treeAdoptions,
-			mostFrequentTreeSpecies: MOST_FREQUENT_TREE_SPECIES,
-			totalTreeSpeciesCount: TOTAL_TREE_SPECIES_COUNT,
+			mostFrequentTreeSpecies: mostFrequentTreeSpecies,
+			totalTreeSpeciesCount: totalTreeSpeciesCount,
 			waterings: waterings,
 			monthlyWeather: monthlyWeather,
 		};