Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
chore(backend:cache): move `services/cache.service` to `cache.service`
johaven8d1e9d530ed1
diff --git a/backend/src/applications/admin/services/admin.service.spec.ts b/backend/src/applications/admin/services/admin.service.spec.tsindex b1d7ae04..a716f1d8 100644--- a/backend/src/applications/admin/services/admin.service.spec.ts+++ b/backend/src/applications/admin/services/admin.service.spec.ts@@ -1,6 +1,6 @@import { HttpService } from '@nestjs/axios'import { Test, TestingModule } from '@nestjs/testing'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { NotificationsManager } from '../../notifications/services/notifications-manager.service'import { AdminUsersQueries } from '../../users/services/admin-users-queries.service'import { AdminService } from './admin.service'diff --git a/backend/src/applications/admin/services/admin.service.ts b/backend/src/applications/admin/services/admin.service.tsindex 2d72a8b8..c9b2d88b 100644--- a/backend/src/applications/admin/services/admin.service.ts+++ b/backend/src/applications/admin/services/admin.service.ts@@ -3,7 +3,7 @@ import { Injectable, Logger } from '@nestjs/common'import type { AxiosResponse } from 'axios'import { VERSION } from '../../../app.constants'import { APP_URL } from '../../../common/shared'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { HTTP_METHOD } from '../../applications.constants'import { NOTIFICATION_APP, NOTIFICATION_APP_EVENT } from '../../notifications/constants/notifications'import { NotificationContent } from '../../notifications/interfaces/notification-properties.interface'diff --git a/backend/src/applications/comments/comments.controller.spec.ts b/backend/src/applications/comments/comments.controller.spec.tsindex 37b4cd54..aa64a876 100644--- a/backend/src/applications/comments/comments.controller.spec.ts+++ b/backend/src/applications/comments/comments.controller.spec.ts@@ -1,5 +1,5 @@import { Test, TestingModule } from '@nestjs/testing'-import { Cache } from '../../infrastructure/cache/services/cache.service'+import { Cache } from '../../infrastructure/cache/cache.service'import { ContextManager } from '../../infrastructure/context/services/context-manager.service'import { DB_TOKEN_PROVIDER } from '../../infrastructure/database/constants'import { FilesQueries } from '../files/services/files-queries.service'diff --git a/backend/src/applications/comments/services/comments-manager.service.spec.ts b/backend/src/applications/comments/services/comments-manager.service.spec.tsindex 56e609de..8da0a0c8 100644--- a/backend/src/applications/comments/services/comments-manager.service.spec.ts+++ b/backend/src/applications/comments/services/comments-manager.service.spec.ts@@ -1,6 +1,6 @@import { HttpException, HttpStatus } from '@nestjs/common'import { Test, TestingModule } from '@nestjs/testing'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { ContextManager } from '../../../infrastructure/context/services/context-manager.service'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants'import { FilesQueries } from '../../files/services/files-queries.service'diff --git a/backend/src/applications/files/editors/only-office/only-office-manager.service.spec.ts b/backend/src/applications/files/editors/only-office/only-office-manager.service.spec.tsindex 42143974..6f4598d9 100644--- a/backend/src/applications/files/editors/only-office/only-office-manager.service.spec.ts+++ b/backend/src/applications/files/editors/only-office/only-office-manager.service.spec.ts@@ -4,7 +4,7 @@ import { JwtService } from '@nestjs/jwt'import { Test, TestingModule } from '@nestjs/testing'import { AxiosResponse } from 'axios'import { Readable } from 'stream'-import { Cache } from '../../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../../infrastructure/cache/cache.service'import { ContextManager } from '../../../../infrastructure/context/services/context-manager.service'import type { SpaceEnv } from '../../../spaces/models/space-env.model'import type { UserModel } from '../../../users/models/user.model'diff --git a/backend/src/applications/files/editors/only-office/only-office-manager.service.ts b/backend/src/applications/files/editors/only-office/only-office-manager.service.tsindex 96ed217d..749cc8fc 100644--- a/backend/src/applications/files/editors/only-office/only-office-manager.service.ts+++ b/backend/src/applications/files/editors/only-office/only-office-manager.service.ts@@ -10,7 +10,7 @@ import { JwtIdentityPayload } from '../../../../authentication/interfaces/jwt-paimport { convertHumanTimeToSeconds } from '../../../../common/functions'import { encodeUrl } from '../../../../common/shared'import { configuration } from '../../../../configuration/config.environment'-import { Cache } from '../../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../../infrastructure/cache/cache.service'import { ContextManager } from '../../../../infrastructure/context/services/context-manager.service'import { HTTP_METHOD } from '../../../applications.constants'import { FastifySpaceRequest } from '../../../spaces/interfaces/space-request.interface'diff --git a/backend/src/applications/files/files-tasks.controller.spec.ts b/backend/src/applications/files/files-tasks.controller.spec.tsindex 04b86f7e..ed30c1f8 100644--- a/backend/src/applications/files/files-tasks.controller.spec.ts+++ b/backend/src/applications/files/files-tasks.controller.spec.ts@@ -1,5 +1,5 @@import { Test, TestingModule } from '@nestjs/testing'-import { Cache } from '../../infrastructure/cache/services/cache.service'+import { Cache } from '../../infrastructure/cache/cache.service'import { FilesTasksController } from './files-tasks.controller'import { FilesMethods } from './services/files-methods.service'import { FilesTasksManager } from './services/files-tasks-manager.service'diff --git a/backend/src/applications/files/services/files-content-indexer.service.spec.ts b/backend/src/applications/files/services/files-content-indexer.service.spec.tsindex 792a24d5..623a2ff9 100644--- a/backend/src/applications/files/services/files-content-indexer.service.spec.ts+++ b/backend/src/applications/files/services/files-content-indexer.service.spec.ts@@ -1,7 +1,7 @@import { Test, TestingModule } from '@nestjs/testing'import fs from 'fs/promises'import path from 'node:path'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import {CACHE_INDEXING_EVENT_PREFIX,CACHE_INDEXING_FULL_RUN_REQUEST_KEY,diff --git a/backend/src/applications/files/services/files-content-indexer.service.ts b/backend/src/applications/files/services/files-content-indexer.service.tsindex 95faf930..57e1add0 100644--- a/backend/src/applications/files/services/files-content-indexer.service.ts+++ b/backend/src/applications/files/services/files-content-indexer.service.ts@@ -21,7 +21,7 @@ import { getExtensionWithoutDot, getMimeType } from '../utils/files'import { FilesContentParser } from './files-content-parser.service'import { genIndexingKey, genRunId } from '../utils/indexing'import { FILE_REPOSITORY } from '../constants/operations'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { IndexingState, IndexingStatus } from '../interfaces/indexing.interface'import { escapePath } from '../../../common/functions'import { configuration } from '../../../configuration/config.environment'diff --git a/backend/src/applications/files/services/files-event-manager.service.spec.ts b/backend/src/applications/files/services/files-event-manager.service.spec.tsindex 5c50760a..0d610fda 100644--- a/backend/src/applications/files/services/files-event-manager.service.spec.ts+++ b/backend/src/applications/files/services/files-event-manager.service.spec.ts@@ -1,6 +1,6 @@import { Test, TestingModule } from '@nestjs/testing'import { FilesEventManager } from './files-event-manager.service'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { ACTION } from '../../../common/constants'import { FileEvent } from '../events/file-events'import type { FileEventType } from '../interfaces/file-event.interface'diff --git a/backend/src/applications/files/services/files-event-manager.service.ts b/backend/src/applications/files/services/files-event-manager.service.tsindex 5a5e518b..8520b835 100644--- a/backend/src/applications/files/services/files-event-manager.service.ts+++ b/backend/src/applications/files/services/files-event-manager.service.ts@@ -1,5 +1,5 @@import { Injectable, Logger, OnModuleDestroy } from '@nestjs/common'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { FileEvent } from '../events/file-events'import { ACTION } from '../../../common/constants'import type { FileEventType } from '../interfaces/file-event.interface'diff --git a/backend/src/applications/files/services/files-lock-manager.service.spec.ts b/backend/src/applications/files/services/files-lock-manager.service.spec.tsindex 08401403..6ba27729 100644--- a/backend/src/applications/files/services/files-lock-manager.service.spec.ts+++ b/backend/src/applications/files/services/files-lock-manager.service.spec.ts@@ -1,7 +1,7 @@import { Test, TestingModule } from '@nestjs/testing'import crypto from 'node:crypto'import { currentTimeStamp } from '../../../common/shared'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { CACHE_LOCK_PREFIX } from '../constants/cache'import { LockConflict } from '../models/file-lock-error'import { DEPTH, LOCK_PREFIX, LOCK_SCOPE, WEBDAV_APP_LOCK } from '../../webdav/constants/webdav'diff --git a/backend/src/applications/files/services/files-lock-manager.service.ts b/backend/src/applications/files/services/files-lock-manager.service.tsindex de4abe66..510e8194 100644--- a/backend/src/applications/files/services/files-lock-manager.service.ts+++ b/backend/src/applications/files/services/files-lock-manager.service.ts@@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common'import crypto from 'node:crypto'import { currentTimeStamp } from '../../../common/shared'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { UserModel } from '../../users/models/user.model'import { DEPTH, LOCK_DEPTH, LOCK_PREFIX, LOCK_SCOPE } from '../../webdav/constants/webdav'import { CACHE_LOCK_DEFAULT_TTL, CACHE_LOCK_PREFIX } from '../constants/cache'diff --git a/backend/src/applications/files/services/files-methods.service.spec.ts b/backend/src/applications/files/services/files-methods.service.spec.tsindex 33fdd35c..b8200d38 100644--- a/backend/src/applications/files/services/files-methods.service.spec.ts+++ b/backend/src/applications/files/services/files-methods.service.spec.ts@@ -1,7 +1,7 @@import { Test, TestingModule } from '@nestjs/testing'import path from 'node:path'import { transformAndValidate } from '../../../common/functions'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { ContextManager } from '../../../infrastructure/context/services/context-manager.service'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants'import { NotificationsManager } from '../../notifications/services/notifications-manager.service'diff --git a/backend/src/applications/files/services/files-tasks-manager.service.spec.ts b/backend/src/applications/files/services/files-tasks-manager.service.spec.tsindex b30974e9..ca8ed7bf 100644--- a/backend/src/applications/files/services/files-tasks-manager.service.spec.ts+++ b/backend/src/applications/files/services/files-tasks-manager.service.spec.ts@@ -1,7 +1,7 @@import { Test, TestingModule } from '@nestjs/testing'import { HttpException, HttpStatus } from '@nestjs/common'import crypto from 'node:crypto'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import * as filesUtils from '../utils/files'import { FileTaskEvent } from '../events/file-events'import { SendFile } from '../utils/send-file'diff --git a/backend/src/applications/files/services/files-tasks-manager.service.ts b/backend/src/applications/files/services/files-tasks-manager.service.tsindex d157df4b..c832e5e4 100644--- a/backend/src/applications/files/services/files-tasks-manager.service.ts+++ b/backend/src/applications/files/services/files-tasks-manager.service.ts@@ -5,7 +5,7 @@ import path from 'node:path'import { setTimeout } from 'node:timers/promises'import { FastifyAuthenticatedRequest } from '../../../authentication/interfaces/auth-request.interface'import { currentTimeStamp } from '../../../common/shared'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { SpaceEnv } from '../../spaces/models/space-env.model'import { UserModel } from '../../users/models/user.model'import { CACHE_TASK_PREFIX, CACHE_TASK_TTL } from '../constants/cache'diff --git a/backend/src/applications/links/services/links-manager.service.spec.ts b/backend/src/applications/links/services/links-manager.service.spec.tsindex 32c3cbc5..f0b88b16 100644--- a/backend/src/applications/links/services/links-manager.service.spec.ts+++ b/backend/src/applications/links/services/links-manager.service.spec.ts@@ -3,7 +3,7 @@ import { ConfigService } from '@nestjs/config'import { JwtService } from '@nestjs/jwt'import { Test, TestingModule } from '@nestjs/testing'import { AuthManager } from '../../../authentication/auth.service'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { ContextManager } from '../../../infrastructure/context/services/context-manager.service'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants'import { FilesLockManager } from '../../files/services/files-lock-manager.service'diff --git a/backend/src/applications/links/services/links-queries.service.ts b/backend/src/applications/links/services/links-queries.service.tsindex e3d2cbc6..0aa2d1a1 100644--- a/backend/src/applications/links/services/links-queries.service.ts+++ b/backend/src/applications/links/services/links-queries.service.ts@@ -1,7 +1,7 @@import { Inject, Injectable } from '@nestjs/common'import { and, eq, getTableColumns, isNotNull, isNull, or, sql } from 'drizzle-orm'import { alias } from 'drizzle-orm/mysql-core'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants'import type { DBSchema } from '../../../infrastructure/database/interfaces/database.interface'import { dbGetInsertedId } from '../../../infrastructure/database/utils'diff --git a/backend/src/applications/shares/services/shares-queries.service.ts b/backend/src/applications/shares/services/shares-queries.service.tsindex 2cb12f65..0c0850fd 100644--- a/backend/src/applications/shares/services/shares-queries.service.ts+++ b/backend/src/applications/shares/services/shares-queries.service.ts@@ -6,7 +6,7 @@ import { ACTION } from '../../../common/constants'import { uniquePermissions } from '../../../common/functions'import { createSlug, popFromObject } from '../../../common/shared'import { CacheDecorator } from '../../../infrastructure/cache/cache.decorator'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants'import type { DBSchema } from '../../../infrastructure/database/interfaces/database.interface'import {diff --git a/backend/src/applications/shares/shares.controller.spec.ts b/backend/src/applications/shares/shares.controller.spec.tsindex edfcdaec..a30d5338 100644--- a/backend/src/applications/shares/shares.controller.spec.ts+++ b/backend/src/applications/shares/shares.controller.spec.ts@@ -1,5 +1,5 @@import { Test, TestingModule } from '@nestjs/testing'-import { Cache } from '../../infrastructure/cache/services/cache.service'+import { Cache } from '../../infrastructure/cache/cache.service'import { ContextManager } from '../../infrastructure/context/services/context-manager.service'import { DB_TOKEN_PROVIDER } from '../../infrastructure/database/constants'import { FilesQueries } from '../files/services/files-queries.service'diff --git a/backend/src/applications/spaces/guards/space.guard.spec.ts b/backend/src/applications/spaces/guards/space.guard.spec.tsindex 8e81d736..5003a455 100644--- a/backend/src/applications/spaces/guards/space.guard.spec.ts+++ b/backend/src/applications/spaces/guards/space.guard.spec.ts@@ -2,7 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'import { ExecutionContext, HttpException, HttpStatus } from '@nestjs/common'import { Test, TestingModule } from '@nestjs/testing'import { intersectPermissions } from '../../../common/shared'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { ContextManager } from '../../../infrastructure/context/services/context-manager.service'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants'import { FilesQueries } from '../../files/services/files-queries.service'diff --git a/backend/src/applications/spaces/services/spaces-browser.service.spec.ts b/backend/src/applications/spaces/services/spaces-browser.service.spec.tsindex 4017f60a..b16dffea 100644--- a/backend/src/applications/spaces/services/spaces-browser.service.spec.ts+++ b/backend/src/applications/spaces/services/spaces-browser.service.spec.ts@@ -1,7 +1,7 @@import { ConfigModule } from '@nestjs/config'import { Test, TestingModule } from '@nestjs/testing'import { exportConfiguration } from '../../../configuration/config.environment'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { ContextManager } from '../../../infrastructure/context/services/context-manager.service'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants'import { FilesLockManager } from '../../files/services/files-lock-manager.service'diff --git a/backend/src/applications/spaces/services/spaces-manager.service.spec.ts b/backend/src/applications/spaces/services/spaces-manager.service.spec.tsindex a31a9f1c..79c796d4 100644--- a/backend/src/applications/spaces/services/spaces-manager.service.spec.ts+++ b/backend/src/applications/spaces/services/spaces-manager.service.spec.ts@@ -6,7 +6,7 @@ import os from 'node:os'import path from 'node:path'import { transformAndValidate } from '../../../common/functions'import { exportConfiguration } from '../../../configuration/config.environment'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { ContextManager } from '../../../infrastructure/context/services/context-manager.service'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants'import { FilesConfig } from '../../files/files.config'diff --git a/backend/src/applications/spaces/services/spaces-queries.service.ts b/backend/src/applications/spaces/services/spaces-queries.service.tsindex 1c2dd415..0b3e3461 100644--- a/backend/src/applications/spaces/services/spaces-queries.service.ts+++ b/backend/src/applications/spaces/services/spaces-queries.service.ts@@ -5,7 +5,7 @@ import { MySql2PreparedQuery, MySqlQueryResult } from 'drizzle-orm/mysql2'import { ACTION } from '../../../common/constants'import { popFromObject } from '../../../common/shared'import { CacheDecorator } from '../../../infrastructure/cache/cache.decorator'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants'import { DBSchema } from '../../../infrastructure/database/interfaces/database.interface'import {diff --git a/backend/src/applications/spaces/spaces.controller.spec.ts b/backend/src/applications/spaces/spaces.controller.spec.tsindex 2253a271..9d88d765 100644--- a/backend/src/applications/spaces/spaces.controller.spec.ts+++ b/backend/src/applications/spaces/spaces.controller.spec.ts@@ -1,5 +1,5 @@import { Test, TestingModule } from '@nestjs/testing'-import { Cache } from '../../infrastructure/cache/services/cache.service'+import { Cache } from '../../infrastructure/cache/cache.service'import { ContextManager } from '../../infrastructure/context/services/context-manager.service'import { DB_TOKEN_PROVIDER } from '../../infrastructure/database/constants'import { FilesLockManager } from '../files/services/files-lock-manager.service'diff --git a/backend/src/applications/sync/services/sync-clients-manager.service.spec.ts b/backend/src/applications/sync/services/sync-clients-manager.service.spec.tsindex 37102d99..1039b337 100644--- a/backend/src/applications/sync/services/sync-clients-manager.service.spec.ts+++ b/backend/src/applications/sync/services/sync-clients-manager.service.spec.ts@@ -10,7 +10,7 @@ import { AuthProvider2FA } from '../../../authentication/providers/two-fa/auth-pimport * as commonFunctions from '../../../common/functions'import * as commonShared from '../../../common/shared'import { configuration } from '../../../configuration/config.environment'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { isPathExists } from '../../files/utils/files'import { UserModel } from '../../users/models/user.model'import { UsersManager } from '../../users/services/users-manager.service'diff --git a/backend/src/applications/sync/services/sync-queries.service.ts b/backend/src/applications/sync/services/sync-queries.service.tsindex bf5a047b..b9c5126b 100644--- a/backend/src/applications/sync/services/sync-queries.service.ts+++ b/backend/src/applications/sync/services/sync-queries.service.ts@@ -5,7 +5,7 @@ import crypto from 'node:crypto'import { convertHumanTimeToSeconds } from '../../../common/functions'import { currentTimeStamp } from '../../../common/shared'import { CacheDecorator } from '../../../infrastructure/cache/cache.decorator'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants'import type { DBSchema } from '../../../infrastructure/database/interfaces/database.interface'import { concatDistinctObjectsInArray, dbCheckAffectedRows, dbGetInsertedId } from '../../../infrastructure/database/utils'diff --git a/backend/src/applications/users/admin-users.controller.spec.ts b/backend/src/applications/users/admin-users.controller.spec.tsindex 742c795c..07d645d2 100644--- a/backend/src/applications/users/admin-users.controller.spec.ts+++ b/backend/src/applications/users/admin-users.controller.spec.ts@@ -5,7 +5,7 @@ import { AuthManager } from '../../authentication/auth.service'import { AuthProvider2FA } from '../../authentication/providers/two-fa/auth-provider-two-fa.service'import { AuthTwoFaGuard } from '../../authentication/providers/two-fa/auth-two-fa-guard'import { exportConfiguration } from '../../configuration/config.environment'-import { Cache } from '../../infrastructure/cache/services/cache.service'+import { Cache } from '../../infrastructure/cache/cache.service'import { DB_TOKEN_PROVIDER } from '../../infrastructure/database/constants'import { NotificationsManager } from '../notifications/services/notifications-manager.service'import { AdminUsersController } from './admin-users.controller'diff --git a/backend/src/applications/users/services/users-manager.service.spec.ts b/backend/src/applications/users/services/users-manager.service.spec.tsindex 970f8b81..df376c21 100755--- a/backend/src/applications/users/services/users-manager.service.spec.ts+++ b/backend/src/applications/users/services/users-manager.service.spec.ts@@ -10,7 +10,7 @@ import { comparePassword } from '../../../common/functions'import * as imageModule from '../../../common/image'import { pngMimeType, svgMimeType } from '../../../common/image'import { configuration } from '../../../configuration/config.environment'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants'import { fileName, isPathExists } from '../../files/utils/files'import { NotificationsManager } from '../../notifications/services/notifications-manager.service'diff --git a/backend/src/applications/users/services/users-queries.service.ts b/backend/src/applications/users/services/users-queries.service.tsindex 0697e39a..12c0e0b2 100644--- a/backend/src/applications/users/services/users-queries.service.ts+++ b/backend/src/applications/users/services/users-queries.service.ts@@ -4,7 +4,7 @@ import { alias } from 'drizzle-orm/mysql-core'import { MySql2PreparedQuery, MySqlQueryResult } from 'drizzle-orm/mysql2'import { anonymizePassword, comparePassword, uniquePermissions } from '../../../common/functions'import { CacheDecorator } from '../../../infrastructure/cache/cache.decorator'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { configuration } from '../../../configuration/config.environment'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants'import { DBSchema } from '../../../infrastructure/database/interfaces/database.interface'diff --git a/backend/src/applications/users/users.controller.spec.ts b/backend/src/applications/users/users.controller.spec.tsindex 581fb41d..3975cc1b 100755--- a/backend/src/applications/users/users.controller.spec.ts+++ b/backend/src/applications/users/users.controller.spec.ts@@ -4,7 +4,7 @@ import { Test, TestingModule } from '@nestjs/testing'import { AuthManager } from '../../authentication/auth.service'import { AuthProvider2FA } from '../../authentication/providers/two-fa/auth-provider-two-fa.service'import { exportConfiguration } from '../../configuration/config.environment'-import { Cache } from '../../infrastructure/cache/services/cache.service'+import { Cache } from '../../infrastructure/cache/cache.service'import { DB_TOKEN_PROVIDER } from '../../infrastructure/database/constants'import { NotificationsManager } from '../notifications/services/notifications-manager.service'import { UserModel } from './models/user.model'diff --git a/backend/src/authentication/auth.controller.spec.ts b/backend/src/authentication/auth.controller.spec.tsindex 63341d81..6a5ebb4b 100755--- a/backend/src/authentication/auth.controller.spec.ts+++ b/backend/src/authentication/auth.controller.spec.ts@@ -9,7 +9,7 @@ import { generateUserTest } from '../applications/users/utils/test'import { convertHumanTimeToSeconds } from '../common/functions'import { currentTimeStamp } from '../common/shared'import { exportConfiguration } from '../configuration/config.environment'-import { Cache } from '../infrastructure/cache/services/cache.service'+import { Cache } from '../infrastructure/cache/cache.service'import { DB_TOKEN_PROVIDER } from '../infrastructure/database/constants'import { AuthConfig } from './auth.config'import { AuthController } from './auth.controller'diff --git a/backend/src/authentication/guards/auth-basic.guard.spec.ts b/backend/src/authentication/guards/auth-basic.guard.spec.tsindex 13757d84..644721e7 100644--- a/backend/src/authentication/guards/auth-basic.guard.spec.ts+++ b/backend/src/authentication/guards/auth-basic.guard.spec.ts@@ -5,7 +5,7 @@ import { PinoLogger } from 'nestjs-pino'import { UserModel } from '../../applications/users/models/user.model'import { generateUserTest } from '../../applications/users/utils/test'import { WEBDAV_BASE_PATH } from '../../applications/webdav/constants/routes'-import { Cache } from '../../infrastructure/cache/services/cache.service'+import { Cache } from '../../infrastructure/cache/cache.service'import { AuthProvider } from '../providers/auth-providers.models'import { AuthBasicGuard } from './auth-basic.guard'import { AuthBasicStrategy } from './auth-basic.strategy'diff --git a/backend/src/authentication/guards/auth-basic.strategy.ts b/backend/src/authentication/guards/auth-basic.strategy.tsindex 9d814deb..6d4b9e24 100644--- a/backend/src/authentication/guards/auth-basic.strategy.ts+++ b/backend/src/authentication/guards/auth-basic.strategy.ts@@ -6,7 +6,7 @@ import { PinoLogger } from 'nestjs-pino'import { genHash } from '../../applications/files/utils/files'import { UserModel } from '../../applications/users/models/user.model'import { SERVER_NAME } from '../../common/shared'-import { Cache } from '../../infrastructure/cache/services/cache.service'+import { Cache } from '../../infrastructure/cache/cache.service'import { AUTH_SCOPE } from '../constants/scope'import { AuthProvider } from '../providers/auth-providers.models'import { HttpBasicStrategy } from './implementations/http-basic.strategy'diff --git a/backend/src/authentication/providers/mysql/auth-provider-mysql.service.spec.ts b/backend/src/authentication/providers/mysql/auth-provider-mysql.service.spec.tsindex 61e7b0b6..1eb164e7 100644--- a/backend/src/authentication/providers/mysql/auth-provider-mysql.service.spec.ts+++ b/backend/src/authentication/providers/mysql/auth-provider-mysql.service.spec.ts@@ -8,7 +8,7 @@ import { UsersManager } from '../../../applications/users/services/users-managerimport { UsersQueries } from '../../../applications/users/services/users-queries.service'import { generateUserTest } from '../../../applications/users/utils/test'import { hashPassword } from '../../../common/functions'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants'import { AuthManager } from '../../auth.service'import { AuthProviderMySQL } from './auth-provider-mysql.service'diff --git a/backend/src/authentication/providers/two-fa/auth-provider-two-fa.service.spec.ts b/backend/src/authentication/providers/two-fa/auth-provider-two-fa.service.spec.tsindex c77bee98..427540cf 100644--- a/backend/src/authentication/providers/two-fa/auth-provider-two-fa.service.spec.ts+++ b/backend/src/authentication/providers/two-fa/auth-provider-two-fa.service.spec.ts@@ -4,7 +4,7 @@ import { Totp } from 'time2fa'import { NotificationsManager } from '../../../applications/notifications/services/notifications-manager.service'import { UserModel } from '../../../applications/users/models/user.model'import { UsersManager } from '../../../applications/users/services/users-manager.service'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { FastifyAuthenticatedRequest } from '../../interfaces/auth-request.interface'import { decryptSecret, encryptSecret } from '../../utils/crypt-secret'import { AuthProvider2FA } from './auth-provider-two-fa.service'diff --git a/backend/src/authentication/providers/two-fa/auth-provider-two-fa.service.ts b/backend/src/authentication/providers/two-fa/auth-provider-two-fa.service.tsindex 96771251..17562844 100644--- a/backend/src/authentication/providers/two-fa/auth-provider-two-fa.service.ts+++ b/backend/src/authentication/providers/two-fa/auth-provider-two-fa.service.ts@@ -9,7 +9,7 @@ import { ACTION } from '../../../common/constants'import { generateShortUUID } from '../../../common/functions'import { qrcodeToDataURL } from '../../../common/qrcode'import { configuration } from '../../../configuration/config.environment'-import { Cache } from '../../../infrastructure/cache/services/cache.service'+import { Cache } from '../../../infrastructure/cache/cache.service'import { TWO_FA_CODE_LENGTH } from '../../constants/auth'import { FastifyAuthenticatedRequest } from '../../interfaces/auth-request.interface'import { decryptSecret, encryptSecret } from '../../utils/crypt-secret'diff --git a/backend/src/infrastructure/cache/adapters/mysql-cache.adapter.ts b/backend/src/infrastructure/cache/adapters/mysql-cache.adapter.tsindex 52e48463..9038d681 100644--- a/backend/src/infrastructure/cache/adapters/mysql-cache.adapter.ts+++ b/backend/src/infrastructure/cache/adapters/mysql-cache.adapter.ts@@ -11,7 +11,7 @@ import { dbCheckAffectedRows } from '../../database/utils'import { SCHEDULER_ENV, SCHEDULER_STATE } from '../../scheduler/scheduler.constants'import { MysqlCache } from '../schemas/mysql-cache.interface'import { cache } from '../schemas/mysql-cache.schema'-import { Cache } from '../services/cache.service'+import { Cache } from '../cache.service'@Injectable()export class MysqlCacheAdapter implements Cache {diff --git a/backend/src/infrastructure/cache/adapters/redis-cache.adapter.ts b/backend/src/infrastructure/cache/adapters/redis-cache.adapter.tsindex 8af12d3d..d244f7ea 100644--- a/backend/src/infrastructure/cache/adapters/redis-cache.adapter.ts+++ b/backend/src/infrastructure/cache/adapters/redis-cache.adapter.ts@@ -3,7 +3,7 @@ import { RedisClientOptions } from '@redis/client'import { createClient, RedisClientType } from 'redis'import { createCacheKeySlug } from '../../../common/shared'import { configuration } from '../../../configuration/config.environment'-import { Cache } from '../services/cache.service'+import { Cache } from '../cache.service'@Injectable()export class RedisCacheAdapter implements Cache {diff --git a/backend/src/infrastructure/cache/cache.decorator.ts b/backend/src/infrastructure/cache/cache.decorator.tsindex 29f555d3..c13b8dfa 100644--- a/backend/src/infrastructure/cache/cache.decorator.ts+++ b/backend/src/infrastructure/cache/cache.decorator.ts@@ -1,5 +1,5 @@import { Inject } from '@nestjs/common'-import { Cache } from './services/cache.service'+import { Cache } from './cache.service'export function CacheDecorator(TTL = 120, updateCache: boolean = false) {// if updateCache is true, we update the value in the cache on each calldiff --git a/backend/src/infrastructure/cache/cache.e2e-spec.ts b/backend/src/infrastructure/cache/cache.e2e-spec.tsindex ed97333c..6083b27b 100644--- a/backend/src/infrastructure/cache/cache.e2e-spec.ts+++ b/backend/src/infrastructure/cache/cache.e2e-spec.ts@@ -3,7 +3,7 @@ import { LoggerModule } from 'nestjs-pino'import { setTimeout } from 'node:timers/promises'import { DatabaseModule } from '../database/database.module'import { CacheModule } from './cache.module'-import { Cache } from './services/cache.service'+import { Cache } from './cache.service'describe(Cache.name, () => {let module: TestingModulediff --git a/backend/src/infrastructure/cache/cache.module.ts b/backend/src/infrastructure/cache/cache.module.tsindex 293a2067..d82f5677 100644--- a/backend/src/infrastructure/cache/cache.module.ts+++ b/backend/src/infrastructure/cache/cache.module.ts@@ -3,7 +3,7 @@ import { SchedulerRegistry } from '@nestjs/schedule'import { configuration } from '../../configuration/config.environment'import { MysqlCacheAdapter } from './adapters/mysql-cache.adapter'import { RedisCacheAdapter } from './adapters/redis-cache.adapter'-import { Cache } from './services/cache.service'+import { Cache } from './cache.service'@Global()@Module({diff --git a/backend/src/infrastructure/cache/services/cache.service.ts b/backend/src/infrastructure/cache/cache.service.tssimilarity index 100%rename from backend/src/infrastructure/cache/services/cache.service.tsrename to backend/src/infrastructure/cache/cache.service.ts