From ed0a41acaf6bde703675923068496f792ca84d91 Mon Sep 17 00:00:00 2001 From: Vins Date: Tue, 25 Jul 2023 11:14:18 +0200 Subject: [PATCH 1/2] Fix cron service --- src/common/config/variables/Variables.ts | 4 +-- src/entries/Cron.ts | 31 ++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/common/config/variables/Variables.ts b/src/common/config/variables/Variables.ts index cffedcf9..18898180 100644 --- a/src/common/config/variables/Variables.ts +++ b/src/common/config/variables/Variables.ts @@ -87,9 +87,7 @@ export class BackendVariables { this.MAILCHIMP_API_KEY = process.env["MAILCHIMP_API_KEY"]!; this.ENV = process.env["ENV"]!; } - public async validate(groups?: string[]) { - console.log(this); - + public async validate(groups?: string[]) { const validationOptions = groups ? { groups } : undefined; try { diff --git a/src/entries/Cron.ts b/src/entries/Cron.ts index a6ab8381..62a2bb93 100644 --- a/src/entries/Cron.ts +++ b/src/entries/Cron.ts @@ -1,16 +1,43 @@ import "module-alias/register"; import "reflect-metadata"; import { Container } from "typedi"; -import CronService from "@Services/common/CronService/CronService"; +import ExpressServer from "@Common/system/ExpressServer"; +import routes from "@App/index"; +import cors from "cors"; +import bodyParser from "body-parser"; +import errorHandler from "@App/middlewares/ErrorHandler"; import { BackendVariables } from "@Common/config/variables/Variables"; +import multer from "multer"; +import CronService from "@Services/common/CronService/CronService"; + +const storage = multer.memoryStorage(); (async () => { try { const variables = await Container.get(BackendVariables).validate(); + if(variables.ENV === "stg"){ Container.get(CronService).sendMails(); } + const port = variables.APP_PORT; + const rootUrl = variables.APP_ROOT_URL; + const label = variables.APP_LABEL ?? "Unknown Service"; + + Container.get(ExpressServer).init({ + label, + port: parseInt(port), + rootUrl, + middlwares: [ + cors({ origin: "*" }), + multer({ storage: storage }).single("file"), + bodyParser.urlencoded({ extended: true }), + bodyParser.json(), + ], + errorHandler, + }); + + routes.start(); } catch (e) { console.error(e); } -})(); +})(); \ No newline at end of file From b6ce63cfa977f72c8261dbda70dd98a3cf9b6600 Mon Sep 17 00:00:00 2001 From: Vins Date: Tue, 25 Jul 2023 11:16:17 +0200 Subject: [PATCH 2/2] fix --- src/entries/Cron.ts | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/src/entries/Cron.ts b/src/entries/Cron.ts index 62a2bb93..c6331797 100644 --- a/src/entries/Cron.ts +++ b/src/entries/Cron.ts @@ -1,17 +1,9 @@ import "module-alias/register"; import "reflect-metadata"; import { Container } from "typedi"; -import ExpressServer from "@Common/system/ExpressServer"; -import routes from "@App/index"; -import cors from "cors"; -import bodyParser from "body-parser"; -import errorHandler from "@App/middlewares/ErrorHandler"; import { BackendVariables } from "@Common/config/variables/Variables"; -import multer from "multer"; import CronService from "@Services/common/CronService/CronService"; -const storage = multer.memoryStorage(); - (async () => { try { const variables = await Container.get(BackendVariables).validate(); @@ -19,24 +11,6 @@ const storage = multer.memoryStorage(); if(variables.ENV === "stg"){ Container.get(CronService).sendMails(); } - const port = variables.APP_PORT; - const rootUrl = variables.APP_ROOT_URL; - const label = variables.APP_LABEL ?? "Unknown Service"; - - Container.get(ExpressServer).init({ - label, - port: parseInt(port), - rootUrl, - middlwares: [ - cors({ origin: "*" }), - multer({ storage: storage }).single("file"), - bodyParser.urlencoded({ extended: true }), - bodyParser.json(), - ], - errorHandler, - }); - - routes.start(); } catch (e) { console.error(e); }