Skip to content

Commit

Permalink
Conflict Resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
joffinjoy committed Dec 21, 2023
2 parents dede935 + 0d2c2cd commit ecaf141
Show file tree
Hide file tree
Showing 18 changed files with 2,844 additions and 1,714 deletions.
14 changes: 7 additions & 7 deletions src/.env
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
APPLICATION_PORT=3567
APPLICATION_PORT=3569
APPLICATION_ENV='development'
INSTALLED_PACKAGES="elevate-user elevate-mentoring elevate-notification elevate-scheduler"
REQUIRED_PACKAGES="elevate-user@1.1.30 elevate-mentoring@1.1.23 elevate-scheduler@1.0.4"
SUPPORTED_HTTP_TYPES="GET POST PUT PATCH DELETE"
USER_SERVICE_BASE_URL='http://localhost:4567'
MENTORING_SERVICE_BASE_URL=''
NOTIFICATION_SERVICE_BASE_URL=''
SCHEDULER_SERVICE_BASE_URL=''
API_DOC_URL='/interface/api-doc'
USER_SERVICE_BASE_URL='http://user:3001'
MENTORING_SERVICE_BASE_URL='http://mentoring:3000'
NOTIFICATION_SERVICE_BASE_URL='http://notification:3001'
SCHEDULER_SERVICE_BASE_URL='http://scheduler:3001'
API_DOC_URL='/interface/api-doc'
13 changes: 13 additions & 0 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@ require('module-alias/register')
const express = require('express')
const cors = require('cors')
require('dotenv').config({ path: './.env' })
const packageInstaller = require('./utils/packageInstaller')

let environmentData = require('./envVariables')()
if (!environmentData.success) {
console.error('Server could not start . Not all environment variable is provided')
process.exit()
}

packageInstaller(process.env.REQUIRED_PACKAGES).catch((error) => {
console.error(`An error occurred in package installer: ${error}`)
process.exit()
})

const app = express()
const path = require('path')
//const packageValidator = require('./utils/packageValidator');
Expand Down
Loading

0 comments on commit ecaf141

Please sign in to comment.