- npm updates

- renamed 'models' and 'validators' folders
- removed unneccessary files in contracts folder

app/Controllers/Http/Admin/AdminuserController.ts

@@ -1,9 +1,9 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import User from '#app/Models/User';
-import Role from '#app/Models/Role';
+import User from '#models/user';
+import Role from '#models/role';
 import { ModelQueryBuilderContract } from "@adonisjs/lucid/types/model";
-import CreateUserValidator from '#app/Validators/CreateUserValidator';
-import UpdateUserValidator from '#app/Validators/UpdateUserValidator';
+import CreateUserValidator from '#validators/create_user_validator';
+import UpdateUserValidator from '#validators/update_user_validator';
 // import { schema, rules } from '@ioc:Adonis/Core/Validator';
 // import Hash from '@ioc:Adonis/Core/Hash';
 // import { schema, rules } from '@ioc:Adonis/Core/Validator';

app/Controllers/Http/Admin/RoleController.ts

@@ -1,8 +1,8 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import Role from '#app/Models/Role';
-import Permission from '#app/Models/Permission';
-import CreateRoleValidator from '#app/Validators/CreateRoleValidator';
-import UpdateRoleValidator from '#app/Validators/UpdateRoleValidator';
+import Role from '#models/role';
+import Permission from '#models/permission';
+import CreateRoleValidator from '#validators/create_role_validator';
+import UpdateRoleValidator from '#validators/update_role_validator';
 import type { ModelQueryBuilderContract } from "@adonisjs/lucid/types/model";
 
 // import { schema, rules } from '@ioc:Adonis/Core/Validator';

app/Controllers/Http/Api/AuthorsController.ts

@@ -1,5 +1,5 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import Person from '#app/Models/Person';
+import Person from '#models/person';
 // import Dataset from 'App/Models/Dataset';
 
 // node ace make:controller Author

app/Controllers/Http/Api/DatasetController.ts

@@ -1,6 +1,6 @@
 import type { HttpContext } from '@adonisjs/core/http';
 // import Person from 'App/Models/Person';
-import Dataset from '#app/Models/Dataset';
+import Dataset from '#models/dataset';
 import { StatusCodes } from 'http-status-codes';
 
 // node ace make:controller Author

app/Controllers/Http/Api/FileController.ts

@@ -1,5 +1,5 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import File from '#app/Models/File';
+import File from '#models/file';
 import { StatusCodes } from 'http-status-codes';
 import * as fs from 'fs';
 import * as path from 'path';

app/Controllers/Http/Api/UserController.ts

@@ -1,6 +1,6 @@
 import type { HttpContext } from '@adonisjs/core/http';
 // import TotpSecret from 'App/Models/TotpSecret';
-import User from '#app/Models/User';
+import User from '#models/user';
 import TwoFactorAuthProvider from '#app/services/TwoFactorAuthProvider';
 import { StatusCodes } from 'http-status-codes';
 import { InvalidArgumentException } from 'node-exceptions';

app/Controllers/Http/Auth/AuthController.ts

@@ -1,8 +1,8 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import User from '#models/User';
+import User from '#models/user';
 // import Hash from '@ioc:Adonis/Core/Hash';
 // import InvalidCredentialException from 'App/Exceptions/InvalidCredentialException';
-import AuthValidator from '#app/Validators/AuthValidator';
+import AuthValidator from '#validators/auth_validator';
 
 import TwoFactorAuthProvider from '#app/services/TwoFactorAuthProvider';
 // import { Authenticator } from '@adonisjs/auth';

app/Controllers/Http/Auth/UserController.ts

@@ -1,5 +1,5 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import User from '#app/Models/User';
+import User from '#models/user';
 // import { RenderResponse } from '@ioc:EidelLev/Inertia';
 import TwoFactorAuthProvider from '#app/services/TwoFactorAuthProvider';
 import hash from '@adonisjs/core/services/hash';

app/Controllers/Http/Editor/DatasetController.ts

@@ -1,8 +1,8 @@
 import type { HttpContext } from '@adonisjs/core/http';
 import { Client } from '@opensearch-project/opensearch';
-import User from '#app/Models/User';
-import Dataset from '#app/Models/Dataset';
-import DatasetIdentifier from '#app/Models/DatasetIdentifier';
+import User from '#models/user';
+import Dataset from '#models/dataset';
+import DatasetIdentifier from '#models/dataset_identifier';
 import XmlModel from '#app/Library/XmlModel';
 import { XMLBuilder } from 'xmlbuilder2/lib/interfaces.js';
 import { create } from 'xmlbuilder2';
@@ -11,7 +11,7 @@ import SaxonJS from 'saxon-js';
 import { schema } from '@adonisjs/validator';
 import { DateTime } from 'luxon';
 import Index from '#app/Library/Utils/Index';
-import { getDomain } from '#app/Utils/utility-functions';
+import { getDomain } from '#app/utils/utility-functions';
 import { DoiClient } from '#app/Library/Doi/DoiClient';
 import DoiClientException from '#app/exceptions/DoiClientException';
 import logger from '@adonisjs/core/services/logger';

app/Controllers/Http/Oai/OaiController.ts

@@ -12,9 +12,9 @@ import SaxonJS from 'saxon-js';
 // import { Xslt, xmlParse } from 'xslt-processor'
 import { OaiErrorCodes, OaiModelError } from '#app/exceptions/OaiErrorCodes';
 import { OaiModelException, BadOaiModelException } from '#app/exceptions/OaiModelException';
-import Dataset from '#app/Models/Dataset';
-import Collection from '#app/Models/Collection';
-import { getDomain, preg_match } from '#app/Utils/utility-functions';
+import Dataset from '#models/dataset';
+import Collection from '#models/collection';
+import { getDomain, preg_match } from '#app/utils/utility-functions';
 import XmlModel from '#app/Library/XmlModel';
 import logger from '@adonisjs/core/services/logger';
 import ResumptionToken from '#app/Library/Oai/ResumptionToken';

app/Controllers/Http/Reviewer/DatasetController.ts

@@ -1,8 +1,8 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import User from '#app/Models/User';
-import Dataset from '#app/Models/Dataset';
+import User from '#models/user';
+import Dataset from '#models/dataset';
 import Field from '#app/Library/Field';
-import BaseModel from '#app/Models/BaseModel';
+import BaseModel from '#models/base_model';
 import { DateTime } from 'luxon';
 import { schema, rules } from '@adonisjs/validator';
 import { ModelQueryBuilderContract } from "@adonisjs/lucid/types/model";

app/Controllers/Http/Submitter/DatasetController.ts

@@ -1,22 +1,22 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import User from '#app/Models/User';
-import Dataset from '#app/Models/Dataset';
-import License from '#app/Models/License';
-import Project from '#app/Models/Project';
-import Title from '#app/Models/Title';
-import Description from '#app/Models/Description';
-import Language from '#app/Models/Language';
-import Coverage from '#app/Models/Coverage';
-import Collection from '#app/Models/Collection';
+import User from '#models/user';
+import Dataset from '#models/dataset';
+import License from '#models/license';
+import Project from '#models/project';
+import Title from '#models/title';
+import Description from '#models/description';
+import Language from '#models/language';
+import Coverage from '#models/coverage';
+import Collection from '#models/collection';
 import { schema, rules } from '@adonisjs/validator';
 import { CustomMessages } from '@adonisjs/validator/types';
 import dayjs from 'dayjs';
-import Person from '#app/Models/Person';
+import Person from '#models/person';
 import db from '@adonisjs/lucid/services/db';
 import { TransactionClientContract } from '@adonisjs/lucid/types/database';
-import Subject from '#app/Models/Subject';
-import CreateDatasetValidator from '#app/Validators/CreateDatasetValidator';
-import UpdateDatasetValidator from '#app/Validators/UpdateDatasetValidator';
+import Subject from '#models/subject';
+import CreateDatasetValidator from '#validators/create_dataset_validator';
+import UpdateDatasetValidator from '#validators/update_dataset_validator';
 import {
     TitleTypes,
     DescriptionTypes,
@@ -28,9 +28,9 @@ import {
     SubjectTypes,
 } from '#contracts/enums';
 import { ModelQueryBuilderContract } from '@adonisjs/lucid/types/model';
-import DatasetReference from '#app/Models/DatasetReference';
+import DatasetReference from '#models/dataset_reference';
 import { cuid } from '@adonisjs/core/helpers';
-import File from '#app/Models/File';
+import File from '#models/file';
 import ClamScan from 'clamscan';
 import { ValidationException } from '@adonisjs/validator';
 // import Drive from '@ioc:Adonis/Core/Drive';

app/Controllers/Http/Submitter/PersonController.ts

@@ -10,7 +10,7 @@ import type { HttpContext } from '@adonisjs/core/http';
 // import Collection from 'App/Models/Collection';
 // import { schema, CustomMessages, rules } from '@ioc:Adonis/Core/Validator';
 // import dayjs from 'dayjs';
-import Person from '#app/Models/Person';
+import Person from '#models/person';
 import { ModelQueryBuilderContract } from "@adonisjs/lucid/types/model";
 
 export default class PersonController {

app/Library/Strategy.ts

@@ -1,8 +1,8 @@
 import { XMLBuilder } from 'xmlbuilder2/lib/interfaces.js';
 import { create } from 'xmlbuilder2';
-import Dataset from '#app/Models/Dataset';
+import Dataset from '#models/dataset';
 import Field from './Field.js';
-import BaseModel from '#app/Models/BaseModel';
+import BaseModel from '#models/base_model';
 import { DateTime } from 'luxon';
 
 export default class Strategy {

app/Library/Utils/Index.ts

@@ -1,4 +1,4 @@
-import Dataset from '#app/Models/Dataset';
+import Dataset from '#models/dataset';
 import { Client } from '@opensearch-project/opensearch';
 import { create } from 'xmlbuilder2';
 import SaxonJS from 'saxon-js';
@@ -8,7 +8,7 @@ import logger from '@adonisjs/core/services/logger';
 import { readFileSync } from 'fs';
 import { DateTime } from 'luxon';
 // import Config from '@ioc:Adonis/Core/Config';
-import { getDomain } from '#app/Utils/utility-functions';
+import { getDomain } from '#app/utils/utility-functions';
 
 // const opensearchNode = process.env.OPENSEARCH_HOST || 'localhost';
 // const client = new Client({ node: `http://${opensearchNode}` }); // replace with your OpenSearch endpoint

app/Library/XmlModel.ts

@@ -1,6 +1,6 @@
-import DocumentXmlCache from '#app/Models/DocumentXmlCache';
+import DocumentXmlCache from '#models/DocumentXmlCache';
 import { XMLBuilder } from 'xmlbuilder2/lib/interfaces.js';
-import Dataset from '#app/Models/Dataset';
+import Dataset from '#models/dataset';
 import Strategy from './Strategy.js';
 import { DateTime } from 'luxon';
 import { builder } from 'xmlbuilder2';

app/middleware/Is.ts

@@ -2,7 +2,7 @@ import { HttpContext } from '@adonisjs/core/http';
 // import Config from '@ioc:Adonis/Core/Config';
 import config from '@adonisjs/core/services/config'
 import db from '@adonisjs/lucid/services/db';
-import User from '#app/Models/User';
+import User from '#models/user';
 // import { Exception } from '@adonisjs/core/build/standalone'
 
 const roleTable = config.get('rolePermission.role_table', 'roles');

app/middleware/can_middleware.ts

@@ -2,7 +2,7 @@ import { HttpContext } from '@adonisjs/core/http';
 // import Config from '@ioc:Adonis/Core/Config';
 import config from '@adonisjs/core/services/config';
 import db from '@adonisjs/lucid/services/db';
-import User from '#app/Models/User';
+import User from '#models/user';
 import { Exception } from '@adonisjs/core/exceptions';
 
 const permissionTable = config.get('rolePermission.permission_table', 'permissions');

app/middleware/role_middleware.ts

@@ -1,7 +1,7 @@
 import type { HttpContext } from '@adonisjs/core/http';
 import db from '@adonisjs/lucid/services/db';
 import config from '@adonisjs/core/services/config';
-import User from '#app/Models/User';
+import User from '#models/user';
 import { Exception } from '@adonisjs/core/exceptions';
 
 // const roleTable = Config.get('rolePermission.role_table', 'roles');

app/models/DocumentXmlCache.ts

@@ -1,5 +1,5 @@
 import { column, BaseModel, SnakeCaseNamingStrategy, belongsTo } from '@adonisjs/lucid/orm';
-import Dataset from './Dataset.js';
+import Dataset from './dataset.js';
 import { builder, create } from 'xmlbuilder2';
 import { XMLBuilder } from 'xmlbuilder2/lib/interfaces.js';
 import db from '@adonisjs/lucid/services/db';

app/models/collection.ts

@@ -1,7 +1,7 @@
 import { column, SnakeCaseNamingStrategy, manyToMany, belongsTo } from '@adonisjs/lucid/orm';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
-import CollectionRole from './CollectionRole.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
+import CollectionRole from './collection_role.js';
 import type { ManyToMany } from "@adonisjs/lucid/types/relations";
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";
 

app/models/collection_role.ts

@@ -1,6 +1,6 @@
 import { column, SnakeCaseNamingStrategy, hasMany } from '@adonisjs/lucid/orm';
-import BaseModel from './BaseModel.js';
-import Collection from './Collection.js';
+import BaseModel from './base_model.js';
+import Collection from './collection.js';
 import type { HasMany } from "@adonisjs/lucid/types/relations";
 
 export default class CollectionRole extends BaseModel {

app/models/coverage.ts

@@ -1,7 +1,7 @@
 import { column, SnakeCaseNamingStrategy, belongsTo } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";
 
 export default class Coverage extends BaseModel {

app/models/dataset.ts

@@ -9,20 +9,20 @@ import {
 } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
 import dayjs from 'dayjs';
-import Person from './Person.js';
-import User from './User.js';
-import Title from './Title.js';
-import Description from './Description.js';
-import License from './License.js';
-import Subject from './Subject.js';
-import File from './File.js';
-import Coverage from './Coverage.js';
-import DatasetReference from './DatasetReference.js';
-import Collection from './Collection.js';
-import DatasetIdentifier from './DatasetIdentifier.js';
-import Project from './Project.js';
+import Person from './person.js';
+import User from './user.js';
+import Title from './title.js';
+import Description from './description.js';
+import License from './license.js';
+import Subject from './subject.js';
+import File from './file.js';
+import Coverage from './coverage.js';
+import DatasetReference from './dataset_reference.js';
+import Collection from './collection.js';
+import DatasetIdentifier from './dataset_identifier.js';
+import Project from './project.js';
 import DocumentXmlCache from './DocumentXmlCache.js';
-import DatasetExtension from '#app/Models/Traits/DatasetExtension';
+import DatasetExtension from '#models/traits/dataset_extension';
 import type { ManyToMany } from "@adonisjs/lucid/types/relations";
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";
 import type { HasMany } from "@adonisjs/lucid/types/relations";

app/models/dataset_identifier.ts

@@ -1,7 +1,7 @@
 import { column, SnakeCaseNamingStrategy, belongsTo } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";
 
 export default class DatasetIdentifier extends BaseModel {

app/models/dataset_reference.ts

@@ -1,7 +1,7 @@
 import { column, SnakeCaseNamingStrategy, belongsTo } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";
 
 export default class DatasetReference extends BaseModel {

app/models/description.ts

@@ -1,6 +1,6 @@
 import { column, belongsTo } from '@adonisjs/lucid/orm';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";
 
 export default class Description extends BaseModel {

app/models/file.ts

@@ -1,8 +1,8 @@
 import { DateTime } from 'luxon';
 import { column, hasMany, belongsTo, SnakeCaseNamingStrategy, computed } from '@adonisjs/lucid/orm';
-import HashValue from './HashValue.js';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import HashValue from './hash_value.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 // import { Buffer } from 'buffer';
 import * as fs from 'fs';
 import crypto from 'crypto';

app/models/hash_value.ts

@@ -1,5 +1,5 @@
 import { column, BaseModel, belongsTo, SnakeCaseNamingStrategy } from '@adonisjs/lucid/orm';
-import File from './File.js';
+import File from './file.js';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";
 
 export default class HashValue extends BaseModel {

app/models/language.ts

@@ -1,5 +1,5 @@
 import { column, SnakeCaseNamingStrategy } from '@adonisjs/lucid/orm';
-import BaseModel from './BaseModel.js';
+import BaseModel from './base_model.js';
 // import { DateTime } from 'luxon';
 
 export default class Language extends BaseModel {

app/models/license.ts

@@ -1,5 +1,5 @@
 import { column, SnakeCaseNamingStrategy } from '@adonisjs/lucid/orm';
-import BaseModel from './BaseModel.js';
+import BaseModel from './base_model.js';
 
 export default class License extends BaseModel {
     public static namingStrategy = new SnakeCaseNamingStrategy();

app/models/permission.ts

@@ -1,8 +1,8 @@
 import { column, manyToMany, SnakeCaseNamingStrategy } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
 import dayjs from 'dayjs';
-import Role from '#app/Models/Role';
-import BaseModel from './BaseModel.js';
+import Role from '#models/role';
+import BaseModel from './base_model.js';
 import type { ManyToMany } from "@adonisjs/lucid/types/relations";
 
 export default class Permission extends BaseModel {

app/models/person.ts

@@ -1,8 +1,8 @@
 import { column, SnakeCaseNamingStrategy, computed, manyToMany } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
 import dayjs from 'dayjs';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 import type { ManyToMany } from "@adonisjs/lucid/types/relations";
 
 export default class Person extends BaseModel {

app/models/project.ts

@@ -1,6 +1,6 @@
 import { column, SnakeCaseNamingStrategy } from '@adonisjs/lucid/orm';
 import { DateTime } from 'luxon';
-import BaseModel from './BaseModel.js';
+import BaseModel from './base_model.js';
 
 export default class Project extends BaseModel {
     public static namingStrategy = new SnakeCaseNamingStrategy();

app/models/role.ts

@@ -1,10 +1,10 @@
 import { column, SnakeCaseNamingStrategy, manyToMany, beforeCreate, beforeUpdate } from '@adonisjs/lucid/orm';
-import BaseModel from './BaseModel.js';
+import BaseModel from './base_model.js';
 import { DateTime } from 'luxon';
 // import moment from 'moment';
 import dayjs from 'dayjs';
-import User from './User.js';
-import Permission from '#app/Models/Permission';
+import User from './user.js';
+import Permission from '#models/permission';
 import type { ManyToMany } from "@adonisjs/lucid/types/relations";
 
 export default class Role extends BaseModel {

app/models/subject.ts

@@ -1,9 +1,9 @@
 import { column, SnakeCaseNamingStrategy, manyToMany, computed} from '@adonisjs/lucid/orm';
-import BaseModel from './BaseModel.js';
+import BaseModel from './base_model.js';
 
 import { DateTime } from 'luxon';
 import dayjs from 'dayjs';
-import Dataset from './Dataset.js';
+import Dataset from './dataset.js';
 import type { ManyToMany } from "@adonisjs/lucid/types/relations";
 
 export default class Subject extends BaseModel {

app/models/title.ts

@@ -1,6 +1,6 @@
 import { column, belongsTo } from '@adonisjs/lucid/orm';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";
 
 // import { DatasetRelatedBaseModel } from './BaseModel';

app/models/totp_secret.ts

@@ -1,5 +1,5 @@
 import { column, BaseModel, SnakeCaseNamingStrategy, belongsTo } from '@adonisjs/lucid/orm';
-import User from './User.js';
+import User from './user.js';
 import { DateTime } from 'luxon';
 import dayjs from 'dayjs';
 // import Encryption from '@ioc:Adonis/Core/Encryption';

app/models/traits/dataset_extension.ts

@@ -1,13 +1,13 @@
-import Title from '#app/Models/Title';
-import Description from '#app/Models/Description';
-import License from '#app/Models/License';
-import Person from '#app/Models/Person';
-import DatasetReference from '#app/Models/DatasetReference';
-import DatasetIdentifier from '#app/Models/DatasetIdentifier';
-import Subject from '#app/Models/Subject';
-import File from '#app/Models/File';
-import Coverage from '#app/Models/Coverage';
-import Collection from '#app/Models/Collection';
+import Title from '#models/title';
+import Description from '#models/description';
+import License from '#models/license';
+import Person from '#models/person';
+import DatasetReference from '#models/dataset_reference';
+import DatasetIdentifier from '#models/dataset_identifier';
+import Subject from '#models/subject';
+import File from '#models/file';
+import Coverage from '#models/coverage';
+import Collection from '#models/collection';
 import { BaseModel as LucidBaseModel } from '@adonisjs/lucid/orm';
 import Field from '#app/Library/Field';
 import { DateTime } from 'luxon';

app/models/user.ts

@@ -2,11 +2,11 @@ import { DateTime } from 'luxon';
 import { withAuthFinder } from '@adonisjs/auth/mixins/lucid'
 import { column, manyToMany, hasMany } from '@adonisjs/lucid/orm';
 import hash from '@adonisjs/core/services/hash';
-import Role from './Role.js';
+import Role from './role.js';
 import db from '@adonisjs/lucid/services/db';
 import config from '@adonisjs/core/services/config';
-import Dataset from './Dataset.js';
-import BaseModel from './BaseModel.js';
+import Dataset from './dataset.js';
+import BaseModel from './base_model.js';
 // import Encryption from '@ioc:Adonis/Core/Encryption';
 import encryption from '@adonisjs/core/services/encryption';
 import { TotpState } from '#contracts/enums';

app/models/user_role.ts

@@ -1,7 +1,7 @@
 import { column, BaseModel, belongsTo, SnakeCaseNamingStrategy } from '@adonisjs/lucid/orm';
 
-import User from '#app/Models/User';
-import Role from '#app/Models/Role';
+import User from '#models/user';
+import Role from '#models/role';
 import { DateTime } from 'luxon';
 import type { BelongsTo } from "@adonisjs/lucid/types/relations";
 

app/services/TwoFactorAuthProvider.ts

@@ -1,6 +1,6 @@
 // import Config from '@ioc:Adonis/Core/Config';
 import config from '@adonisjs/core/services/config'
-import User from '#app/Models/User';
+import User from '#models/user';
 import { generateSecret, verifyToken } from 'node-2fa/dist/index.js';
 // import cryptoRandomString from 'crypto-random-string';
 import QRCode from 'qrcode';