From 09fe2c8700ecc02524fe9740145dd2fbe2e383b5 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 17 Apr 2023 01:24:42 +0530 Subject: [PATCH] refactor: group all service and controller Signed-off-by: Pranav C --- .../attachments.controller.spec.ts | 2 +- .../attachments.controller.ts | 6 ++-- .../filters.controller.spec.ts | 2 +- .../filters.controller.ts | 8 ++--- .../modules/attachments/attachments.module.ts | 4 +-- .../src/modules/filters/filters.module.ts | 4 +-- .../src/modules/global/global.module.ts | 2 +- .../src/modules/import/import.module.ts | 30 +++++++++---------- .../src/modules/sync/helpers/job.ts | 26 ++++++++-------- .../attachments.service.spec.ts | 0 .../attachments.service.ts | 6 ++-- .../filters.service.spec.ts | 0 .../filters => services}/filters.service.ts | 4 +-- .../{client => }/socket.service.spec.ts | 0 .../services/{client => }/socket.service.ts | 4 +-- 15 files changed, 49 insertions(+), 49 deletions(-) rename packages/nocodb-nest/src/{modules/attachments => controllers}/attachments.controller.spec.ts (89%) rename packages/nocodb-nest/src/{modules/attachments => controllers}/attachments.controller.ts (91%) rename packages/nocodb-nest/src/{modules/filters => controllers}/filters.controller.spec.ts (90%) rename packages/nocodb-nest/src/{modules/filters => controllers}/filters.controller.ts (90%) rename packages/nocodb-nest/src/{modules/attachments => services}/attachments.service.spec.ts (100%) rename packages/nocodb-nest/src/{modules/attachments => services}/attachments.service.ts (95%) rename packages/nocodb-nest/src/{modules/filters => services}/filters.service.spec.ts (100%) rename packages/nocodb-nest/src/{modules/filters => services}/filters.service.ts (95%) rename packages/nocodb-nest/src/services/{client => }/socket.service.spec.ts (100%) rename packages/nocodb-nest/src/services/{client => }/socket.service.ts (96%) diff --git a/packages/nocodb-nest/src/modules/attachments/attachments.controller.spec.ts b/packages/nocodb-nest/src/controllers/attachments.controller.spec.ts similarity index 89% rename from packages/nocodb-nest/src/modules/attachments/attachments.controller.spec.ts rename to packages/nocodb-nest/src/controllers/attachments.controller.spec.ts index 5ca0fd5210..038c59aded 100644 --- a/packages/nocodb-nest/src/modules/attachments/attachments.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/attachments.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { AttachmentsController } from './attachments.controller'; -import { AttachmentsService } from './attachments.service'; +import { AttachmentsService } from '../services/attachments.service'; import type { TestingModule } from '@nestjs/testing'; describe('AttachmentsController', () => { diff --git a/packages/nocodb-nest/src/modules/attachments/attachments.controller.ts b/packages/nocodb-nest/src/controllers/attachments.controller.ts similarity index 91% rename from packages/nocodb-nest/src/modules/attachments/attachments.controller.ts rename to packages/nocodb-nest/src/controllers/attachments.controller.ts index 6c6c6f2fc6..69885be5be 100644 --- a/packages/nocodb-nest/src/modules/attachments/attachments.controller.ts +++ b/packages/nocodb-nest/src/controllers/attachments.controller.ts @@ -14,9 +14,9 @@ import { UseInterceptors, } from '@nestjs/common'; import { AnyFilesInterceptor } from '@nestjs/platform-express'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { UploadAllowedInterceptor } from '../../interceptors/is-upload-allowed/is-upload-allowed.interceptor'; -import { AttachmentsService } from './attachments.service'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { UploadAllowedInterceptor } from '../interceptors/is-upload-allowed/is-upload-allowed.interceptor'; +import { AttachmentsService } from '../services/attachments.service'; @Controller() export class AttachmentsController { diff --git a/packages/nocodb-nest/src/modules/filters/filters.controller.spec.ts b/packages/nocodb-nest/src/controllers/filters.controller.spec.ts similarity index 90% rename from packages/nocodb-nest/src/modules/filters/filters.controller.spec.ts rename to packages/nocodb-nest/src/controllers/filters.controller.spec.ts index ef4e8212d9..f26a873f51 100644 --- a/packages/nocodb-nest/src/modules/filters/filters.controller.spec.ts +++ b/packages/nocodb-nest/src/controllers/filters.controller.spec.ts @@ -1,6 +1,6 @@ import { Test } from '@nestjs/testing'; import { FiltersController } from './filters.controller'; -import { FiltersService } from './filters.service'; +import { FiltersService } from '../services/filters.service'; import type { TestingModule } from '@nestjs/testing'; describe('FiltersController', () => { diff --git a/packages/nocodb-nest/src/modules/filters/filters.controller.ts b/packages/nocodb-nest/src/controllers/filters.controller.ts similarity index 90% rename from packages/nocodb-nest/src/modules/filters/filters.controller.ts rename to packages/nocodb-nest/src/controllers/filters.controller.ts index 47f7501040..765d4d68bf 100644 --- a/packages/nocodb-nest/src/modules/filters/filters.controller.ts +++ b/packages/nocodb-nest/src/controllers/filters.controller.ts @@ -11,14 +11,14 @@ import { } from '@nestjs/common'; import { AuthGuard } from '@nestjs/passport'; import { FilterReqType } from 'nocodb-sdk'; -import { GlobalGuard } from '../../guards/global/global.guard'; -import { PagedResponseImpl } from '../../helpers/PagedResponse'; +import { GlobalGuard } from '../guards/global/global.guard'; +import { PagedResponseImpl } from '../helpers/PagedResponse'; import { Acl, ExtractProjectIdMiddleware, UseAclMiddleware, -} from '../../middlewares/extract-project-id/extract-project-id.middleware'; -import { FiltersService } from './filters.service'; +} from '../middlewares/extract-project-id/extract-project-id.middleware'; +import { FiltersService } from '../services/filters.service'; @Controller() @UseGuards(ExtractProjectIdMiddleware, GlobalGuard) diff --git a/packages/nocodb-nest/src/modules/attachments/attachments.module.ts b/packages/nocodb-nest/src/modules/attachments/attachments.module.ts index e20196b664..799e843457 100644 --- a/packages/nocodb-nest/src/modules/attachments/attachments.module.ts +++ b/packages/nocodb-nest/src/modules/attachments/attachments.module.ts @@ -2,8 +2,8 @@ import { Module } from '@nestjs/common'; import { MulterModule } from '@nestjs/platform-express'; import multer from 'multer'; import { NC_ATTACHMENT_FIELD_SIZE } from '../../constants'; -import { AttachmentsService } from './attachments.service'; -import { AttachmentsController } from './attachments.controller'; +import { AttachmentsService } from '../../services/attachments.service'; +import { AttachmentsController } from '../../controllers/attachments.controller'; @Module({ imports: [ diff --git a/packages/nocodb-nest/src/modules/filters/filters.module.ts b/packages/nocodb-nest/src/modules/filters/filters.module.ts index 5a1d9ebe71..c0dffa46b7 100644 --- a/packages/nocodb-nest/src/modules/filters/filters.module.ts +++ b/packages/nocodb-nest/src/modules/filters/filters.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; -import { FiltersService } from './filters.service'; -import { FiltersController } from './filters.controller'; +import { FiltersService } from '../../services/filters.service'; +import { FiltersController } from '../../controllers/filters.controller'; @Module({ controllers: [FiltersController], diff --git a/packages/nocodb-nest/src/modules/global/global.module.ts b/packages/nocodb-nest/src/modules/global/global.module.ts index 29690b935d..10e2f65460 100644 --- a/packages/nocodb-nest/src/modules/global/global.module.ts +++ b/packages/nocodb-nest/src/modules/global/global.module.ts @@ -4,7 +4,7 @@ import { ExtractJwt } from 'passport-jwt'; import { Connection } from '../../connection/connection'; import { GlobalGuard } from '../../guards/global/global.guard'; import { MetaService } from '../../meta/meta.service'; -import { SocketService } from '../../services/client/socket.service'; +import { SocketService } from '../../services/socket.service'; import { JwtStrategy } from '../../strategies/jwt.strategy'; import NcConfigFactory from '../../utils/NcConfigFactory'; import { jwtConstants } from '../auth/constants'; diff --git a/packages/nocodb-nest/src/modules/import/import.module.ts b/packages/nocodb-nest/src/modules/import/import.module.ts index 72a2de7100..9c4d500476 100644 --- a/packages/nocodb-nest/src/modules/import/import.module.ts +++ b/packages/nocodb-nest/src/modules/import/import.module.ts @@ -1,21 +1,21 @@ import { Module } from '@nestjs/common'; -import { AttachmentsService } from '../attachments/attachments.service'; -import { ColumnsService } from '../columns/columns.service'; -import { BulkDataAliasService } from '../datas/bulk-data-alias/bulk-data-alias.service'; -import { FiltersService } from '../filters/filters.service'; -import { FormColumnsService } from '../form-columns/form-columns.service'; -import { FormsService } from '../forms/forms.service'; -import { GalleriesService } from '../galleries/galleries.service'; +import { AttachmentsService } from '../../services/attachments.service'; +import { ColumnsService } from '../../services/columns.service'; +import { BulkDataAliasService } from '../../services/bulk-data-alias.service'; +import { FiltersService } from '../../services/filters.service'; +import { FormColumnsService } from '../../services/form-columns.service'; +import { FormsService } from '../../services/forms.service'; +import { GalleriesService } from '../../services/galleries.service'; import { GlobalModule } from '../global/global.module'; -import { GridsService } from '../grids/grids.service'; +import { GridsService } from '../../services/grids.service'; import { ProjectUsersService } from '../project-users/project-users.service'; -import { ProjectsService } from '../projects/projects.service'; -import { SortsService } from '../sorts/sorts.service'; -import { TablesService } from '../tables/tables.service'; -import { ViewColumnsService } from '../view-columns/view-columns.service'; -import { ViewsService } from '../views/views.service'; -import { ImportService } from './import.service'; -import { ImportController } from './import.controller'; +import { ProjectsService } from '../../services/projects.service'; +import { SortsService } from '../../services/sorts.service'; +import { TablesService } from '../../services/tables.service'; +import { ViewColumnsService } from '../../services/view-columns.service'; +import { ViewsService } from '../../services/views.service'; +import { ImportService } from '../../services/import.service'; +import { ImportController } from '../../controllers/import.controller'; @Module({ imports: [GlobalModule], diff --git a/packages/nocodb-nest/src/modules/sync/helpers/job.ts b/packages/nocodb-nest/src/modules/sync/helpers/job.ts index be914ef4ba..ffda0a45bb 100644 --- a/packages/nocodb-nest/src/modules/sync/helpers/job.ts +++ b/packages/nocodb-nest/src/modules/sync/helpers/job.ts @@ -8,19 +8,19 @@ import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; import tinycolor from 'tinycolor2'; import extractRolesObj from '../../../utils/extractRolesObj'; -import { AttachmentsService } from '../../attachments/attachments.service'; -import { ColumnsService } from '../../columns/columns.service'; -import { BulkDataAliasService } from '../../datas/bulk-data-alias/bulk-data-alias.service'; -import { FiltersService } from '../../filters/filters.service'; -import { FormColumnsService } from '../../form-columns/form-columns.service'; -import { GalleriesService } from '../../galleries/galleries.service'; -import { GridsService } from '../../grids/grids.service'; +import { AttachmentsService } from '../../../services/attachments.service'; +import { ColumnsService } from '../../../services/columns.service'; +import { BulkDataAliasService } from '../../../services/bulk-data-alias.service'; +import { FiltersService } from '../../../services/filters.service'; +import { FormColumnsService } from '../../../services/form-columns.service'; +import { GalleriesService } from '../../../services/galleries.service'; +import { GridsService } from '../../../services/grids.service'; import { ProjectUsersService } from '../../project-users/project-users.service'; -import { ProjectsService } from '../../projects/projects.service'; -import { SortsService } from '../../sorts/sorts.service'; -import { TablesService } from '../../tables/tables.service'; -import { ViewColumnsService } from '../../view-columns/view-columns.service'; -import { ViewsService } from '../../views/views.service'; +import { ProjectsService } from '../../../services/projects.service'; +import { SortsService } from '../../../services/sorts.service'; +import { TablesService } from '../../../services/tables.service'; +import { ViewColumnsService } from '../../../services/view-columns.service'; +import { ViewsService } from '../../../services/views.service'; // import { // attachmentService, // columnService, @@ -38,7 +38,7 @@ import { ViewsService } from '../../views/views.service'; // // eslint-disable-next-line @typescript-eslint/ban-ts-comment // // @ts-ignore // } from '../..'; -import { FormsService } from '../../../modules/forms/forms.service'; +import { FormsService } from '../../../services/forms.service'; import FetchAT from './fetchAT'; import { importData, importLTARData } from './readAndProcessData'; import EntityMap from './EntityMap'; diff --git a/packages/nocodb-nest/src/modules/attachments/attachments.service.spec.ts b/packages/nocodb-nest/src/services/attachments.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/attachments/attachments.service.spec.ts rename to packages/nocodb-nest/src/services/attachments.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/attachments/attachments.service.ts b/packages/nocodb-nest/src/services/attachments.service.ts similarity index 95% rename from packages/nocodb-nest/src/modules/attachments/attachments.service.ts rename to packages/nocodb-nest/src/services/attachments.service.ts index 6277b10309..94f2714a0a 100644 --- a/packages/nocodb-nest/src/modules/attachments/attachments.service.ts +++ b/packages/nocodb-nest/src/services/attachments.service.ts @@ -3,9 +3,9 @@ import { Injectable } from '@nestjs/common'; import { nanoid } from 'nanoid'; import slash from 'slash'; import { T } from 'nc-help'; -import NcPluginMgrv2 from '../../helpers/NcPluginMgrv2'; -import Local from '../../plugins/storage/Local'; -import mimetypes, { mimeIcons } from '../../utils/mimeTypes'; +import NcPluginMgrv2 from '../helpers/NcPluginMgrv2'; +import Local from '../plugins/storage/Local'; +import mimetypes, { mimeIcons } from '../utils/mimeTypes'; @Injectable() export class AttachmentsService { diff --git a/packages/nocodb-nest/src/modules/filters/filters.service.spec.ts b/packages/nocodb-nest/src/services/filters.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/modules/filters/filters.service.spec.ts rename to packages/nocodb-nest/src/services/filters.service.spec.ts diff --git a/packages/nocodb-nest/src/modules/filters/filters.service.ts b/packages/nocodb-nest/src/services/filters.service.ts similarity index 95% rename from packages/nocodb-nest/src/modules/filters/filters.service.ts rename to packages/nocodb-nest/src/services/filters.service.ts index 6369e4f8e3..62a08f2294 100644 --- a/packages/nocodb-nest/src/modules/filters/filters.service.ts +++ b/packages/nocodb-nest/src/services/filters.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { T } from 'nc-help'; -import { validatePayload } from '../../helpers'; -import { Filter } from '../../models'; +import { validatePayload } from '../helpers'; +import { Filter } from '../models'; import type { FilterReqType } from 'nocodb-sdk'; @Injectable() diff --git a/packages/nocodb-nest/src/services/client/socket.service.spec.ts b/packages/nocodb-nest/src/services/socket.service.spec.ts similarity index 100% rename from packages/nocodb-nest/src/services/client/socket.service.spec.ts rename to packages/nocodb-nest/src/services/socket.service.spec.ts diff --git a/packages/nocodb-nest/src/services/client/socket.service.ts b/packages/nocodb-nest/src/services/socket.service.ts similarity index 96% rename from packages/nocodb-nest/src/services/client/socket.service.ts rename to packages/nocodb-nest/src/services/socket.service.ts index 8a24d43335..bdfc004b6c 100644 --- a/packages/nocodb-nest/src/services/client/socket.service.ts +++ b/packages/nocodb-nest/src/services/socket.service.ts @@ -5,8 +5,8 @@ import { T } from 'nc-help'; import { Server } from 'socket.io'; import { AuthGuard } from '@nestjs/passport'; import { ExecutionContextHost } from '@nestjs/core/helpers/execution-context-host'; -import Noco from '../../Noco'; -import { JwtStrategy } from '../../strategies/jwt.strategy'; +import Noco from '../Noco'; +import { JwtStrategy } from '../strategies/jwt.strategy'; import type { OnModuleInit } from '@nestjs/common'; import type { Socket } from 'socket.io';