Skip to content

Commit 6949d44

Browse files
feat(server): custom routes with query builder for mvc architecture
affects: @nodejs-code-generator/server
1 parent 61dd168 commit 6949d44

6 files changed

Lines changed: 66 additions & 2152 deletions

File tree

packages/server/usecase/application/node-generator/createApplication/createController/index.js

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -197,25 +197,12 @@ async function generateController (apis, platformName, controllers, ormProvider,
197197
[uniqueTaskModels, uniqueRequireValidationModels] = commonService.getUniqModelsFromTasks(transformedControllerDetail.routes, 'queryBuilder');
198198
[api.locals.UNIQ_TASK_MODELS, api.locals.UNIQ_REQUIRE_VALIDATION_MODELS] = [uniqueTaskModels, uniqueRequireValidationModels];
199199
api.locals.IS_CQ = transformedControllerDetail.isQueryBuilderAvailable;
200-
[api.locals.S3_UPLOAD, api.locals.FILE_UPLOAD, api.locals.S3_UPLOAD_PRIVATE] = commonService.checkFileUploadInCR(routesWithQueryMode);
201-
if (api.locals.FILE_UPLOAD) {
202-
packageDependencies.dependencies['valid-url'] = '~1.0.9';
203-
packageDependencies.dependencies.formidable = '~1.2.2';
204-
}
205-
if (api.locals.S3_UPLOAD) {
206-
packageDependencies.dependencies['aws-sdk'] = '~2.901.0';
207-
}
208-
if (api.locals.S3_UPLOAD_PRIVATE) {
209-
packageDependencies.dependencies['amazon-s3-uri'] = '~0.1.1';
210-
}
211200
} else {
212201
api.locals.CUSTOM_ROUTES = null;
213202
api.locals.IS_CQ = false;
214203
api.locals.UNIQ_TASK_MODELS = undefined;
215204
api.locals.UNIQ_REQUIRE_VALIDATION_MODELS = undefined;
216205
api.locals.SERVICES_TO_IMPORT = undefined;
217-
api.locals.S3_UPLOAD = false;
218-
api.locals.FILE_UPLOAD = false;
219206
}
220207
let modelsToImport = [];
221208
// ? for finding models which need to be imported in controller
@@ -253,18 +240,6 @@ async function generateController (apis, platformName, controllers, ormProvider,
253240
const [UNIQ_TASK_MODELS, UNIQ_REQUIRE_VALIDATION_MODELS] = commonService.getUniqModelsFromTasks(transformedControllerDetail.routes, 'queryBuilder');
254241
[api.locals.UNIQ_TASK_MODELS, api.locals.UNIQ_REQUIRE_VALIDATION_MODELS] = [UNIQ_TASK_MODELS, UNIQ_REQUIRE_VALIDATION_MODELS];
255242
api.locals.IS_CQ = transformedControllerDetail.isQueryBuilderAvailable;
256-
api.locals.IS_CQ = transformedControllerDetail.isQueryBuilderAvailable;
257-
[api.locals.S3_UPLOAD, api.locals.FILE_UPLOAD, api.locals.S3_UPLOAD_PRIVATE] = commonService.checkFileUploadInCR(routesWithQueryMode);
258-
if (api.locals.FILE_UPLOAD) {
259-
packageDependencies.dependencies['valid-url'] = '~1.0.9';
260-
packageDependencies.dependencies.formidable = '~1.2.2';
261-
}
262-
if (api.locals.S3_UPLOAD) {
263-
packageDependencies.dependencies['aws-sdk'] = '~2.901.0';
264-
}
265-
if (api.locals.S3_UPLOAD_PRIVATE) {
266-
packageDependencies.dependencies['amazon-s3-uri'] = '~0.1.1';
267-
}
268243
returnController[model] = api;
269244
}
270245
}

packages/server/usecase/application/node-generator/createApplication/utils/common.js

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -338,31 +338,6 @@ const getRouteRoleArray = (rolePermission) => {
338338
});
339339
return routeRoleArray;
340340
};
341-
const checkFileUploadInCR = (customRoutes) => {
342-
let isS3Available = false;
343-
let isPrivateS3Available = false;
344-
let isFileUploadAvailable = false;
345-
// eslint-disable-next-line no-restricted-syntax
346-
for (const route of customRoutes) {
347-
if (Object.prototype.hasOwnProperty.call(route, 'queryBuilder')) {
348-
if (route.queryBuilder.length) {
349-
const fileUploadS3Routes = (route.queryBuilder).find((r) => (r.queryMode).toLowerCase() === 'fileupload' && ((r.storage).toLowerCase() === 's3' || (r.storage).toLowerCase() === 's3_private'));
350-
if (!isEmpty(fileUploadS3Routes) && !isS3Available) {
351-
isS3Available = true;
352-
}
353-
const s3PrivateCheck = (route.queryBuilder).find((r) => (r.queryMode).toLowerCase() === 'fileupload' && ((r.storage).toLowerCase() === 's3_private'));
354-
if (!isEmpty(s3PrivateCheck) && !isPrivateS3Available) {
355-
isPrivateS3Available = true;
356-
}
357-
const fileUploadRoutes = (route.queryBuilder).find((r) => (r.queryMode).toLowerCase() === 'fileupload');
358-
if (!isEmpty(fileUploadRoutes) && !isFileUploadAvailable) {
359-
isFileUploadAvailable = true;
360-
}
361-
}
362-
}
363-
}
364-
return [isS3Available, isFileUploadAvailable, isPrivateS3Available];
365-
};
366341

367342
const removeGivenKeyFromObject = (obj, keysToRemove) => {
368343
forEach(keysToRemove, (key) => {
@@ -476,7 +451,6 @@ module.exports = {
476451
shouldCopyQueryService,
477452
uniqRolesFromRolePermissions,
478453
getRouteRoleArray,
479-
checkFileUploadInCR,
480454
removeGivenKeyFromObject,
481455
createReadMeFile,
482456
createRelativePathFromAbsolutePath,

0 commit comments

Comments
 (0)