Add country_code field to userVisitedWorldTravel table

2025-08-02 19:55:18 +02:00 · 2024-04-14 13:39:32 +00:00 · 2024-04-14 13:39:32 +00:00 · c5ce984cac
commit c5ce984cac
parent 5e1d7ef160
7 changed files with 411 additions and 2 deletions
--- a/migrations/0001_closed_wendell_vaughn.sql
+++ b/migrations/0001_closed_wendell_vaughn.sql
@ -0,0 +1,6 @@
+ALTER TABLE "userVisitedWorldTravel" ADD COLUMN "country_code" text NOT NULL;--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "userVisitedWorldTravel" ADD CONSTRAINT "userVisitedWorldTravel_country_code_worldTravelCountries_country_code_fk" FOREIGN KEY ("country_code") REFERENCES "worldTravelCountries"("country_code") ON DELETE no action ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
--- a/migrations/meta/0001_snapshot.json
+++ b/migrations/meta/0001_snapshot.json
@ -0,0 +1,385 @@
+{
+  "id": "4c095e1a-9f13-4899-aa83-f56864191f51",
+  "prevId": "b6ab23b7-42f0-4475-aa5d-23b92c00e97f",
+  "version": "5",
+  "dialect": "pg",
+  "tables": {
+    "featuredAdventures": {
+      "name": "featuredAdventures",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "location": {
+          "name": "location",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "featuredAdventures_name_unique": {
+          "name": "featuredAdventures_name_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "name"
+          ]
+        }
+      }
+    },
+    "session": {
+      "name": "session",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_user_id_user_id_fk": {
+          "name": "session_user_id_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "sharedAdventures": {
+      "name": "sharedAdventures",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "date": {
+          "name": "date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "first_name": {
+          "name": "first_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_name": {
+          "name": "last_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "icon": {
+          "name": "icon",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hashed_password": {
+          "name": "hashed_password",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "userVisitedAdventures": {
+      "name": "userVisitedAdventures",
+      "schema": "",
+      "columns": {
+        "adventure_id": {
+          "name": "adventure_id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "adventure_name": {
+          "name": "adventure_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "location": {
+          "name": "location",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "visited_date": {
+          "name": "visited_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "userVisitedAdventures_user_id_user_id_fk": {
+          "name": "userVisitedAdventures_user_id_user_id_fk",
+          "tableFrom": "userVisitedAdventures",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "userVisitedWorldTravel": {
+      "name": "userVisitedWorldTravel",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "country_code": {
+          "name": "country_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "region_id": {
+          "name": "region_id",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "userVisitedWorldTravel_country_code_worldTravelCountries_country_code_fk": {
+          "name": "userVisitedWorldTravel_country_code_worldTravelCountries_country_code_fk",
+          "tableFrom": "userVisitedWorldTravel",
+          "tableTo": "worldTravelCountries",
+          "columnsFrom": [
+            "country_code"
+          ],
+          "columnsTo": [
+            "country_code"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "userVisitedWorldTravel_user_id_user_id_fk": {
+          "name": "userVisitedWorldTravel_user_id_user_id_fk",
+          "tableFrom": "userVisitedWorldTravel",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "userVisitedWorldTravel_region_id_worldTravelCountryRegions_id_fk": {
+          "name": "userVisitedWorldTravel_region_id_worldTravelCountryRegions_id_fk",
+          "tableFrom": "userVisitedWorldTravel",
+          "tableTo": "worldTravelCountryRegions",
+          "columnsFrom": [
+            "region_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "worldTravelCountries": {
+      "name": "worldTravelCountries",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "country_code": {
+          "name": "country_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "continent": {
+          "name": "continent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "worldTravelCountries_country_code_unique": {
+          "name": "worldTravelCountries_country_code_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "country_code"
+          ]
+        }
+      }
+    },
+    "worldTravelCountryRegions": {
+      "name": "worldTravelCountryRegions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "varchar",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "country_code": {
+          "name": "country_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "worldTravelCountryRegions_country_code_worldTravelCountries_country_code_fk": {
+          "name": "worldTravelCountryRegions_country_code_worldTravelCountries_country_code_fk",
+          "tableFrom": "worldTravelCountryRegions",
+          "tableTo": "worldTravelCountries",
+          "columnsFrom": [
+            "country_code"
+          ],
+          "columnsTo": [
+            "country_code"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
--- a/migrations/meta/_journal.json
+++ b/migrations/meta/_journal.json
@ -8,6 +8,13 @@
      "when": 1713037717607,
      "tag": "0000_hard_mach_iv",
      "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "5",
+      "when": 1713050481064,
+      "tag": "0001_closed_wendell_vaughn",
+      "breakpoints": true
    }
  ]
 }
--- a/src/lib/db/schema.ts
+++ b/src/lib/db/schema.ts
@ -70,6 +70,9 @@ export const worldTravelCountryRegions = pgTable("worldTravelCountryRegions", {

 export const userVisitedWorldTravel = pgTable("userVisitedWorldTravel", {
  id: serial("id").primaryKey(),
+  country_code: text("country_code")
+    .notNull()
+    .references(() => worldTravelCountries.country_code),
  userId: text("user_id")
    .notNull()
    .references(() => userTable.id),
--- a/src/routes/api/regionvisit/+server.ts
+++ b/src/routes/api/regionvisit/+server.ts
@ -18,6 +18,7 @@ export async function POST(event: RequestEvent): Promise<Response> {
    .values({
        userId: event.locals.user.id,
        region_id: body.region_id,
+        country_code: body.country_code,
    })
    .execute();
    return new Response(JSON.stringify({ res: res }), {
--- a/src/routes/worldtravel/[countrycode]/+page.server.ts
+++ b/src/routes/worldtravel/[countrycode]/+page.server.ts
@ -1,6 +1,6 @@
 import { db } from '$lib/db/db.server.js';
 import { userVisitedWorldTravel, worldTravelCountryRegions } from '$lib/db/schema.js';
-import { eq } from 'drizzle-orm';
+import { and, eq } from 'drizzle-orm';
 import type { PageServerLoad } from './$types';

 export const load: PageServerLoad  = async ({ params, locals })  => {
@ -13,10 +13,16 @@ export const load: PageServerLoad  = async ({ params, locals })  => {

    let visitedRegions: { id: number; userId: string; region_id: string; }[] = [];
    if (locals.user) {
+      let countryCode = params.countrycode
      visitedRegions = await db
      .select()
      .from(userVisitedWorldTravel)
-      .where(eq(userVisitedWorldTravel.userId, locals.user.id))
+      .where(
+        and(
+          eq(userVisitedWorldTravel.userId, locals.user.id),
+          eq(userVisitedWorldTravel.country_code, countryCode)
+        )
+      )
      .execute();
    }

--- a/src/routes/worldtravel/[countrycode]/+page.svelte
+++ b/src/routes/worldtravel/[countrycode]/+page.svelte
@ -15,6 +15,7 @@
            },
            body: JSON.stringify({
                region_id: event.detail,
+                country_code: data.countrycode,
            }),
        }).then((response) => {
            if (response.status === 401) {