Requested changes

backend/src/db/migrations/20240216154123_ghost_users.ts

@@ -3,30 +3,30 @@ import { Knex } from "knex";
 import { ProjectVersion, TableName } from "../schemas";
 
 export async function up(knex: Knex): Promise<void> {
-  const hasGhostUserColumn = await knex.schema.hasColumn(TableName.Users, "ghost");
+  const hasGhostUserColumn = await knex.schema.hasColumn(TableName.Users, "isGhost");
   const hasProjectVersionColumn = await knex.schema.hasColumn(TableName.Project, "version");
 
   if (!hasGhostUserColumn) {
     await knex.schema.alterTable(TableName.Users, (t) => {
-      t.boolean("ghost").defaultTo(false).notNullable();
+      t.boolean("isGhost").defaultTo(false).notNullable();
     });
   }
 
   if (!hasProjectVersionColumn) {
     await knex.schema.alterTable(TableName.Project, (t) => {
-      t.string("version").defaultTo(ProjectVersion.V1).notNullable();
-      t.text("upgradeStatus").nullable();
+      t.integer("version").defaultTo(ProjectVersion.V1).notNullable();
+      t.string("upgradeStatus").nullable();
     });
   }
 }
 
 export async function down(knex: Knex): Promise<void> {
-  const hasGhostUserColumn = await knex.schema.hasColumn(TableName.Users, "ghost");
+  const hasGhostUserColumn = await knex.schema.hasColumn(TableName.Users, "isGhost");
   const hasProjectVersionColumn = await knex.schema.hasColumn(TableName.Project, "version");
 
   if (hasGhostUserColumn) {
     await knex.schema.alterTable(TableName.Users, (t) => {
-      t.dropColumn("ghost");
+      t.dropColumn("isGhost");
     });
   }
 

backend/src/db/schemas/models.ts

@@ -113,8 +113,8 @@ export enum SecretType {
 }
 
 export enum ProjectVersion {
-  V1 = "v1",
-  V2 = "v2"
+  V1 = 1,
+  V2 = 2
 }
 
 export enum ProjectUpgradeStatus {

backend/src/db/schemas/projects.ts

@@ -15,7 +15,7 @@ export const ProjectsSchema = z.object({
   orgId: z.string().uuid(),
   createdAt: z.date(),
   updatedAt: z.date(),
-  version: z.string().default("v1"),
+  version: z.number().default(1),
   upgradeStatus: z.string().nullable().optional()
 });
 

backend/src/db/schemas/users.ts

@@ -20,7 +20,7 @@ export const UsersSchema = z.object({
   devices: z.unknown().nullable().optional(),
   createdAt: z.date(),
   updatedAt: z.date(),
-  ghost: z.boolean().default(false)
+  isGhost: z.boolean().default(false)
 });
 
 export type TUsers = z.infer<typeof UsersSchema>;