feat: improve models

src/services/abstractService.ts

@@ -4,7 +4,7 @@ import type {Method} from 'axios'
 import {objectToSnakeCase} from '@/helpers/case'
 import AbstractModel, { type IAbstract } from '@/models/abstractModel'
 import type { Right } from '@/constants/rights'
-import type { IFile } from '@/models/file'
+import type {IFile} from '@/modelTypes/IFile'
 
 interface Paths {
 	create : string

src/services/attachment.ts

@@ -1,8 +1,12 @@
-import AbstractService from './abstractService'
-import AttachmentModel, { type IAttachment } from '../models/attachment'
 import {formatISO} from 'date-fns'
+
+import AbstractService from './abstractService'
+import AttachmentModel from '../models/attachment'
+
+import type { IAttachment } from '@/modelTypes/IAttachment'
+import type { IFile } from '@/modelTypes/IFile'
+
 import {downloadBlob} from '@/helpers/downloadBlob'
-import type { IFile } from '@/models/file'
 
 export default class AttachmentService extends AbstractService<AttachmentModel> {
 	constructor() {
@@ -22,7 +26,7 @@ export default class AttachmentService extends AbstractService<AttachmentModel>
 		return false
 	}
 
-	modelFactory(data) {
+	modelFactory(data: Partial<IAttachment>) {
 		return new AttachmentModel(data)
 	}
 

src/services/avatar.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import AvatarModel, { type IAvatar } from '../models/avatar'
+import AvatarModel from '@/models/avatar'
+import type { IAvatar } from '@/modelTypes/IAvatar'
 
 export default class AvatarService extends AbstractService<IAvatar> {
 	constructor() {
@@ -10,7 +11,7 @@ export default class AvatarService extends AbstractService<IAvatar> {
 		})
 	}
 
-	modelFactory(data) {
+	modelFactory(data: Partial<IAvatar>) {
 		return new AvatarModel(data)
 	}
 

src/services/backgroundUnsplash.ts

@@ -1,6 +1,7 @@
 import AbstractService from './abstractService'
-import BackgroundImageModel, { type IBackgroundImage } from '../models/backgroundImage'
+import BackgroundImageModel from '../models/backgroundImage'
 import ListModel from '@/models/list'
+import type { IBackgroundImage } from '@/modelTypes/IBackgroundImage'
 
 export default class BackgroundUnsplashService extends AbstractService<IBackgroundImage> {
 	constructor() {
@@ -10,7 +11,7 @@ export default class BackgroundUnsplashService extends AbstractService<IBackgrou
 		})
 	}
 
-	modelFactory(data) {
+	modelFactory(data: Partial<IBackgroundImage>) {
 		return new BackgroundImageModel(data)
 	}
 

src/services/backgroundUpload.ts

@@ -1,6 +1,8 @@
 import AbstractService from './abstractService'
-import ListModel, { type IList } from '../models/list'
-import type { IFile } from '@/models/file'
+import ListModel from '@/models/list'
+
+import type { IList } from '@/modelTypes/IList'
+import type { IFile } from '@/modelTypes/IFile'
 
 export default class BackgroundUploadService extends AbstractService {
 	constructor() {
@@ -13,14 +15,12 @@ export default class BackgroundUploadService extends AbstractService {
 		return false
 	}
 
-	modelCreateFactory(data) {
+	modelCreateFactory(data: Partial<IList>) {
 		return new ListModel(data)
 	}
 
 	/**
 	 * Uploads a file to the server
-	 * @param file
-	 * @returns {Promise<any|never>}
 	 */
 	create(listId: IList['id'], file: IFile) {
 		return this.uploadFile(

src/services/bucket.ts

@@ -1,6 +1,7 @@
 import AbstractService from './abstractService'
-import BucketModel, { type IBucket } from '../models/bucket'
+import BucketModel from '../models/bucket'
 import TaskService from '@/services/task'
+import type { IBucket } from '@/modelTypes/IBucket'
 
 export default class BucketService extends AbstractService<IBucket> {
 	constructor() {
@@ -12,7 +13,7 @@ export default class BucketService extends AbstractService<IBucket> {
 		})
 	}
 
-	modelFactory(data) {
+	modelFactory(data: Partial<IBucket>) {
 		return new BucketModel(data)
 	}
 

src/services/caldavToken.ts

@@ -1,5 +1,6 @@
 import {formatISO} from 'date-fns'
-import CaldavTokenModel, {type ICaldavToken} from '../models/caldavToken'
+import CaldavTokenModel from '@/models/caldavToken'
+import type {ICaldavToken} from '@/modelTypes/ICaldavToken'
 import AbstractService from './abstractService'
 
 export default class CaldavTokenService extends AbstractService<ICaldavToken> {

src/services/label.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import LabelModel, { type ILabel } from '@/models/label'
+import LabelModel from '@/models/label'
+import type {ILabel} from '@/modelTypes/ILabel'
 import {formatISO} from 'date-fns'
 import {colorFromHex} from '@/helpers/color/colorFromHex'
 

src/services/labelTask.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import LabelTask, {type ILabelTask} from '@/models/labelTask'
+import LabelTask from '@/models/labelTask'
+import type {ILabelTask} from '@/modelTypes/ILabelTask'
 
 export default class LabelTaskService extends AbstractService<ILabelTask> {
 	constructor() {

src/services/linkShare.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import LinkShareModel, { type ILinkShare } from '@/models/linkShare'
+import LinkShareModel from '@/models/linkShare'
+import type {ILinkShare} from '@/modelTypes/ILinkShare'
 import {formatISO} from 'date-fns'
 
 export default class LinkShareService extends AbstractService<ILinkShare> {

src/services/list.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import ListModel, { type IList } from '@/models/list'
+import ListModel from '@/models/list'
+import type {IList} from '@/modelTypes/IList'
 import TaskService from './task'
 import {formatISO} from 'date-fns'
 import {colorFromHex} from '@/helpers/color/colorFromHex'

src/services/listDuplicateService.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import listDuplicateModel, {type IListDuplicate} from '../models/listDuplicateModel'
+import listDuplicateModel from '@/models/listDuplicateModel'
+import type {IListDuplicate} from '@/modelTypes/IListDuplicate'
 
 export default class ListDuplicateService extends AbstractService<IListDuplicate> {
 	constructor() {

src/services/migrator/abstractMigrationFile.ts

@@ -1,3 +1,4 @@
+import type {IFile} from '@/modelTypes/IFile'
 import AbstractService from '../abstractService'
 
 // This service builds on top of the abstract service and basically just hides away method names.
@@ -5,7 +6,7 @@ import AbstractService from '../abstractService'
 export default class AbstractMigrationFileService extends AbstractService {
 	serviceUrlKey = ''
 
-	constructor(serviceUrlKey) {
+	constructor(serviceUrlKey: '') {
 		super({
 			create: '/migration/' + serviceUrlKey + '/migrate',
 		})
@@ -20,7 +21,7 @@ export default class AbstractMigrationFileService extends AbstractService {
 		return false
 	}
 
-	migrate(file) {
+	migrate(file: IFile) {
 		console.log(file)
 		return this.uploadFile(
 			this.paths.create,

src/services/namespace.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import NamespaceModel, { type INamespace } from '../models/namespace'
+import NamespaceModel from '../models/namespace'
+import type {INamespace} from '@/modelTypes/INamespace'
 import {formatISO} from 'date-fns'
 import {colorFromHex} from '@/helpers/color/colorFromHex'
 

src/services/notification.ts

@@ -1,6 +1,7 @@
 import AbstractService from '@/services/abstractService'
 import {formatISO} from 'date-fns'
-import NotificationModel, { type INotification } from '@/models/notification'
+import NotificationModel from '@/models/notification'
+import type {INotification} from '@/modelTypes/INotification'
 
 export default class NotificationService extends AbstractService<INotification> {
 	constructor() {

src/services/passwordReset.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import PasswordResetModel, { type IPasswordReset } from '../models/passwordReset'
+import PasswordResetModel from '@/models/passwordReset'
+import type {IPasswordReset} from '@/modelTypes/IPasswordReset'
 
 export default class PasswordResetService extends AbstractService<IPasswordReset> {
 

src/services/passwordUpdateService.ts

@@ -1,5 +1,5 @@
-import type { IPasswordUpdate } from '@/models/passwordUpdate'
 import AbstractService from './abstractService'
+import type {IPasswordUpdate} from '@/modelTypes/IPasswordUpdate'
 
 export default class PasswordUpdateService extends AbstractService<IPasswordUpdate> {
 	constructor() {

src/services/savedFilter.ts

@@ -1,5 +1,6 @@
 import AbstractService from '@/services/abstractService'
-import SavedFilterModel, { type ISavedFilter } from '@/models/savedFilter'
+import SavedFilterModel from '@/models/savedFilter'
+import type {ISavedFilter} from '@/modelTypes/ISavedFilter'
 import {objectToCamelCase} from '@/helpers/case'
 
 export default class SavedFilterService extends AbstractService<ISavedFilter> {

src/services/subscription.ts

@@ -1,5 +1,6 @@
 import AbstractService from '@/services/abstractService'
-import SubscriptionModel, { type ISubscription } from '@/models/subscription'
+import SubscriptionModel from '@/models/subscription'
+import type {ISubscription} from '@/modelTypes/ISubscription'
 
 export default class SubscriptionService extends AbstractService<ISubscription> {
 	constructor() {

src/services/task.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import TaskModel, { type ITask } from '../models/task'
+import TaskModel from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 import AttachmentService from './attachment'
 import LabelService from './label'
 

src/services/taskAssignee.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import TaskAssigneeModel, { type ITaskAssignee } from '../models/taskAssignee'
+import TaskAssigneeModel from '@/models/taskAssignee'
+import type {ITaskAssignee} from '@/modelTypes/ITaskAssignee'
 import {formatISO} from 'date-fns'
 
 export default class TaskAssigneeService extends AbstractService<ITaskAssignee> {

src/services/taskComment.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import TaskCommentModel, { type ITaskComment } from '../models/taskComment'
+import TaskCommentModel from '@/models/taskComment'
+import type {ITaskComment} from '@/modelTypes/ITaskComment'
 import {formatISO} from 'date-fns'
 
 export default class TaskCommentService extends AbstractService<ITaskComment> {

src/services/taskRelation.ts

@@ -1,7 +1,8 @@
 import {formatISO} from 'date-fns'
 
 import AbstractService from './abstractService'
-import TaskRelationModel, {type ITaskRelation} from '@/models/taskRelation'
+import TaskRelationModel from '@/models/taskRelation'
+import type {ITaskRelation} from '@/modelTypes/ITaskRelation'
 
 export default class TaskRelationService extends AbstractService<ITaskRelation> {
 	constructor() {

src/services/team.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import TeamModel, { type ITeam } from '../models/team'
+import TeamModel from '@/models/team'
+import type { ITeam } from '@/modelTypes/ITeam'
 import {formatISO} from 'date-fns'
 
 export default class TeamService extends AbstractService<ITeam> {

src/services/teamList.ts

@@ -1,6 +1,7 @@
 import AbstractService from './abstractService'
-import TeamListModel, { type ITeamList } from '../models/teamList'
-import TeamModel from '../models/team'
+import TeamListModel from '@/models/teamList'
+import type {ITeamList} from '@/modelTypes/ITeamList'
+import TeamModel from '@/models/team'
 import {formatISO} from 'date-fns'
 
 export default class TeamListService extends AbstractService<ITeamList> {

src/services/teamMember.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import TeamMemberModel, { type ITeamMember } from '../models/teamMember'
+import TeamMemberModel from '@/models/teamMember'
+import type {ITeamMember} from '@/modelTypes/ITeamMember'
 import {formatISO} from 'date-fns'
 
 export default class TeamMemberService extends AbstractService<ITeamMember> {

src/services/teamNamespace.ts

@@ -1,6 +1,7 @@
 import AbstractService from './abstractService'
-import TeamNamespaceModel, { type ITeamNamespace } from '../models/teamNamespace'
-import TeamModel from '../models/team'
+import TeamNamespaceModel from '@/models/teamNamespace'
+import type {ITeamNamespace} from '@/modelTypes/ITeamNamespace'
+import TeamModel from '@/models/team'
 import {formatISO} from 'date-fns'
 
 export default class TeamNamespaceService extends AbstractService<ITeamNamespace> {

src/services/totp.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import TotpModel, { type ITotp } from '@/models/totp'
+import TotpModel from '@/models/totp'
+import type {ITotp} from '@/modelTypes/ITotp'
 
 export default class TotpService extends AbstractService<ITotp> {
 	urlPrefix = '/user/settings/totp'

src/services/user.ts

@@ -1,5 +1,6 @@
 import AbstractService from './abstractService'
-import UserModel, { type IUser } from '../models/user'
+import UserModel from '@/models/user'
+import type {IUser} from '@/modelTypes/IUser'
 import {formatISO} from 'date-fns'
 
 export default class UserService extends AbstractService<IUser> {

src/services/userList.ts

@@ -1,8 +1,10 @@
-import AbstractService from './abstractService'
-import UserListModel, { type IUserList } from '../models/userList'
-import UserModel from '../models/user'
 import {formatISO} from 'date-fns'
 
+import AbstractService from './abstractService'
+import UserListModel from '@/models/userList'
+import type {IUserList} from '@/modelTypes/IUserList'
+import UserModel from '@/models/user'
+
 export default class UserListService extends AbstractService<IUserList> {
 	constructor() {
 		super({

src/services/userNamespace.ts

@@ -1,8 +1,10 @@
-import AbstractService from './abstractService'
-import UserNamespaceModel, { type IUserNamespace } from '../models/userNamespace'
-import UserModel from '../models/user'
 import {formatISO} from 'date-fns'
 
+import AbstractService from './abstractService'
+import UserNamespaceModel from '@/models/userNamespace'
+import type {IUserNamespace} from '@/modelTypes/IUserNamespace'
+import UserModel from '@/models/user'
+
 export default class UserNamespaceService extends AbstractService<IUserNamespace> {
 	constructor() {
 		super({

src/services/userSettings.ts

@@ -1,5 +1,4 @@
-
-import type { IUserSettings } from '@/models/userSettings'
+import type {IUserSettings} from '@/modelTypes/IUserSettings'
 import AbstractService from './abstractService'
 
 export default class UserSettingsService extends AbstractService<IUserSettings> {