refactor : dirs

packages/nocodb/src/lib/Noco.ts

@@ -45,7 +45,7 @@ import User from './models/User';
 import * as http from 'http';
 import weAreHiring from './utils/weAreHiring';
 import getInstance from './utils/getInstance';
-import initAdminFromEnv from './services/userService/initAdminFromEnv';
+import initAdminFromEnv from './services/user/initAdminFromEnv';
 
 const log = debug('nc:app');
 require('dotenv').config();

packages/nocodb/src/lib/controllers/dbData/dataAliasExportController.ts

@@ -6,7 +6,7 @@ import { View } from '../../models';
 import {
   extractCsvData,
   extractXlsxData,
-} from '../../services/dataService/helpers';
+} from '../../services/dbData/helpers';
 import { getViewAndModelFromRequestByAliasOrId } from './helpers';
 
 async function excelDataExport(req: Request, res: Response) {

packages/nocodb/src/lib/controllers/exportController.ts

@@ -1,7 +1,7 @@
 import { Request, Response, Router } from 'express';
 import View from '../models/View';
 import ncMetaAclMw from '../meta/helpers/ncMetaAclMw';
-import { extractCsvData } from './dataControllers/helpers';
+import { extractCsvData } from './dbData/helpers';
 
 async function exportCsv(req: Request, res: Response) {
   const view = await View.get(req.params.viewId);

packages/nocodb/src/lib/controllers/sync/importApis.ts

@@ -7,7 +7,7 @@ import NocoJobs from '../../jobs/NocoJobs';
 import { SyncSource } from '../../models';
 import Noco from '../../Noco';
 import { syncService, userService } from '../../services';
-import { AirtableSyncConfig } from '../../services/syncService/helpers/job';
+import { AirtableSyncConfig } from '../../services/sync/helpers/job';
 
 const AIRTABLE_IMPORT_JOB = 'AIRTABLE_IMPORT_JOB';
 const AIRTABLE_PROGRESS_JOB = 'AIRTABLE_PROGRESS_JOB';

packages/nocodb/src/lib/meta/api/index.ts

@@ -22,12 +22,12 @@ import hookController from '../../controllers/hookController';
 import pluginController from '../../controllers/pluginController';
 import gridViewColumnController from '../../controllers/gridViewColumnController';
 import kanbanViewController from '../../controllers/kanbanViewController';
-import { userController } from '../../controllers/userController';
+import { userController } from '../../controllers/user';
 // import extractProjectIdAndAuthenticate from './helpers/extractProjectIdAndAuthenticate';
 import utilController from '../../controllers/utilController';
 import projectUserController from '../../controllers/projectUserController';
 import sharedBaseController from '../../controllers/sharedBaseController';
-import { initStrategies } from '../../controllers/userController/initStrategies';
+import { initStrategies } from '../../controllers/user/initStrategies';
 import modelVisibilityController from '../../controllers/modelVisibilityController';
 import metaDiffController from '../../controllers/metaDiffController';
 import cacheController from '../../controllers/cacheController';
@@ -41,7 +41,7 @@ import {
   dataAliasNestedController,
   dataController,
   oldDataController,
-} from '../../controllers/dataControllers';
+} from '../../controllers/dbData';
 import {
   publicDataController,
   publicDataExportController,
@@ -51,9 +51,9 @@ import { Server, Socket } from 'socket.io';
 import passport from 'passport';
 
 import crypto from 'crypto';
-import swaggerController from '../../controllers/swaggerController';
-import importController from '../../controllers/syncController/importApis';
-import syncSourceController from '../../controllers/syncController';
+import swaggerController from '../../controllers/apiDocs';
+import importController from '../../controllers/sync/importApis';
+import syncSourceController from '../../controllers/sync';
 import mapViewController from '../../controllers/mapViewController';
 
 const clients: { [id: string]: Socket } = {};

packages/nocodb/src/lib/services/index.ts

@@ -25,14 +25,14 @@ export * as orgLicenseService from './orgLicenseService';
 export * as projectUserService from './projectUserService';
 export * as attachmentService from './attachmentService';
 export * as hookFilterService from './hookFilterService';
-export * as dataService from './dataService';
-export * as bulkDataService from './dataService/bulkData';
-export * as dataAliasNestedService from './dataService/dataAliasNestedService';
+export * as dataService from './dbData';
+export * as bulkDataService from './dbData/bulkData';
+export * as dataAliasNestedService from './dbData/dataAliasNestedService';
 export * as cacheService from './cacheService';
 export * as auditService from './auditService';
-export * as swaggerService from './swaggerService';
-export * as userService from './userService';
-export * as syncService from './syncService';
+export * as swaggerService from './apiDocs';
+export * as userService from './user';
+export * as syncService from './sync';
 export * from './public';
 export * as orgTokenService from './orgTokenService';
 export * as orgTokenServiceEE from './ee/orgTokenService';

packages/nocodb/src/lib/services/projectUserService.ts

@@ -291,7 +291,7 @@ export async function sendInviteEmail(
   req: any
 ): Promise<any> {
   try {
-    const template = (await import('./userService/ui/emailTemplates/invite'))
+    const template = (await import('./user/ui/emailTemplates/invite'))
       .default;
 
     const emailAdapter = await NcPluginMgrv2.emailAdapter();

packages/nocodb/src/lib/services/public/publicDataService.ts

@@ -17,7 +17,7 @@ import {
 import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2';
 import { mimeIcons } from '../../utils/mimeTypes';
 import { sanitizeUrlPath } from '../attachmentService';
-import { getColumnByIdOrName } from '../dataService/helpers';
+import { getColumnByIdOrName } from '../dbData/helpers';
 
 export async function dataList(param: {
   sharedViewUuid: string;