chore: wip

glennmichael123 · glennmichael123 · commit 7097cef099a4 · 2024-06-03T19:06:53.000+08:00
diff --git a/app/Actions/EmailSubscribeAction.ts b/app/Actions/EmailSubscribeAction.ts
@@ -2,19 +2,18 @@ import { Action } from '@stacksjs/actions'
 import { request } from '@stacksjs/router'
 // import { epmailSubscribeRequest } from '@stacksjs/validation'
 import SubscriberEmail from '../../storage/framework/orm/src/models/SubscriberEmail'
-
+import { UserRequestType } from '../../storage/framework/requests/UserRequest'
 
 export default new Action({
   name: 'EmailSubscribeAction',
   description: 'Save emails from subscribe page',
   method: 'POST',
-  
-  async handle() {
+  async handle(request: any) {
     // We pass the model name cause how else do we know which fields to validate
 
     // we know the request is validated
+    request.validate('EmailSubscriber')
 
-    const email = request.get('email')
 
     const model = await SubscriberEmail.create({ email })
 
diff --git a/app/Models/User.ts b/app/Models/User.ts
@@ -43,7 +43,7 @@ export default {
 
   attributes: {
     name: {
-      validator: {
+      validation: {
         rule: schema.string().minLength(3).maxLength(255),
         message: {
           minLength: 'Name must have a minimum of 3 characters',
@@ -56,7 +56,7 @@ export default {
 
     email: {
       unique: true,
-      validator: {
+      validation: {
         rule: schema.string().email(),
         message: {
           email: 'Email must be a valid email address',
@@ -67,7 +67,7 @@ export default {
     },
 
     jobTitle: {
-      validator: {
+      validation: {
         rule: schema.string().minLength(3).maxLength(255),
         message: {
           minLength: 'Job title must have a minimum of 3 characters',
@@ -79,7 +79,7 @@ export default {
     },
 
     password: {
-      validator: {
+      validation: {
         rule: schema.string().minLength(6).maxLength(255),
         message: {
           minLength: 'Password must have a minimum of 6 characters',
diff --git a/database/migrations/1716822278692-create-access_tokens-table.ts b/database/migrations/1716822278692-create-access_tokens-table.ts
diff --git a/database/migrations/1717159619405-create-projects-table.ts b/database/migrations/1717159619405-create-projects-table.ts
@@ -4,12 +4,12 @@ import { sql } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('projects')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('name', 'varchar(255)')
     .addColumn('description', 'varchar(255)')
     .addColumn('url', 'varchar(255)')
     .addColumn('status', 'varchar(255)')
-    .addColumn('created_at', 'timestamp', (col) => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .execute()
 }
diff --git a/database/migrations/1717159619405-create-subscribers-table.ts b/database/migrations/1717159619405-create-subscribers-table.ts
@@ -4,10 +4,12 @@ import { sql } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('subscribers')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('subscribed', 'boolean')
-    .addColumn('user_id', 'integer', (col) => col.references('users.id').onDelete('cascade'))
-    .addColumn('created_at', 'timestamp', (col) => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade')
+      ) 
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .execute()
 }
diff --git a/database/migrations/1717159619406-create-users-table.ts b/database/migrations/1717159619406-create-users-table.ts
@@ -4,12 +4,12 @@ import { sql } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('users')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('name', 'varchar(255)')
-    .addColumn('email', 'varchar(255)', (col) => col.unique())
+    .addColumn('email', 'varchar(255)', col => col.unique())
     .addColumn('jobTitle', 'varchar(255)')
     .addColumn('password', 'varchar(255)')
-    .addColumn('created_at', 'timestamp', (col) => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .addColumn('deleted_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1717159619407-create-subscriber_emails-table.ts b/database/migrations/1717159619407-create-subscriber_emails-table.ts
@@ -4,9 +4,9 @@ import { sql } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('subscriber_emails')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
-    .addColumn('email', 'varchar(255)', (col) => col.unique())
-    .addColumn('created_at', 'timestamp', (col) => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
+    .addColumn('email', 'varchar(255)', col => col.unique())
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .addColumn('deleted_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1717159619408-create-access_tokens-table.ts b/database/migrations/1717159619408-create-access_tokens-table.ts
@@ -0,0 +1,18 @@
+import type { Database } from '@stacksjs/database'
+import { sql } from '@stacksjs/database'
+
+export async function up(db: Database<any>) {
+  await db.schema
+    .createTable('access_tokens')
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
+    .addColumn('name', 'varchar(255)')
+    .addColumn('token', 'varchar(512)', col => col.unique())
+    .addColumn('plainTextToken', 'varchar(512)')
+    .addColumn('abilities', sql`enum('read', 'write', 'admin', 'read|write', 'read|admin', 'write|admin', 'read|write|admin')`)
+    .addColumn('team_id', 'integer', (col) =>
+        col.references('teams.id').onDelete('cascade')
+      ) 
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('updated_at', 'timestamp')
+    .execute()
+}
diff --git a/database/migrations/1717159619409-create-deployments-table.ts b/database/migrations/1717159619409-create-deployments-table.ts
@@ -4,16 +4,18 @@ import { sql } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('deployments')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
-    .addColumn('commitSha', 'varchar(512)', (col) => col.unique())
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
+    .addColumn('commitSha', 'varchar(512)', col => col.unique())
     .addColumn('commitMessage', 'varchar(255)')
     .addColumn('branch', 'varchar(255)')
     .addColumn('status', 'varchar(255)')
     .addColumn('executionTime', 'integer')
     .addColumn('deployScript', 'varchar(255)')
     .addColumn('terminalOutput', 'varchar(255)')
-    .addColumn('user_id', 'integer', (col) => col.references('users.id').onDelete('cascade'))
-    .addColumn('created_at', 'timestamp', (col) => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade')
+      ) 
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .execute()
 }
diff --git a/database/migrations/1717159619409-create-teams_access_tokens-table.ts b/database/migrations/1717159619409-create-teams_access_tokens-table.ts
@@ -1,9 +1,9 @@
 import type { Database } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
-    .createTable('team_access_tokens')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
-    .addColumn('team_id', 'integer')
+    .createTable('teams_access_tokens')
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
+    .addColumn('teams_id', 'integer')
     .addColumn('accesstoken_id', 'integer')
     .execute()
-}
+    }
diff --git a/database/migrations/1717159619412-create-teams-table.ts b/database/migrations/1717159619412-create-teams-table.ts
@@ -4,7 +4,7 @@ import { sql } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('teams')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('name', 'varchar(255)')
     .addColumn('companyName', 'varchar(255)')
     .addColumn('email', 'varchar(255)')
@@ -13,8 +13,10 @@ export async function up(db: Database<any>) {
     .addColumn('description', 'varchar(255)')
     .addColumn('path', 'varchar(255)')
     .addColumn('isPersonal', 'boolean')
-    .addColumn('accesstoken_id', 'integer', (col) => col.references('access_tokens.id').onDelete('cascade'))
-    .addColumn('created_at', 'timestamp', (col) => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('accesstoken_id', 'integer', (col) =>
+        col.references('access_tokens.id').onDelete('cascade')
+      ) 
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .execute()
 }
diff --git a/database/migrations/1717159619413-create-posts-table.ts b/database/migrations/1717159619413-create-posts-table.ts
@@ -4,11 +4,13 @@ import { sql } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('posts')
-    .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('title', 'varchar(255)')
     .addColumn('body', 'varchar(255)')
-    .addColumn('user_id', 'integer', (col) => col.references('users.id').onDelete('cascade'))
-    .addColumn('created_at', 'timestamp', (col) => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade')
+      ) 
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .execute()
 }
diff --git a/storage/framework/core/types/src/model.ts b/storage/framework/core/types/src/model.ts
@@ -118,7 +118,7 @@ export interface Attribute {
   unique?: boolean
   required?: boolean
   factory?: () => any
-  validator?: {
+  validation?: {
     rule: VineType
     message: ValidatorMessage
   }
diff --git a/storage/framework/core/validation/src/validator.ts b/storage/framework/core/validation/src/validator.ts
@@ -1,5 +1,6 @@
 import { log } from '@stacksjs/cli'
 import { path } from '@stacksjs/path'
+import { Model } from '@stacksjs/types'
 import { SimpleMessagesProvider, VineError, reportError, schema } from '@stacksjs/validation'
 import type { SchemaTypes } from '@vinejs/vine/types'
 
diff --git a/storage/framework/database/models/SubscriberEmail.ts b/storage/framework/database/models/SubscriberEmail.ts
@@ -26,7 +26,10 @@ export default {
       unique: true,
       validator: {
         rule: schema.string().email(),
-        message: 'Email must be a valid email address',
+        message: {
+          email: 'Email must be valid',
+          required: 'Email is required',
+        },
       },
 
       factory: () => faker.internet.email(),
diff --git a/storage/framework/database/models/User.ts b/storage/framework/database/models/User.ts
@@ -1,9 +1,9 @@
 // soon, these will be auto-imported
 import { faker } from '@stacksjs/faker'
-import type { UserType as User } from '@stacksjs/orm'
 import { capitalize } from '@stacksjs/strings'
 import type { Model } from '@stacksjs/types'
 import { schema } from '@stacksjs/validation'
+import type { User } from 'actions/src/orm/user'
 
 export default {
   name: 'User', // defaults to the sanitized file name
@@ -45,7 +45,10 @@ export default {
     name: {
       validator: {
         rule: schema.string().minLength(3).maxLength(255),
-        message: 'Name must be between 3 and 255 characters',
+        message: {
+          minLength: 'Name must have a minimum of 3 characters',
+          maxLength: 'Name must have a maximum of 255 characters',
+        },
       },
 
       factory: () => faker.person.fullName(),
@@ -55,7 +58,9 @@ export default {
       unique: true,
       validator: {
         rule: schema.string().email(),
-        message: 'Email must be a valid email address',
+        message: {
+          email: 'Email must be a valid email address',
+        },
       },
 
       factory: () => faker.internet.email(),
@@ -64,7 +69,10 @@ export default {
     jobTitle: {
       validator: {
         rule: schema.string().minLength(3).maxLength(255),
-        message: 'Job title must be between 3 and 255 characters',
+        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(),
@@ -73,7 +81,10 @@ export default {
     password: {
       validator: {
         rule: schema.string().minLength(6).maxLength(255),
-        message: 'Password must be between 6 and 255 characters',
+        message: {
+          minLength: 'Password must have a minimum of 6 characters',
+          maxLength: 'Password must have a maximum of 255 characters',
+        },
       },
 
       factory: () => faker.internet.password(),
diff --git a/storage/framework/orm/Actions/UserStoreOrmAction.ts b/storage/framework/orm/Actions/UserStoreOrmAction.ts
@@ -1,16 +1,22 @@
 import { Action } from '@stacksjs/actions'
 import User from '../src/models/User'
-
+import { validateField } from 'index'
 import { request } from '@stacksjs/router'
 
 export default new Action({
-      name: 'User Store',
-      description: 'User Store ORM Action',
-      method: 'POST',
-      async handle() {
-        const model = await User.create(request.all())
+  name: 'User Store',
+  description: 'User Store ORM Action',
+  method: 'POST',
+  validations: {
+    name: {
+      rule: schema.string().minLength(3).maxLength(255),
+      message: 'test',
+    },
+  },
+  async handle(request: anyRequestType) {
+    const model = await User.create(request.all())
 
-        return model
-      },
-    })
+    return model
+  },
+})
   
diff --git a/storage/framework/orm/src/models/User.ts b/storage/framework/orm/src/models/User.ts
@@ -20,8 +20,7 @@ import Deployment from './Deployment'
       jobTitle: string
       password: string
       deployment_id: number 
- post_id: number 
-
+      post_id: number 
       created_at: ColumnType<Date, string | undefined, never>
       updated_at: ColumnType<Date, string | undefined, never>
       deleted_at: ColumnType<Date, string | undefined, never>
@@ -682,4 +681,8 @@ import Deployment from './Deployment'
     }
 
     export default User
-    
+    
+
+    const user = await User.find(1)
+
+    console.log(user)
diff --git a/storage/framework/requests/UserRequest.ts b/storage/framework/requests/UserRequest.ts
