chore: wip

stacksjs · Jun 22, 2024 · ae7b6fc · ae7b6fc
1 parent d4050dd
commit ae7b6fc
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 9 deletions.
diff --git a/app/Models/User.ts b/app/Models/User.ts
@@ -80,6 +80,18 @@ export default {
 
       factory: () => faker.person.jobTitle(),
     },
+    content: {
+      required: true,
+      validation: {
+        rule: schema.string().minLength(3).maxLength(255),
+        message: {
+          minLength: 'Job title must have a minimum of 3 characters',
+          maxLength: 'Job title must have a maximum of 255 characters',
+        },
+      },
+
+      factory: () => faker.person.jobTitle(),
+    },
 
     password: {
       required: true,

diff --git a/database/migrations/1719031504777-update-users-table.ts b/database/migrations/1719031504777-update-users-table.ts
diff --git a/...75-create-personal_access_tokens-table.ts → ...90-create-personal_access_tokens-table.ts b/...75-create-personal_access_tokens-table.ts → ...90-create-personal_access_tokens-table.ts
diff --git a/...1719030575179-create-deployments-table.ts → ...1719034136691-create-deployments-table.ts b/...1719030575179-create-deployments-table.ts → ...1719034136691-create-deployments-table.ts
diff --git a/...0575178-create-subscriber_emails-table.ts → ...4136691-create-subscriber_emails-table.ts b/...0575178-create-subscriber_emails-table.ts → ...4136691-create-subscriber_emails-table.ts
diff --git a/...tions/1719030575176-create-posts-table.ts → ...tions/1719034136692-create-posts-table.ts b/...tions/1719030575176-create-posts-table.ts → ...tions/1719034136692-create-posts-table.ts
diff --git a/...tions/1719030575180-create-users-table.ts → ...tions/1719034136692-create-users-table.ts b/...tions/1719030575180-create-users-table.ts → ...tions/1719034136692-create-users-table.ts
diff --git a/...ns/1719030575179-create-releases-table.ts → ...ns/1719034136693-create-releases-table.ts b/...ns/1719030575179-create-releases-table.ts → ...ns/1719034136693-create-releases-table.ts
diff --git a/...ate-teams_personal_access_tokens-table.ts → ...ate-teams_personal_access_tokens-table.ts b/...ate-teams_personal_access_tokens-table.ts → ...ate-teams_personal_access_tokens-table.ts
diff --git a/...tions/1719030575176-create-teams-table.ts → ...tions/1719034136697-create-teams-table.ts b/...tions/1719030575176-create-teams-table.ts → ...tions/1719034136697-create-teams-table.ts
diff --git a/...1719030575178-create-subscribers-table.ts → ...1719034136698-create-subscribers-table.ts b/...1719030575178-create-subscribers-table.ts → ...1719034136698-create-subscribers-table.ts
diff --git a/...ns/1719030575177-create-projects-table.ts → ...ns/1719034136700-create-projects-table.ts b/...ns/1719030575177-create-projects-table.ts → ...ns/1719034136700-create-projects-table.ts
diff --git a/...tions/1719030584016-update-users-table.ts → ...tions/1719034142366-update-users-table.ts b/...tions/1719030584016-update-users-table.ts → ...tions/1719034142366-update-users-table.ts
@@ -5,4 +5,9 @@ export async function up(db: Database<any>) {
   await db.schema.alterTable('users')
     .addColumn('content', 'varchar(255)', col => col.notNull())
     .execute();
+await sql`
+      ALTER TABLE users
+      MODIFY COLUMN content VARCHAR(255) NOT NULL AFTER job_title;
+    `.execute(db)
+
 }
diff --git a/storage/framework/core/database/src/drivers/mysql.ts b/storage/framework/core/database/src/drivers/mysql.ts
@@ -259,7 +259,7 @@ export async function createAlterTableMigration(modelPath: string) {
       migrationContent += ``
     }
 
-    migrationContent += `)\n`
+    migrationContent += `)\n\n`
   }
 
   console.log(migrationContent)
@@ -268,6 +268,20 @@ export async function createAlterTableMigration(modelPath: string) {
   for (const fieldName of fieldsToRemove) migrationContent += `    .dropColumn('${fieldName}')\n`
 
   migrationContent += `    .execute();\n`
+
+  for (const fieldName of fieldsToAdd) {
+    const formattedFieldName = snakeCase(fieldName)
+
+    const previousValue = getPreviousValue(Object.keys(currentFields), fieldName)
+
+    if (previousValue) {
+      migrationContent += `await sql\`
+      ALTER TABLE ${tableName}
+      MODIFY COLUMN ${formattedFieldName} VARCHAR(255) NOT NULL AFTER ${snakeCase(previousValue)};
+    \`.execute(db)\n\n`
+    }
+  }
+
   migrationContent += `}\n`
 
   const timestamp = new Date().getTime().toString()
@@ -291,6 +305,16 @@ function pluckChanges(array1: string[], array2: string[]): { added: string[]; re
   return { added, removed }
 }
 
+function getPreviousValue<T>(array: T[], target: T): T | null {
+  const index = array.indexOf(target)
+
+  if (index === -1 || index === 0) {
+    return null // Target not found or is the first element
+  }
+
+  return array[index - 1] ?? null
+}
+
 export async function fetchMysqlTables(): Promise<string[]> {
   const modelFiles = glob.sync(path.userModelsPath('*.ts'))
   const tables: string[] = []

diff --git a/storage/framework/database/models/User.ts b/storage/framework/database/models/User.ts
@@ -80,6 +80,18 @@ export default {
 
       factory: () => faker.person.jobTitle(),
     },
+    content: {
+      required: true,
+      validation: {
+        rule: schema.string().minLength(3).maxLength(255),
+        message: {
+          minLength: 'Job title must have a minimum of 3 characters',
+          maxLength: 'Job title must have a maximum of 255 characters',
+        },
+      },
+
+      factory: () => faker.person.jobTitle(),
+    },
 
     password: {
       required: true,