NEEDS SYNC WITH FRONTEND fix: id columns (#262)

* fix: id columns

* fix: change tree_id to gml_id

* fix tests

* fix: typo

* fix: types

* fix: use tree id again

* fix: tests

* fix: migrate waterings and adoptions

Author: Jaszkowic

src/database.ts

@@ -125,7 +125,6 @@ export type Database = {
           gattung: string | null
           gattung_deutsch: string | null
           geom: unknown | null
-          gml_id: string | null
           hausnr: string | null
           id: string
           kennzeich: string | null
@@ -154,7 +153,6 @@ export type Database = {
           gattung?: string | null
           gattung_deutsch?: string | null
           geom?: unknown | null
-          gml_id?: string | null
           hausnr?: string | null
           id: string
           kennzeich?: string | null
@@ -183,7 +181,6 @@ export type Database = {
           gattung?: string | null
           gattung_deutsch?: string | null
           geom?: unknown | null
-          gml_id?: string | null
           hausnr?: string | null
           id?: string
           kennzeich?: string | null
@@ -233,6 +230,7 @@ export type Database = {
         Row: {
           amount: number
           id: number
+          included_in_map_layer: boolean | null
           timestamp: string
           tree_id: string
           username: string | null
@@ -241,6 +239,7 @@ export type Database = {
         Insert: {
           amount: number
           id?: number
+          included_in_map_layer?: boolean | null
           timestamp: string
           tree_id: string
           username?: string | null
@@ -249,6 +248,7 @@ export type Database = {
         Update: {
           amount?: number
           id?: number
+          included_in_map_layer?: boolean | null
           timestamp?: string
           tree_id?: string
           username?: string | null

supabase/migrations/20240530123349_fix_id_columns.sql

@@ -0,0 +1,5 @@
+UPDATE trees_watered SET tree_id = (SELECT gml_id FROM trees WHERE trees.id = trees_watered.tree_id);
+UPDATE trees_adopted SET tree_id = (SELECT gml_id FROM trees WHERE trees.id = trees_adopted.tree_id);
+
+UPDATE trees SET id = gml_id;
+ALTER TABLE trees DROP COLUMN gml_id;

supabase/seed.sql

@@ -33,7 +33,7 @@ describe("trees_adopted", () => {
 			.from("trees_adopted")
 			.insert({
 				uuid: users.userId1,
-				tree_id: "_0epuygrgg",
+				tree_id: "00008100:0021bf08",
 			})
 			.select("*");
 		expect(adoptError1).toBeDefined();
@@ -52,7 +52,7 @@ describe("trees_adopted", () => {
 			.from("trees_adopted")
 			.insert({
 				uuid: users.userId1,
-				tree_id: "_0epuygrgg",
+				tree_id: "00008100:0021bf08",
 			})
 			.select("*");
 		expect(adopt1).toBeDefined();
@@ -71,7 +71,7 @@ describe("trees_adopted", () => {
 			.from("trees_adopted")
 			.insert({
 				uuid: users.userId2,
-				tree_id: "_0epuygrgg",
+				tree_id: "00008100:0021bf08",
 			})
 			.select("*");
 		expect(adopt2).toBeDefined();

tests/trees-adopted.test.ts

@@ -35,7 +35,7 @@ describe("trees_watered", () => {
 				amount: 10,
 				timestamp: new Date().toISOString(),
 				username: "user1",
-				tree_id: "_0epuygrgg",
+				tree_id: "00008100:0021bf08",
 			})
 			.select("*");
 		expect(waterError1).toBeDefined();
@@ -57,7 +57,7 @@ describe("trees_watered", () => {
 				amount: 10,
 				timestamp: new Date().toISOString(),
 				username: "user1",
-				tree_id: "_0epuygrgg",
+				tree_id: "00008100:0021bf08",
 			})
 			.select("*");
 		expect(watering1).toBeDefined();
@@ -79,7 +79,7 @@ describe("trees_watered", () => {
 				amount: 20,
 				timestamp: new Date().toISOString(),
 				username: "user2",
-				tree_id: "_0epuygrgg",
+				tree_id: "00008100:0021bf08",
 			})
 			.select("*");
 		expect(watering2).toBeDefined();
@@ -152,7 +152,7 @@ describe("trees_watered", () => {
 
 		it("should return only waterings of a specific tree via RPC", async () => {
 			const { data: waterings } = await supabaseAnonClient
-				.rpc("waterings_for_tree", { t_id: "_0epuygrgg" })
+				.rpc("waterings_for_tree", { t_id: "00008100:0021bf08" })
 				.select("*");
 
 			expect(waterings).toBeDefined();

tests/trees-watered.test.ts

@@ -19,10 +19,10 @@ describe("trees table", () => {
 		const { data, error } = await supabaseAnonClient
 			.from("trees")
 			.select("*")
-			.eq("id", "_0epuygrgg")
+			.eq("id", "00008100:0021bf08")
 			.single();
 		expect(error).toBeNull();
 		expect(data).toBeDefined();
-		expect(data?.id).toBe("_0epuygrgg");
+		expect(data?.id).toBe("00008100:0021bf08");
 	});
 });