Merge the latest development branch

Author: billsedison

.env.sample

@@ -1 +1,19 @@
-DATABASE_URL="postgresql://johndoe:randompassword@localhost:5432/mydb?schema=public"
+POSTGRES_SCHEMA="public"
+DATABASE_URL="postgresql://johndoe:randompassword@localhost:5432/mydb?schema=${POSTGRES_SCHEMA}"
+
+# API configs
+BUS_API_URL="https://api.topcoder-dev.com/v5/bus/events"
+CHALLENGE_API_URL="https://api.topcoder-dev.com/v5/challenges/"
+MEMBER_API_URL="https://api.topcoder-dev.com/v5/members"
+# M2m configs
+M2M_AUTH_URL="https://auth0.topcoder-dev.com/oauth/token"
+M2M_AUTH_CLIENT_ID="<your-m2m-client-id>"
+M2M_AUTH_CLIENT_SECRET="<your-m2m-client-secret>"
+M2M_AUTH_DOMAIN="topcoder-dev.auth0.com"
+M2M_AUTH_AUDIENCE="https://m2m.topcoder-dev.com/"
+M2M_AUTH_PROXY_SERVER_URL=
+# Mock API configs
+M2M_MOCK_TOKEN="<your-m2m-mock-token>"
+#Sendgrid email templates
+SENDGRID_ACCEPT_REVIEW_APPLICATION="d-2de72880bd69499e9c16369398d34bb9"
+SENDGRID_REJECT_REVIEW_APPLICATION="d-82ed74e778e84d8c9bc02eeda0f44b5e"

README.md

@@ -27,7 +27,11 @@ $ pnpm run start:prod
 # run postgres in docker, or other approach
 docker run -p 5432:5432  -e POSTGRES_PASSWORD=mysecretpassword postgres:14
 
-export DATABASE_URL="postgresql://postgres:mysecretpassword@localhost:5432/postgres?schema=public"
+# Configure the database connection URL (without schema parameter)
+export DATABASE_URL="postgresql://postgres:mysecretpassword@localhost:5432/postgres"
+
+# Configure the PostgreSQL schema (defaults to 'public' if not specified)
+export POSTGRES_SCHEMA="public"
 
 # run migration
 npx prisma migrate dev
@@ -48,11 +52,32 @@ npx prisma migrate reset
 #- `update_foreign_keys`
 ```
 
+## Schema Configuration
+
+The application supports configurable PostgreSQL schemas through the `POSTGRES_SCHEMA` environment variable:
+
+```bash
+# Set the schema for development
+export POSTGRES_SCHEMA="dev_schema"
+
+# Set the schema for production
+export POSTGRES_SCHEMA="prod_schema"
+
+# If not specified, the application defaults to the 'public' schema
+```
+
+This allows you to:
+- Use different schemas for different environments (development, testing, production)
+- Isolate data for different instances of the application
+- Improve security by separating schemas based on environment
+
 ## Data import
 
 - create a .env file `mv .env.sample .env`
 - update the postgres database url in .env file —
-  `DATABASE_URL="postgresql://postgres:mysecretpassword@localhost:5432/postgres?schema=public"`
+  `DATABASE_URL="postgresql://postgres:mysecretpassword@localhost:5432/postgres"`
+- set the PostgreSQL schema in .env file —
+  `POSTGRES_SCHEMA="public"` (or your preferred schema name)
 - place all the legacy json files in the `prisma/Scorecards` directory or specify it in .env file — `DATA_DIR=/path/to/Scorecards/folder/`
 - install dependencies `pnpm install`
 - run the prisma migration `npx prisma migrate dev`

appStartUp.sh

@@ -3,6 +3,14 @@ set -eo pipefail
 
 export DATABASE_URL=$(echo -e ${DATABASE_URL})
 
+# Set default schema to 'public' if not provided
+if [ -z "$POSTGRES_SCHEMA" ]; then
+    echo "POSTGRES_SCHEMA not set, defaulting to 'public'"
+    export POSTGRES_SCHEMA="public"
+else
+    echo "Using PostgreSQL schema: $POSTGRES_SCHEMA"
+fi
+
 echo "Database - running migrations."
 if $RESET_DB; then
     echo "Resetting DB"

mock/mock-api.js

@@ -0,0 +1,86 @@
+const express = require('express')
+const winston = require('winston')
+const cors = require('cors')
+
+const app = express()
+app.use(cors())
+app.use(express.json())
+app.set('port', 4000)
+
+const logger = winston.createLogger({
+  transports: [
+    new winston.transports.Console({
+      level: 'debug',
+      format: winston.format.combine(
+        winston.format.colorize(),
+        winston.format.simple()
+      ),
+    }),
+  ]
+});
+
+// Event bus
+app.post('/eventBus', (req, res) => {
+  logger.info(`Event Bus received message: ${JSON.stringify(req.body)}`);
+  res.statusCode = 200;
+  res.json({})
+})
+
+// Use environment variable for M2M token instead of hardcoding
+const m2mToken = process.env.M2M_MOCK_TOKEN || 'dummy-token';
+
+const m2mScope = 'write:bus_api,all:challenges';
+
+// Auth0
+app.post('/oauth/token', (req, res) => {
+  logger.info('Getting M2M tokens')
+  res.json({
+    access_token: m2mToken,
+    scope: m2mScope,
+    expires_in: 94608000,
+    token_type: 'Bearer'
+  })
+})
+
+// Member API
+app.get('/members', (req, res) => {
+  logger.info(`Member API receives params: ${JSON.stringify(req.query)}`)
+  let userIdStr = req.query.userIds
+  userIdStr = userIdStr.replaceAll('[', '').replaceAll(']', '')
+  const userIds = userIdStr.split(',')
+  // return result
+  const ret = userIds.map(id => ({
+    userId: parseInt(id),
+    email: `${id}@topcoder.com`
+  }))
+  res.json(ret)
+})
+
+// Challenge API
+app.get('/challenges/:id', (req, res) => {
+  // directly challenge details
+  const id = req.params.id
+  logger.info(`Getting challenge with id ${id}`)
+  if (id === '11111111-2222-3333-9999-444444444444') {
+    res.statusCode = 404
+    res.json({})
+    return
+  }
+  res.json({
+    id,
+    name: `Test Challenge ${id}`,
+    legacy: {
+      track: 'DEVELOP',
+      subTrack: 'CODE'
+    },
+    numOfSubmissions: 2,
+    legacyId: 30376875,
+    tags: ['Prisma', 'NestJS']
+  })
+})
+
+
+app.listen(app.get('port'), '0.0.0.0', () => {
+  logger.info(`Express server listening on port ${app.get('port')}`)
+})
+

package.json

@@ -21,12 +21,15 @@
     "postinstall": "npx prisma generate"
   },
   "dependencies": {
+    "@nestjs/axios": "^4.0.0",
     "@nestjs/common": "^11.0.1",
     "@nestjs/core": "^11.0.1",
+    "@nestjs/mapped-types": "^2.1.0",
     "@nestjs/platform-express": "^11.0.1",
     "@nestjs/swagger": "^11.0.3",
     "@prisma/client": "^6.3.1",
     "@types/jsonwebtoken": "^9.0.9",
+    "axios": "^1.9.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "cors": "^2.8.5",
@@ -35,7 +38,8 @@
     "multer": "^2.0.1",
     "nanoid": "~5.1.2",
     "reflect-metadata": "^0.2.2",
-    "rxjs": "^7.8.1"
+    "rxjs": "^7.8.1",
+    "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v3.0.1"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.2.0",
@@ -53,6 +57,7 @@
     "eslint": "^9.18.0",
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-prettier": "^5.2.2",
+    "express": "^5.1.0",
     "globals": "^15.14.0",
     "jest": "^29.7.0",
     "prettier": "^3.4.2",
@@ -64,7 +69,8 @@
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.7.3",
-    "typescript-eslint": "^8.20.0"
+    "typescript-eslint": "^8.20.0",
+    "winston": "^3.17.0"
   },
   "prisma": {
     "seed": "ts-node prisma/migrate.ts",