diff --git a/Config/aws.js b/Config/aws.js index 99dfb2f..350d184 100644 --- a/Config/aws.js +++ b/Config/aws.js @@ -15,7 +15,6 @@ const sesWithAttachment = new SES(); const sesv2 = new AWS.SESV2({apiVersion: '2019-09-27'}); const ssmClient = new AWS.SSM({apiVersion: '2014-11-06', region: process.env.AWS_SES_REGION}); const s3 = new AWS.S3({ apiVersion: '2006-03-01' }); - const wasabiAccessKey = process.env.WASABI_ACCESS_KEY const wasabiSecretAccessKey = process.env.WASABI_SECRET_ACCESS_KEY const wasabiEndPoint = process.env.WASABIENDPOINT @@ -23,42 +22,6 @@ const region = process.env.WASABI_REGION const iamEndPoint = process.env.IAM_ENDPOINT const userProfileBucket = process.env.USERPROFILEBUCKET const wasabiUserId = process.env.WASABI_USERID -/** - * AWS SSM parameters - */ -// let ssm; -// const getParameters = async (parameterNames, region, apiVersion='2014-11-06') => { -// if (!ssm) { -// ssm = new AWS.SSM({apiVersion: apiVersion, region: region}); -// } -// const params = { -// Names: parameterNames, -// WithDecryption: true -// }; -// try { -// const parameters = await ssm.getParameters(params).promise(); -// return formatParameters(parameters); -// } catch (e) { -// return e; -// } -// }; -// const formatParameters = (parameters) => { -// return parameters.Parameters.reduce((object, param) => { -// return { ...object, [param.Name]: param.Value }; -// }, {}); -// }; - -/** - * Add the AWS SSM parameter list which we want - */ -// const parameterNames = [ -// '/dev/app/Firebase', -// '/prod/app/Firebase', -// '/dev/app/JWT', -// '/dev/app/WPSLogin', -// ]; -// getParameters(parameterNames, process.env.AWS_SES_REGION); - module.exports = { ses, diff --git a/Config/config.js b/Config/config.js index 7c8c9d1..be7e0a2 100644 --- a/Config/config.js +++ b/Config/config.js @@ -48,8 +48,6 @@ module.exports = { AI_MODEL:process.env.AI_MODEL, STORAGE_TYPE:process.env.STORAGE_TYPE, - - UNDER_MAINTENANCE: process.env.UNDER_MAINTENANCE, myCache: myCache, USERPROFILEBUCKET: process.env.USERPROFILEBUCKET, requestHandler: new NodeHttpHandler({ diff --git a/Config/setMiddleware.js b/Config/setMiddleware.js index 4f17eec..4d900a2 100644 --- a/Config/setMiddleware.js +++ b/Config/setMiddleware.js @@ -3,11 +3,6 @@ const verifyJWTTokenWithCRoute = [ "/api/v1/verifyToken", "/api/v1/createproject", "/api/v1/importSettings", - // "/api/v1/manualLogtime", - // "/api/v1/deleteManualLogtime", - // "/api/v1/timetracker/end", - // "/api/v1/timetracker/capture", - // "/api/v1/timeTracker/start", "/api/v2/manualLogtime", "/api/v2/deleteManualLogtime", "/api/v2/timeTracker/start", @@ -30,7 +25,6 @@ const verifyJWTTokenWithCRoute = [ "/api/v1/get-tasks", "/api/v1/projectSetting/taskType", "/api/v1/projectSetting/taskStatus", - // "/api/v1/removeSprintOperations", "/api/v1/sprint", "/api/v1/sprint/:id", "/api/v1/folder", diff --git a/Modules/notification/routes.js b/Modules/notification/routes.js deleted file mode 100644 index 56405eb..0000000 --- a/Modules/notification/routes.js +++ /dev/null @@ -1,44 +0,0 @@ -const ctrl = require('./controller'); - -exports.init = (app) => { - /** - * @swagger - * components: - * schemas: - * insertnotification: - * type: object - * required: - * - uid - * - email - * properties: - * uid: - * type: string - * required: true - * description: The uid of user. - * email: - * type: string - * required: true - * description: The email of user. - */ - /** - * @swagger - * /api/v1/insertnotification: - * post: - * description: This API is used for send email verication link. - * tags: [Auth APIs] - * requestBody: - * required: true - * content: - * application/json: - * schema: - * $ref: '#/components/schemas/insertnotification' - * responses: - * "200": - * description: status:true/false,statusText:message - */ - - /** - * Send Verification Mail API - */ - app.post('/api/v1/insertnotification', ctrl.insertnotification); -}; \ No newline at end of file diff --git a/Modules/swaggerAPI/init.js b/Modules/swaggerAPI/init.js deleted file mode 100644 index 13446e7..0000000 --- a/Modules/swaggerAPI/init.js +++ /dev/null @@ -1,51 +0,0 @@ -let swaggerJsdoc = require("swagger-jsdoc"); -let swaggerUi = require("swagger-ui-express"); - - -/** - * Swagger API document configuration - * @param {*} app - */ -exports.init = (app, apiUrl) => { - const swaggerOptions = { - definition: { - openapi: "3.0.0", - info: { - title: "AlianHub APIs", - version: "v1" - }, - servers: [ - { - url: apiUrl, - }, - ], - }, - apis: [ - "./Modules/auth/routes.js", - "./Modules/auth/routes2.js", - "./Modules/notification1/routes.js", - "./Modules/import_settings1/routes.js", - "./Modules/remove-sprint-operations/routes.js", - "./Modules/logTime/routes.js", - "./Modules/milestone/routes.js", - "./Modules/wasabi/routes.js", - "./Modules/Company/routes.js", - './Modules/notification/prepare-notification-data/routes.js', - "./Modules/notification/notification-middleware/routes.js", - "./Modules/projectSetting/routes.js", - "./Modules/trackerDownload/routes.js", - "./Modules/taskIndex/routes.js", - "./Modules/createProject/routes.js", - "./Modules/notification-count/routes.js", - "./Modules/trackerUserPermission/routes.js", - "./Modules/SaasAdmin/routes.js", - ] - }; - - const specs = swaggerJsdoc(swaggerOptions); - app.use( - "/apidocs", - swaggerUi.serve, - swaggerUi.setup(specs) - ); -}; diff --git a/common-storage/common-server.js b/common-storage/common-server.js index 364c14c..b6187f3 100644 --- a/common-storage/common-server.js +++ b/common-storage/common-server.js @@ -1,5 +1,5 @@ const loggerConfig = require("../Config/loggerConfig"); -const { createCompanyDataStorageFun, getBucketSizeStorage, uploadStorageThumbnailFile, storageRef, generateSignedUrl,cleanUpTrackshotStorage } = require("../Modules/storage/server/helpers/bucket.helper"); +const { createCompanyDataStorageFun, getBucketSizeStorage, uploadStorageThumbnailFile, storageRef, generateSignedUrl,cleanUpTrackshotStorage } = require("../modules/storage/server/helpers/bucket.helper"); const fs = require('fs'); const newPath = require("path") const thumbnailArray = require('../thumbnail.json'); @@ -50,32 +50,6 @@ exports.handleCreateCompanyDataStorageFunForUpload = async(bodyData,companyId) = }) } -/** - * - * @param {object} companyId - * @param {object} _ - * @param {string} fileData - * @returns - */ -exports.handleChargeebeCreditNotUpload = (companyId,_,fileData,id) => { - return new Promise((resolve, reject) => { - try { - let filePath = `USER_PROFILES/InvoiceAndCreditNotes/CreditNotes/${companyId}/${id}.pdf`; - let fullPath = newPath.join(__dirname, '../storage', filePath); - fs.writeFile(fullPath, Buffer.from(fileData,'binary'), (error) => { - if (error) { - loggerConfig.error(`Credit Note Download Error ${error.message ? error.message : error}`); - return; - } - resolve() - }); - } catch (error) { - loggerConfig.error(`Erro While Uploading Credit Note In STorage: ${error.message ? error.message : error}`); - reject(error); - } - }) -} - exports.handleBucketSizeUpdateCron = () => { getBucketSizeStorage(); } diff --git a/common-storage/common-wasabi.js b/common-storage/common-wasabi.js index 48fd544..853135d 100644 --- a/common-storage/common-wasabi.js +++ b/common-storage/common-wasabi.js @@ -1,7 +1,7 @@ const loggerConfig = require("../Config/loggerConfig"); const { SCHEMA_TYPE } = require("../Config/schemaType"); -const { updateCompanyFun } = require("../Modules/Company/controller/updateCompany"); -const { uploadMainFileForbase64Thumbnail, uploadFileWasabiPromise, getBucketSize,cleanUpTrackshotStorage, createCompanyDataWasabi, getUserProfilePresignedUrl, getPresignedUrl, copyWasabiImage } = require("../Modules/storage/wasabi/controller"); +const { updateCompanyFun } = require("../modules/company/controller/update-company"); +const { uploadMainFileForbase64Thumbnail, uploadFileWasabiPromise, getBucketSize,cleanUpTrackshotStorage, createCompanyDataWasabi, getUserProfilePresignedUrl, getPresignedUrl, copyWasabiImage } = require("../modules/storage/wasabi/controller"); const fs = require("fs"); exports.currentDirectory = 'wasabi'; @@ -118,36 +118,6 @@ exports.handleCreateCompanyDataStorageFunForUpload = async(bodyData,companyId) = }) } -/** - * - * @param {object} companyId - * @param {string} localFilePath - * @param {object} filedata - * @returns - */ -exports.handleChargeebeCreditNotUpload = (companyId,localFilePath,filedata,id) => { - return new Promise((resolve, reject) => { - try { - fs.writeFile(localFilePath, Buffer.from(filedata,'binary'), (error) => { - if (error) { - loggerConfig.error(`Credit Note Download Error ${error.message ? error.message : error}`); - return; - } - let path = `InvoiceAndCreditNotes/CreditNotes/${companyId}/${id}.pdf`; - uploadFileWasabiPromise(companyId,path,localFilePath, true,localFilePath,'',true).then(()=>{ - resolve(); - }).catch((error)=>{ - loggerConfig.error(`Error While Uploading Credit Note In Wasabi: ${error.message ? error.message : error}`); - reject(error); - }) - }); - } catch (error) { - loggerConfig.error(`Error While Uploading Credit Note In Wasabi: ${error.message ? error.message : error}`); - reject(error); - } - }) -} - exports.handleBucketSizeUpdateCron = () => { getBucketSize(); } diff --git a/common-storage/common.js b/common-storage/common.js index ecd6164..2a773f3 100644 --- a/common-storage/common.js +++ b/common-storage/common.js @@ -1,7 +1,7 @@ const loggerConfig = require("../Config/loggerConfig"); const { SCHEMA_TYPE } = require("../Config/schemaType"); -const { updateCompanyFun } = require("../Modules/Company/controller/updateCompany"); -const { uploadMainFileForbase64Thumbnail, uploadFileWasabiPromise, getBucketSize, createCompanyDataWasabi, getUserProfilePresignedUrl, getPresignedUrl, copyWasabiImage, cleanUpTrackshotStorage } = require("../Modules/storage/wasabi/controller"); +const { updateCompanyFun } = require("../modules/company/controller/update-company"); +const { uploadMainFileForbase64Thumbnail, uploadFileWasabiPromise, getBucketSize, createCompanyDataWasabi, getUserProfilePresignedUrl, getPresignedUrl, copyWasabiImage, cleanUpTrackshotStorage } = require("../modules/storage/wasabi/controller"); const fs = require("fs"); exports.currentDirectory = 'wasabi'; @@ -118,36 +118,6 @@ exports.handleCreateCompanyDataStorageFunForUpload = async(bodyData,companyId) = }) } -/** - * - * @param {object} companyId - * @param {string} localFilePath - * @param {object} filedata - * @returns - */ -exports.handleChargeebeCreditNotUpload = (companyId,localFilePath,filedata,id) => { - return new Promise((resolve, reject) => { - try { - fs.writeFile(localFilePath, Buffer.from(filedata,'binary'), (error) => { - if (error) { - loggerConfig.error(`Credit Note Download Error ${error.message ? error.message : error}`); - return; - } - let path = `InvoiceAndCreditNotes/CreditNotes/${companyId}/${id}.pdf`; - uploadFileWasabiPromise(companyId,path,localFilePath, true,localFilePath,'',true).then(()=>{ - resolve(); - }).catch((error)=>{ - loggerConfig.error(`Error While Uploading Credit Note In Wasabi: ${error.message ? error.message : error}`); - reject(error); - }) - }); - } catch (error) { - loggerConfig.error(`Error While Uploading Credit Note In Wasabi: ${error.message ? error.message : error}`); - reject(error); - } - }) -} - exports.handleBucketSizeUpdateCron = () => { getBucketSize(); } diff --git a/cron.js b/cron.js index c43185a..96f38cc 100644 --- a/cron.js +++ b/cron.js @@ -1,8 +1,8 @@ const schedule = require("node-schedule"); const logger = require("./Config/loggerConfig"); -const taskIndexRef = require("./Modules/taskIndex/controller"); +const taskIndexRef = require("./modules/task-index/controller"); const { handleBucketSizeUpdateCron } = require(`./common-storage/common-${process.env.STORAGE_TYPE}.js`); -const aiRef = require("./Modules/AI/controller") +const aiRef = require("./modules/ai/controller") // // This cron job executes daily at midnight (12 AM) and retrieves the file size from Wasabi storage diff --git a/frontend/public/index.html b/frontend/public/index.html index 5745859..6612693 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -9,16 +9,13 @@ - -