5 files changed, 87 insertions, 93 deletions

diff --git a/app/Models/Recipe.ts b/app/Models/Recipe.ts
index fce5f3d..bca6e76 100644
--- a/app/Models/Recipe.ts
+++ b/app/Models/Recipe.ts
@@ -1,23 +1,23 @@
-import { DateTime } from 'luxon';
-import { BaseModel, column } from '@ioc:Adonis/Lucid/Orm';
+import { DateTime } from 'luxon'
+import { BaseModel, column } from '@adonisjs/lucid/orm'
 
 export default class Recipe extends BaseModel {
   @column({ isPrimary: true })
-  public id: number;
+  public id: number
 
   @column()
-  public name: string;
+  public name: string
 
   @column()
-  public recipeId: string;
+  public recipeId: string
 
   // TODO: Type the data object.
   @column()
-  public data: object;
+  public data: object
 
   @column.dateTime({ autoCreate: true })
-  public createdAt: DateTime;
+  public createdAt: DateTime
 
   @column.dateTime({ autoCreate: true, autoUpdate: true })
-  public updatedAt: DateTime;
+  public updatedAt: DateTime
 }
diff --git a/app/Models/Service.ts b/app/Models/Service.ts
index af1a8e1..0cd2afb 100644
--- a/app/Models/Service.ts
+++ b/app/Models/Service.ts
@@ -1,40 +1,41 @@
-import { DateTime } from 'luxon';
-import { BaseModel, column, HasOne, hasOne } from '@ioc:Adonis/Lucid/Orm';
-import User from './User';
+import { DateTime } from 'luxon'
+import { BaseModel, column, hasOne } from '@adonisjs/lucid/orm'
+import User from './User.js'
+import type { HasOne } from '@adonisjs/lucid/types/relations'
 
 export default class Service extends BaseModel {
   @column({ isPrimary: true })
-  public id: number;
+  public id: number
 
   @hasOne(() => User, {
     foreignKey: 'userId',
   })
-  public user: HasOne<typeof User>;
+  public user: HasOne<typeof User>
 
   @column({
     columnName: 'userId',
   })
-  public userId: number;
+  public userId: number
 
   @column({
     columnName: 'serviceId',
   })
-  public serviceId: string;
+  public serviceId: string
 
   @column()
-  public name: string;
+  public name: string
 
   @column({
     columnName: 'recipeId',
   })
-  public recipeId: string;
+  public recipeId: string
 
   @column()
-  public settings: string;
+  public settings: string
 
   @column.dateTime({ autoCreate: true })
-  public createdAt: DateTime;
+  public createdAt: DateTime
 
   @column.dateTime({ autoCreate: true, autoUpdate: true })
-  public updatedAt: DateTime;
+  public updatedAt: DateTime
 }
diff --git a/app/Models/Token.ts b/app/Models/Token.ts
index 4f85ebc..a8c29dd 100644
--- a/app/Models/Token.ts
+++ b/app/Models/Token.ts
@@ -1,38 +1,39 @@
-import { DateTime } from 'luxon';
-import { BaseModel, column, HasOne, hasOne } from '@ioc:Adonis/Lucid/Orm';
-import User from './User';
+import { DateTime } from 'luxon'
+import { BaseModel, column, hasOne } from '@adonisjs/lucid/orm'
+import User from './User.js'
+import { HasOne } from '@adonisjs/lucid/types/relations'
 
 export default class Token extends BaseModel {
   @column({ isPrimary: true })
-  public id: number;
+  public id: number
 
   @hasOne(() => User, {
     localKey: 'user_id',
     foreignKey: 'id',
   })
-  public user: HasOne<typeof User>;
+  public user: HasOne<typeof User>
 
   @column()
-  public user_id: number;
+  public user_id: number
 
   @column()
-  public token: string;
+  public token: string
 
   @column()
-  public type: string;
+  public type: string
 
   @column()
-  public is_revoked: boolean;
+  public is_revoked: boolean
 
   @column()
-  public name: string;
+  public name: string
 
   @column.dateTime()
-  public expires_at: DateTime;
+  public expires_at: DateTime
 
   @column.dateTime({ autoCreate: true })
-  public created_at: DateTime;
+  public created_at: DateTime
 
   @column.dateTime({ autoCreate: true, autoUpdate: true })
-  public updated_at: DateTime;
+  public updated_at: DateTime
 }
diff --git a/app/Models/User.ts b/app/Models/User.ts
index 0b8e688..cc2c553 100644
--- a/app/Models/User.ts
+++ b/app/Models/User.ts
@@ -1,75 +1,70 @@
-import { DateTime } from 'luxon';
-import {
-  BaseModel,
-  beforeSave,
-  column,
-  HasMany,
-  hasMany,
-} from '@ioc:Adonis/Lucid/Orm';
-import Hash from '@ioc:Adonis/Core/Hash';
-import Event from '@ioc:Adonis/Core/Event';
-import moment from 'moment';
-import Encryption from '@ioc:Adonis/Core/Encryption';
-import randtoken from 'rand-token';
-import Token from './Token';
-import Workspace from './Workspace';
-import Service from './Service';
-import Mail from '@ioc:Adonis/Addons/Mail';
-import { url } from 'Config/app';
-import { mailFrom } from 'Config/dashboard';
+import { DateTime } from 'luxon'
+import { BaseModel, beforeSave, column, hasMany } from '@adonisjs/lucid/orm'
+import hash from '@adonisjs/core/services/hash'
+import emitter from '@adonisjs/core/services/emitter'
+import moment from 'moment'
+import Encryption from '@ioc:Adonis/Core/Encryption'
+import randtoken from 'rand-token'
+import Token from './Token.js'
+import Workspace from './Workspace.js'
+import Service from './Service.js'
+import mail from '@adonisjs/mail/services/main'
+import { url } from '#config/app'
+import { mailFrom } from '#config/dashboard'
+import { HasMany } from '@adonisjs/lucid/types/relations'
 
 export default class User extends BaseModel {
   @column({ isPrimary: true })
-  public id: number;
+  public id: number
 
   @column()
-  public email: string;
+  public email: string
 
   @column()
-  public username: string;
+  public username: string
 
   @column()
-  public password: string;
+  public password: string
 
   @column()
-  public lastname: string;
+  public lastname: string
 
   // TODO: Type the settings object.
   @column()
-  public settings: object;
+  public settings: object
 
   @column.dateTime({ autoCreate: true })
-  public created_at: DateTime;
+  public created_at: DateTime
 
   @column.dateTime({ autoCreate: true, autoUpdate: true })
-  public updated_at: DateTime;
+  public updated_at: DateTime
 
   @beforeSave()
   public static async hashPassword(user: User) {
     if (user.$dirty.password) {
-      user.password = await Hash.make(user.password);
+      user.password = await hash.make(user.password)
     }
   }
 
   @hasMany(() => Token, {
     foreignKey: 'user_id',
   })
-  public tokens: HasMany<typeof Token>;
+  public tokens: HasMany<typeof Token>
 
   @hasMany(() => Service, {
     foreignKey: 'userId',
   })
-  public services: HasMany<typeof Service>;
+  public services: HasMany<typeof Service>
 
   @hasMany(() => Workspace, {
     foreignKey: 'userId',
   })
-  public workspaces: HasMany<typeof Workspace>;
+  public workspaces: HasMany<typeof Workspace>
 
   public async forgotPassword(): Promise<void> {
-    const token = await this.generateToken(this, 'forgot_password');
+    const token = await this.generateToken(this, 'forgot_password')
 
-    await Mail.send(message => {
+    await mail.send((message) => {
       message
         .from(mailFrom)
         .to(this.email)
@@ -78,13 +73,13 @@ export default class User extends BaseModel {
           username: this.username,
           appUrl: url,
           token: token,
-        });
-    });
+        })
+    })
 
-    await Event.emit('forgot:password', {
+    await emitter.emit('forgot:password', {
       user: this,
       token,
-    });
+    })
   }
 
   private async generateToken(user: User, type: string): Promise<string> {
@@ -93,21 +88,17 @@ export default class User extends BaseModel {
       .query()
       .where('type', type)
       .where('is_revoked', false)
-      .where(
-        'updated_at',
-        '>=',
-        moment().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss'),
-      );
+      .where('updated_at', '>=', moment().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss'))
 
-    const row = await query.first();
+    const row = await query.first()
     if (row) {
-      return row.token;
+      return row.token
     }
 
-    const token = Encryption.encrypt(randtoken.generate(16));
+    const token = Encryption.encrypt(randtoken.generate(16))
 
-    await user.related('tokens').create({ type, token });
+    await user.related('tokens').create({ type, token })
 
-    return token;
+    return token
   }
 }
diff --git a/app/Models/Workspace.ts b/app/Models/Workspace.ts
index 8648e02..c960ae4 100644
--- a/app/Models/Workspace.ts
+++ b/app/Models/Workspace.ts
@@ -1,41 +1,42 @@
-import { DateTime } from 'luxon';
-import { BaseModel, column, HasOne, hasOne } from '@ioc:Adonis/Lucid/Orm';
-import User from './User';
+import { DateTime } from 'luxon'
+import { BaseModel, column, hasOne } from '@adonisjs/lucid/orm'
+import User from './User.js'
+import { HasOne } from '@adonisjs/lucid/types/relations'
 
 export default class Workspace extends BaseModel {
   @column({ isPrimary: true })
-  public id: number;
+  public id: number
 
   @column({
     columnName: 'workspaceId',
   })
-  public workspaceId: string;
+  public workspaceId: string
 
   @hasOne(() => User, {
     foreignKey: 'userId',
   })
-  public user: HasOne<typeof User>;
+  public user: HasOne<typeof User>
 
   @column({
     columnName: 'userId',
   })
-  public userId: number;
+  public userId: number
 
   @column()
-  public name: string;
+  public name: string
 
   @column()
-  public order: number;
+  public order: number
 
   @column()
-  public services: string;
+  public services: string
 
   @column()
-  public data: string;
+  public data: string
 
   @column.dateTime({ autoCreate: true })
-  public createdAt: DateTime;
+  public createdAt: DateTime
 
   @column.dateTime({ autoCreate: true, autoUpdate: true })
-  public updatedAt: DateTime;
+  public updatedAt: DateTime
 }