From f7bcb2f476ef70547cc46aefc51b67867abc114c Mon Sep 17 00:00:00 2001 From: Thanu Poptiphueng Date: Fri, 10 May 2024 12:32:23 +0700 Subject: [PATCH] added verified field --- addMetadata.ts | 6 +- drizzle/0002_gigantic_sentry.sql | 1 + drizzle/meta/0002_snapshot.json | 492 +++++++++++++++++++++++++++++++ drizzle/meta/_journal.json | 7 + src/schema.ts | 1 + 5 files changed, 506 insertions(+), 1 deletion(-) create mode 100644 drizzle/0002_gigantic_sentry.sql create mode 100644 drizzle/meta/0002_snapshot.json diff --git a/addMetadata.ts b/addMetadata.ts index 7f83567..9879bcf 100644 --- a/addMetadata.ts +++ b/addMetadata.ts @@ -5,7 +5,11 @@ import { createBucket, createClient } from "./src/minio"; import { Config } from "./src/config"; async function main() { - await setupBucket(); + try { + await setupBucket(); + } catch { + console.error("Setting up bucket failed"); + } const isInitialized = await db.query.group .findMany() .then((groups) => groups.length > 0); diff --git a/drizzle/0002_gigantic_sentry.sql b/drizzle/0002_gigantic_sentry.sql new file mode 100644 index 0000000..35db1ef --- /dev/null +++ b/drizzle/0002_gigantic_sentry.sql @@ -0,0 +1 @@ +ALTER TABLE users ADD `verified` integer DEFAULT false NOT NULL; diff --git a/drizzle/meta/0002_snapshot.json b/drizzle/meta/0002_snapshot.json new file mode 100644 index 0000000..bd08158 --- /dev/null +++ b/drizzle/meta/0002_snapshot.json @@ -0,0 +1,492 @@ +{ + "version": "5", + "dialect": "sqlite", + "id": "cb28043a-c451-41dc-a5cc-14a1a74c756d", + "prevId": "2cf2acb7-cc98-4f28-8ead-5916b87b7683", + "tables": { + "groups": { + "name": "groups", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true, + "autoincrement": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": { + "groups_name_unique": { + "name": "groups_name_unique", + "columns": [ + "name" + ], + "isUnique": true + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "image_to_user": { + "name": "image_to_user", + "columns": { + "user_id": { + "name": "user_id", + "type": "integer", + "primaryKey": true, + "notNull": true, + "autoincrement": false + }, + "image_name": { + "name": "image_name", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "created_on": { + "name": "created_on", + "type": "integer", + "primaryKey": false, + "notNull": false, + "autoincrement": false, + "default": "CURRENT_TIMESTAMP" + } + }, + "indexes": {}, + "foreignKeys": { + "image_to_user_user_id_users_id_fk": { + "name": "image_to_user_user_id_users_id_fk", + "tableFrom": "image_to_user", + "tableTo": "users", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "no action", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "opinions": { + "name": "opinions", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true, + "autoincrement": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "type": { + "name": "type", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": "'5Choice'" + } + }, + "indexes": { + "opinions_name_unique": { + "name": "opinions_name_unique", + "columns": [ + "name" + ], + "isUnique": true + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "provinces": { + "name": "provinces", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true, + "autoincrement": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": { + "provinces_name_unique": { + "name": "provinces_name_unique", + "columns": [ + "name" + ], + "isUnique": true + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "users": { + "name": "users", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true, + "autoincrement": true + }, + "firstName": { + "name": "firstName", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "lastName": { + "name": "lastName", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "title": { + "name": "title", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "cid": { + "name": "cid", + "type": "text(13)", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "age": { + "name": "age", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "phone": { + "name": "phone", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "public_phone": { + "name": "public_phone", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "facebook": { + "name": "facebook", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "twitter": { + "name": "twitter", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "tiktok": { + "name": "tiktok", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "other_social": { + "name": "other_social", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "job": { + "name": "job", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "education": { + "name": "education", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "vision": { + "name": "vision", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false + }, + "group_id": { + "name": "group_id", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "zone_id": { + "name": "zone_id", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "verified": { + "name": "verified", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false, + "default": false + } + }, + "indexes": { + "users_cid_unique": { + "name": "users_cid_unique", + "columns": [ + "cid" + ], + "isUnique": true + }, + "users_phone_unique": { + "name": "users_phone_unique", + "columns": [ + "phone" + ], + "isUnique": true + }, + "phone_idx": { + "name": "phone_idx", + "columns": [ + "phone" + ], + "isUnique": false + }, + "image_idx": { + "name": "image_idx", + "columns": [ + "image" + ], + "isUnique": false + } + }, + "foreignKeys": { + "users_group_id_groups_id_fk": { + "name": "users_group_id_groups_id_fk", + "tableFrom": "users", + "tableTo": "groups", + "columnsFrom": [ + "group_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "no action", + "onUpdate": "no action" + }, + "users_zone_id_zones_id_fk": { + "name": "users_zone_id_zones_id_fk", + "tableFrom": "users", + "tableTo": "zones", + "columnsFrom": [ + "zone_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "no action", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "user_opinions": { + "name": "user_opinions", + "columns": { + "user_id": { + "name": "user_id", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "opinion_id": { + "name": "opinion_id", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "choice": { + "name": "choice", + "type": "text", + "primaryKey": false, + "notNull": false, + "autoincrement": false, + "default": "'ignore'" + } + }, + "indexes": {}, + "foreignKeys": { + "user_opinions_user_id_users_id_fk": { + "name": "user_opinions_user_id_users_id_fk", + "tableFrom": "user_opinions", + "tableTo": "users", + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "no action", + "onUpdate": "no action" + }, + "user_opinions_opinion_id_opinions_id_fk": { + "name": "user_opinions_opinion_id_opinions_id_fk", + "tableFrom": "user_opinions", + "tableTo": "opinions", + "columnsFrom": [ + "opinion_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "no action", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "user_opinions_user_id_opinion_id_pk": { + "columns": [ + "opinion_id", + "user_id" + ], + "name": "user_opinions_user_id_opinion_id_pk" + } + }, + "uniqueConstraints": {} + }, + "zones": { + "name": "zones", + "columns": { + "id": { + "name": "id", + "type": "integer", + "primaryKey": true, + "notNull": true, + "autoincrement": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true, + "autoincrement": false + }, + "province_id": { + "name": "province_id", + "type": "integer", + "primaryKey": false, + "notNull": true, + "autoincrement": false + } + }, + "indexes": { + "zones_name_province_id_unique": { + "name": "zones_name_province_id_unique", + "columns": [ + "name", + "province_id" + ], + "isUnique": true + } + }, + "foreignKeys": { + "zones_province_id_provinces_id_fk": { + "name": "zones_province_id_provinces_id_fk", + "tableFrom": "zones", + "tableTo": "provinces", + "columnsFrom": [ + "province_id" + ], + "columnsTo": [ + "id" + ], + "onDelete": "no action", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + } + }, + "enums": {}, + "_meta": { + "schemas": {}, + "tables": {}, + "columns": {} + } +} \ No newline at end of file diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json index 9603222..5703a9a 100644 --- a/drizzle/meta/_journal.json +++ b/drizzle/meta/_journal.json @@ -15,6 +15,13 @@ "when": 1713599233997, "tag": "0001_chilly_bullseye", "breakpoints": true + }, + { + "idx": 2, + "version": "5", + "when": 1715319087385, + "tag": "0002_gigantic_sentry", + "breakpoints": true } ] } \ No newline at end of file diff --git a/src/schema.ts b/src/schema.ts index 13fff73..659e925 100644 --- a/src/schema.ts +++ b/src/schema.ts @@ -36,6 +36,7 @@ export const user = sqliteTable( zone: integer("zone_id") .notNull() .references(() => zone.id), + verified: integer("verified", { mode: "boolean" }).notNull().default(false), }, (t) => ({ phone_idx: index("phone_idx").on(t.phone),