@zodic/shared 0.0.26 → 0.0.28

package/db/migrations/meta/0002_snapshot.json

@@ -1,8 +1,8 @@
 {
   "version": "6",
   "dialect": "sqlite",
-  "id": "59202e83-9c8a-494b-8dff-edd70f384e88",
-  "prevId": "d2aec0b1-fc8e-4ef9-bcc3-a4358b1ba88a",
+  "id": "b03824c1-591a-44c5-beee-822a110d0daa",
+  "prevId": "5c06d641-2701-4f10-b160-3ee7507ef100",
   "tables": {
     "artifact_faceswap": {
       "name": "artifact_faceswap",
@@ -28,11 +28,19 @@
           "notNull": false,
           "autoincrement": false
         },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'pending'"
+        },
         "created_at": {
           "name": "created_at",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
         },
@@ -40,7 +48,7 @@
           "name": "updated_at",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
         }
@@ -110,6 +118,22 @@
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
         }
       },
       "indexes": {
@@ -202,6 +226,13 @@
         }
       },
       "indexes": {
+        "artifacts_slug_unique": {
+          "name": "artifacts_slug_unique",
+          "columns": [
+            "slug"
+          ],
+          "isUnique": true
+        },
         "artifacts_concept_id_idx": {
           "name": "artifacts_concept_id_idx",
           "columns": [
@@ -229,6 +260,101 @@
       "uniqueConstraints": {},
       "checkConstraints": {}
     },
+    "astro_aspects": {
+      "name": "astro_aspects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "aspecting_planet": {
+          "name": "aspecting_planet",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "aspected_planet": {
+          "name": "aspected_planet",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "aspecting_planet_id": {
+          "name": "aspecting_planet_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "aspected_planet_id": {
+          "name": "aspected_planet_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "orb": {
+          "name": "orb",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "diff": {
+          "name": "diff",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "astro_aspects_user_id_idx": {
+          "name": "astro_aspects_user_id_idx",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "astro_aspects_user_id_users_id_fk": {
+          "name": "astro_aspects_user_id_users_id_fk",
+          "tableFrom": "astro_aspects",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
     "astro_features": {
       "name": "astro_features",
       "columns": {
@@ -278,7 +404,7 @@
           "name": "order",
           "type": "integer",
           "primaryKey": false,
-          "notNull": true,
+          "notNull": false,
           "autoincrement": false
         },
         "prominent_id": {
@@ -698,14 +824,22 @@
           "name": "payment_id",
           "type": "text",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
         "created_at": {
           "name": "created_at",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
         }
@@ -752,7 +886,7 @@
           "name": "user_id",
           "type": "text",
           "primaryKey": false,
-          "notNull": true,
+          "notNull": false,
           "autoincrement": false
         },
         "artifact_id": {
@@ -762,6 +896,13 @@
           "notNull": false,
           "autoincrement": false
         },
+        "archetype_index": {
+          "name": "archetype_index",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
         "user_artifact_id": {
           "name": "user_artifact_id",
           "type": "text",
@@ -769,6 +910,13 @@
           "notNull": false,
           "autoincrement": false
         },
+        "gender": {
+          "name": "gender",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
         "concept_combination_id": {
           "name": "concept_combination_id",
           "type": "text",
@@ -802,7 +950,7 @@
           "name": "created_at",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
         },
@@ -810,7 +958,7 @@
           "name": "updated_at",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
         }
@@ -829,6 +977,13 @@
             "concept_combination_id"
           ],
           "isUnique": false
+        },
+        "generations_archetype_index_idx": {
+          "name": "generations_archetype_index_idx",
+          "columns": [
+            "archetype_index"
+          ],
+          "isUnique": false
         }
       },
       "foreignKeys": {
@@ -922,7 +1077,15 @@
         },
         "created_at": {
           "name": "created_at",
-          "type": "text",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false,
@@ -981,6 +1144,13 @@
           "notNull": true,
           "autoincrement": false
         },
+        "user_concept_id": {
+          "name": "user_concept_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
         "artifact_id": {
           "name": "artifact_id",
           "type": "text",
@@ -995,8 +1165,8 @@
           "notNull": true,
           "autoincrement": false
         },
-        "archetype_id": {
-          "name": "archetype_id",
+        "archetype_index": {
+          "name": "archetype_index",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
@@ -1056,7 +1226,7 @@
           "name": "created_at",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
         },
@@ -1064,7 +1234,7 @@
           "name": "updated_at",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
         }
@@ -1106,6 +1276,19 @@
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
+        "user_artifacts_user_concept_id_user_concepts_id_fk": {
+          "name": "user_artifacts_user_concept_id_user_concepts_id_fk",
+          "tableFrom": "user_artifacts",
+          "tableTo": "user_concepts",
+          "columnsFrom": [
+            "user_concept_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
         "user_artifacts_artifact_id_artifacts_id_fk": {
           "name": "user_artifacts_artifact_id_artifacts_id_fk",
           "tableFrom": "user_artifacts",
@@ -1159,7 +1342,7 @@
           "name": "created_at",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
         },
@@ -1167,7 +1350,7 @@
           "name": "updated_at",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false,
           "default": "CURRENT_TIMESTAMP"
         }
@@ -1289,21 +1472,21 @@
           "name": "day",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
         "month": {
           "name": "month",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
         "year": {
           "name": "year",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
         "hour": {
@@ -1324,14 +1507,14 @@
           "name": "latitude",
           "type": "real",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
         "longitude": {
           "name": "longitude",
           "type": "real",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
         "tzone": {
@@ -1348,18 +1531,26 @@
           "notNull": false,
           "autoincrement": false
         },
+        "tiktok_username": {
+          "name": "tiktok_username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
         "credits_balance": {
           "name": "credits_balance",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
         },
         "total_credits_earned": {
           "name": "total_credits_earned",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false,
           "default": 0
         },
@@ -1372,7 +1563,15 @@
         },
         "created_at": {
           "name": "created_at",
-          "type": "text",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false,
@@ -1387,6 +1586,20 @@
           ],
           "isUnique": true
         },
+        "users_instagram_username_unique": {
+          "name": "users_instagram_username_unique",
+          "columns": [
+            "instagram_username"
+          ],
+          "isUnique": true
+        },
+        "users_tiktok_username_unique": {
+          "name": "users_tiktok_username_unique",
+          "columns": [
+            "tiktok_username"
+          ],
+          "isUnique": true
+        },
         "users_email_idx": {
           "name": "users_email_idx",
           "columns": [

package/db/migrations/meta/_journal.json

@@ -5,71 +5,22 @@
     {
       "idx": 0,
       "version": "6",
-      "when": 1737425706127,
-      "tag": "0000_dusty_green_goblin",
+      "when": 1737679505085,
+      "tag": "0000_fearless_dust",
       "breakpoints": true
     },
     {
       "idx": 1,
       "version": "6",
-      "when": 1737478702290,
-      "tag": "0001_low_tattoo",
+      "when": 1737679840599,
+      "tag": "0001_known_pretty_boy",
       "breakpoints": true
     },
     {
       "idx": 2,
       "version": "6",
-      "when": 1737480263536,
-      "tag": "0002_condemned_turbo",
-      "breakpoints": true
-    },
-    {
-      "idx": 3,
-      "version": "6",
-      "when": 1737649237207,
-      "tag": "0003_cynical_frog_thor",
-      "breakpoints": true
-    },
-    {
-      "idx": 4,
-      "version": "6",
-      "when": 1737649768416,
-      "tag": "0004_light_masked_marvel",
-      "breakpoints": true
-    },
-    {
-      "idx": 5,
-      "version": "6",
-      "when": 1737650810571,
-      "tag": "0005_silky_dagger",
-      "breakpoints": true
-    },
-    {
-      "idx": 6,
-      "version": "6",
-      "when": 1737651252070,
-      "tag": "0006_low_silver_centurion",
-      "breakpoints": true
-    },
-    {
-      "idx": 7,
-      "version": "6",
-      "when": 1737664103218,
-      "tag": "0007_complex_tarantula",
-      "breakpoints": true
-    },
-    {
-      "idx": 8,
-      "version": "6",
-      "when": 1737668018656,
-      "tag": "0008_ancient_doomsday",
-      "breakpoints": true
-    },
-    {
-      "idx": 9,
-      "version": "6",
-      "when": 1737677651577,
-      "tag": "0009_odd_metal_master",
+      "when": 1737680017244,
+      "tag": "0002_exotic_maria_hill",
       "breakpoints": true
     }
   ]

package/db/schema.ts

@@ -34,8 +34,8 @@ export const users = sqliteTable(
     latitude: real('latitude').notNull(),
     longitude: real('longitude').notNull(),
     tzone: real('tzone'), // Nullable for inferred timezone
-    instagramUsername: text('instagram_username'), // Nullable for optional social media
-    tiktokUsername: text('tiktok_username'), // Fix typo
+    instagramUsername: text('instagram_username').unique(), // Nullable for optional social media
+    tiktokUsername: text('tiktok_username').unique(), // Fix typo
     credits_balance: integer('credits_balance').default(0).notNull(),
     totalCreditsEarned: integer('total_credits_earned').default(0).notNull(),
     lastTransactionAt: integer('last_transaction_at', { mode: 'timestamp' }), // Nullable for no transactions
@@ -56,7 +56,7 @@ export const creditsTransactions = sqliteTable(
     description: text('description'), // Optional description (e.g., "Spent on Cosmic Mirror")
     productType: text('product_type'), // e.g., "concept", "artifact", "astrology_report"
     productId: text('product_id'), // Corresponding ID for the product (concept_id, artifact_id, etc.)
-    paymentId: text('payment_id'), // References the payment for purchases
+    paymentId: text('payment_id').notNull(), // References the payment for purchases
     ...timestampFields,
   },
   (t) => [index('credits_transactions_user_id_idx').on(t.userId)]
@@ -267,6 +267,7 @@ export const generations = sqliteTable(
   (t) => [
     index('generations_user_id_idx').on(t.userId),
     index('generations_concept_combination_id_idx').on(t.conceptCombinationId),
+    index('generations_archetype_index_idx').on(t.archetypeIndex),
   ]
 );
 
@@ -278,6 +279,7 @@ export const artifactFaceswap = sqliteTable(
       .notNull()
       .references(() => userArtifacts.id, { onDelete: 'cascade' }),
     faceSwappedImageUrl: text('face_swapped_image_url'), // Final URL of the face-swapped image
+    status: text('status').default('pending').notNull(), // Status of the face-swap process
     ...timestampFields,
   },
   () => []
@@ -308,9 +310,7 @@ export const tokens = sqliteTable(
       .references(() => users.id, { onDelete: 'cascade' }),
     refreshToken: text('refresh_token').unique().notNull(),
     expiresAt: text('expires_at').notNull(),
-    createdAt: text('created_at')
-      .default(sql`CURRENT_TIMESTAMP`)
-      .notNull(),
+    ...timestampFields,
   },
   (t) => [
     index('tokens_user_id_idx').on(t.userId), // Index on user_id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zodic/shared",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "module": "index.ts",
   "type": "module",
   "publishConfig": {
@@ -8,10 +8,11 @@
   },
   "scripts": {
     "migrate-latest-test": "wrangler d1 execute DB --file=$(ls -t ./db/migrations/*.sql | head -n 1)",
-    "migrate-latest": "wrangler d1 execute DB --file=$(ls -t ./db/migrations/*.sql | head -n 1) --remote",
+    "migrate-latest": "wrangler d1 execute DB --file=$(ls -t ./db/migrations/*.sql | head -n 1) --remote --yes",
     "db:generate": "drizzle-kit generate",
     "db:up": "drizzle-kit up",
-    "pub": "npm run db:generate && npm run db:up && npm run migrate-latest && npm publish"
+    "pub": "npm run db:generate && npm run db:up && npm run migrate-latest && npm publish",
+    "reset-db": "wrangler d1 execute DB --command \"DROP TABLE IF EXISTS migrations;\" && npm run db:up && npm run migrate-latest"
   },
   "devDependencies": {
     "@types/inversify": "^2.0.33",

package/db/migrations/0001_low_tattoo.sql

@@ -1,20 +0,0 @@
-CREATE TABLE `artifact_faceswap` (
-	`id` text PRIMARY KEY NOT NULL,
-	`user_artifact_id` text NOT NULL,
-	`face_swapped_image_url` text,
-	`created_at` integer DEFAULT CURRENT_TIMESTAMP,
-	`updated_at` integer DEFAULT CURRENT_TIMESTAMP,
-	FOREIGN KEY (`user_artifact_id`) REFERENCES `user_artifacts`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-CREATE TABLE `artifact_video_generation` (
-	`id` text PRIMARY KEY NOT NULL,
-	`user_artifact_id` text NOT NULL,
-	`video_status` text DEFAULT 'pending',
-	`video_url` text,
-	`description` text,
-	`duration` integer,
-	FOREIGN KEY (`user_artifact_id`) REFERENCES `user_artifacts`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-CREATE INDEX `artifact_video_generation_status_idx` ON `artifact_video_generation` (`video_status`);

package/db/migrations/0002_condemned_turbo.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `user_artifacts` ADD `post_image_id` text;--> statement-breakpoint
-ALTER TABLE `user_artifacts` ADD `reel_image_id` text;

package/db/migrations/0003_cynical_frog_thor.sql

@@ -1,32 +0,0 @@
-PRAGMA foreign_keys=OFF;--> statement-breakpoint
-CREATE TABLE `__new_user_artifacts` (
-	`id` text PRIMARY KEY NOT NULL,
-	`user_id` text NOT NULL,
-	`user_concept_id` text NOT NULL,
-	`artifact_id` text NOT NULL,
-	`gender` text NOT NULL,
-	`archetype_index` text NOT NULL,
-	`post_image_id` text,
-	`reel_image_id` text,
-	`post_image_url` text,
-	`reel_image_url` text,
-	`post_generation_id` text,
-	`reel_generation_id` text,
-	`status` text DEFAULT 'pending' NOT NULL,
-	`created_at` integer DEFAULT CURRENT_TIMESTAMP,
-	`updated_at` integer DEFAULT CURRENT_TIMESTAMP,
-	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade,
-	FOREIGN KEY (`user_concept_id`) REFERENCES `user_concepts`(`id`) ON UPDATE no action ON DELETE cascade,
-	FOREIGN KEY (`artifact_id`) REFERENCES `artifacts`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-INSERT INTO `__new_user_artifacts`("id", "user_id", "user_concept_id", "artifact_id", "gender", "archetype_index", "post_image_id", "reel_image_id", "post_image_url", "reel_image_url", "post_generation_id", "reel_generation_id", "status", "created_at", "updated_at") SELECT "id", "user_id", "user_concept_id", "artifact_id", "gender", "archetype_index", "post_image_id", "reel_image_id", "post_image_url", "reel_image_url", "post_generation_id", "reel_generation_id", "status", "created_at", "updated_at" FROM `user_artifacts`;--> statement-breakpoint
-DROP TABLE `user_artifacts`;--> statement-breakpoint
-ALTER TABLE `__new_user_artifacts` RENAME TO `user_artifacts`;--> statement-breakpoint
-PRAGMA foreign_keys=ON;--> statement-breakpoint
-CREATE INDEX `user_artifacts_user_id_idx` ON `user_artifacts` (`user_id`);--> statement-breakpoint
-CREATE INDEX `user_artifacts_artifact_id_idx` ON `user_artifacts` (`artifact_id`);--> statement-breakpoint
-CREATE INDEX `user_artifacts_status_idx` ON `user_artifacts` (`status`);--> statement-breakpoint
-ALTER TABLE `generations` ADD `gender` text;--> statement-breakpoint
-ALTER TABLE `users` ADD `updated_at` text DEFAULT CURRENT_TIMESTAMP;--> statement-breakpoint
-CREATE UNIQUE INDEX `artifacts_slug_unique` ON `artifacts` (`slug`);