[v6 PROD RELEASE] - dev -> master

.circleci/config.yml

@@ -103,7 +103,7 @@ workflows:
             - feature/top-262-projectid-non-mandatory
             - TOP-2364
             - PM-2097
-            - pm-2456
+            - pm-2539
 
     - "build-qa":
         context: org-global

.github/workflows/trivy.yaml

@@ -0,0 +1,34 @@
+name: Trivy Scanner
+
+permissions:
+  contents: read
+  security-events: write
+on:
+  push:
+    branches:
+      - main
+      - dev
+  pull_request:
+jobs:
+  trivy-scan:
+    name: Use Trivy
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run Trivy scanner in repo mode
+        uses: aquasecurity/trivy-action@0.33.1
+        with:
+          scan-type: "fs"
+          ignore-unfixed: true
+          format: "sarif"
+          output: "trivy-results.sarif"
+          severity: "CRITICAL,HIGH,UNKNOWN"
+          scanners: vuln,secret,misconfig,license
+          github-pat: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: "trivy-results.sarif"

app-constants.js

@@ -65,6 +65,9 @@ const Topics = {
   ChallengeTimelineTemplateDeleted: "challenge.action.challenge.timeline.deleted",
   ChallengePhaseUpdated: "challenge.action.phase.updated",
   ChallengePhaseDeleted: "challenge.action.phase.deleted",
+  DefaultChallengeReviewerCreated: "challenge.action.default.reviewer.created",
+  DefaultChallengeReviewerUpdated: "challenge.action.default.reviewer.updated",
+  DefaultChallengeReviewerDeleted: "challenge.action.default.reviewer.deleted",
   // Self Service topics
   Notifications: "notifications.action.create",
 };
@@ -95,6 +98,9 @@ const DisabledTopics = [
   Topics.ChallengeTimelineTemplateDeleted,
   Topics.ChallengePhaseUpdated,
   Topics.ChallengePhaseDeleted,
+  Topics.DefaultChallengeReviewerCreated,
+  Topics.DefaultChallengeReviewerUpdated,
+  Topics.DefaultChallengeReviewerDeleted,
 ];
 
 const challengeTextSortField = {

config/default.js

@@ -129,4 +129,5 @@ module.exports = {
   // Database schemas for direct counts (shared DB)
   RESOURCES_DB_SCHEMA: process.env.RESOURCES_DB_SCHEMA || "resources",
   REVIEW_DB_SCHEMA: process.env.REVIEW_DB_SCHEMA || "reviews",
+  CHALLENGE_SERVICE_PRISMA_TIMEOUT: process.env.CHALLENGE_SERVICE_PRISMA_TIMEOUT ? parseInt(process.env.CHALLENGE_SERVICE_PRISMA_TIMEOUT, 10) : 10000,
 };

prisma/migrations/20251023101420_performance_indices/migration.sql

@@ -0,0 +1,29 @@
+-- CreateIndex
+CREATE INDEX "Challenge_status_startDate_idx" ON "Challenge"("status", "startDate");
+
+-- CreateIndex
+CREATE INDEX "Challenge_trackId_typeId_status_idx" ON "Challenge"("trackId", "typeId", "status");
+
+-- CreateIndex
+CREATE INDEX "Challenge_legacyId_idx" ON "Challenge"("legacyId");
+
+-- CreateIndex
+CREATE INDEX "Challenge_projectId_status_idx" ON "Challenge"("projectId", "status");
+
+-- CreateIndex
+CREATE INDEX "ChallengePhase_challengeId_isOpen_idx" ON "ChallengePhase"("challengeId", "isOpen");
+
+-- CreateIndex
+CREATE INDEX "ChallengePhase_challengeId_name_idx" ON "ChallengePhase"("challengeId", "name");
+
+-- CreateIndex
+CREATE INDEX "ChallengePrizeSet_challengeId_type_idx" ON "ChallengePrizeSet"("challengeId", "type");
+
+-- CreateIndex
+CREATE INDEX "ChallengeReviewer_challengeId_phaseId_idx" ON "ChallengeReviewer"("challengeId", "phaseId");
+
+-- CreateIndex
+CREATE INDEX "ChallengeWinner_challengeId_type_placement_idx" ON "ChallengeWinner"("challengeId", "type", "placement");
+
+-- CreateIndex
+CREATE INDEX "TimelineTemplatePhase_timelineTemplateId_phaseId_idx" ON "TimelineTemplatePhase"("timelineTemplateId", "phaseId");

prisma/schema.prisma

@@ -153,6 +153,10 @@ model Challenge {
   @@index([registrationEndDate])
   @@index([startDate])
   @@index([endDate])
+  @@index([status, startDate])
+  @@index([trackId, typeId, status])
+  @@index([legacyId])
+  @@index([projectId, status])
 }
 
 //////////////////////////////////////////
@@ -329,6 +333,7 @@ model ChallengeWinner {
   updatedBy String
 
   @@index([challengeId])
+  @@index([challengeId, type, placement])
 }
 
 //////////////////////////////////////////
@@ -533,6 +538,8 @@ model ChallengePhase {
   updatedBy String
 
   @@index([challengeId])
+  @@index([challengeId, isOpen])
+  @@index([challengeId, name])
 }
 
 //////////////////////////////////////////
@@ -576,6 +583,7 @@ model ChallengePrizeSet {
   updatedBy String
 
   @@index([challengeId])
+  @@index([challengeId, type])
 }
 
 //////////////////////////////////////////
@@ -611,6 +619,7 @@ model ChallengeReviewer {
 
   @@index([challengeId])
   @@index([phaseId])
+  @@index([challengeId, phaseId])
 }
 
 //////////////////////////////////////////
@@ -697,4 +706,5 @@ model TimelineTemplatePhase {
   timelineTemplate TimelineTemplate @relation(fields: [timelineTemplateId], references: [id], onDelete: Cascade)
 
   @@index([timelineTemplateId])
+  @@index([timelineTemplateId, phaseId])
 }

src/common/prisma-helper.js

@@ -228,6 +228,7 @@ function convertChallengeSchemaToPrisma(currentUser, challenge) {
           memberReviewerCount: _.isNil(r.memberReviewerCount)
             ? null
             : Number(r.memberReviewerCount),
+          fixedAmount: _.isNil(r.fixedAmount) ? null : Number(r.fixedAmount),
           baseCoefficient: _.isNil(r.baseCoefficient) ? null : Number(r.baseCoefficient),
           incrementalCoefficient: _.isNil(r.incrementalCoefficient)
             ? null
@@ -391,6 +392,7 @@ function convertModelToResponse(ret) {
         "isMemberReview",
         "memberReviewerCount",
         "phaseId",
+        "fixedAmount",
         "baseCoefficient",
         "incrementalCoefficient",
         "type",

src/common/prisma.js

@@ -8,6 +8,7 @@ const {
   ReviewOpportunityTypeEnum,
 } = require("@prisma/client");
 const logger = require("./logger");
+const config = require("config");
 
 const prismaClient = new PrismaClient({
   log: [
@@ -21,7 +22,7 @@ const prismaClient = new PrismaClient({
   // Allow overriding via environment variables if needed.
   transactionOptions: {
     maxWait: Number(process.env.PRISMA_TRANSACTION_MAX_WAIT_MS || 10000), // wait up to 10s to start
-    timeout: Number(process.env.PRISMA_TRANSACTION_TIMEOUT_MS || 10000), // allow up to 30s per transaction
+    timeout: config.CHALLENGE_SERVICE_PRISMA_TIMEOUT, // allow up to 30s per transaction
   },
 });
 

src/common/review-prisma.js

@@ -19,7 +19,7 @@ const createClient = () =>
     ],
     transactionOptions: {
       maxWait: Number(process.env.PRISMA_TRANSACTION_MAX_WAIT_MS || 10000),
-      timeout: Number(process.env.PRISMA_TRANSACTION_TIMEOUT_MS || 10000),
+      timeout: config.CHALLENGE_SERVICE_PRISMA_TIMEOUT,
     },
   });
 

src/controllers/DefaultChallengeReviewerController.js

@@ -0,0 +1,95 @@
+/**
+ * Controller for default challenge reviewer endpoints.
+ */
+const HttpStatus = require("http-status-codes");
+const service = require("../services/DefaultChallengeReviewerService");
+const helper = require("../common/helper");
+
+/**
+ * Search default challenge reviewers.
+ *
+ * @param {Object} req the request
+ * @param {Object} res the response
+ */
+async function searchDefaultChallengeReviewers(req, res) {
+  const result = await service.searchDefaultChallengeReviewers(req.query);
+  helper.setResHeaders(req, res, result);
+  res.send(result.result);
+}
+
+/**
+ * Create default challenge reviewer.
+ *
+ * @param {Object} req the request
+ * @param {Object} res the response
+ */
+async function createDefaultChallengeReviewer(req, res) {
+  const result = await service.createDefaultChallengeReviewer(req.authUser, req.body);
+  res.status(HttpStatus.CREATED).send(result);
+}
+
+/**
+ * Get default challenge reviewer.
+ *
+ * @param {Object} req the request
+ * @param {Object} res the response
+ */
+async function getDefaultChallengeReviewer(req, res) {
+  const result = await service.getDefaultChallengeReviewer(
+    req.params.defaultChallengeReviewerId
+  );
+  res.send(result);
+}
+
+/**
+ * Fully update default challenge reviewer.
+ *
+ * @param {Object} req the request
+ * @param {Object} res the response
+ */
+async function fullyUpdateDefaultChallengeReviewer(req, res) {
+  const result = await service.fullyUpdateDefaultChallengeReviewer(
+    req.authUser,
+    req.params.defaultChallengeReviewerId,
+    req.body
+  );
+  res.send(result);
+}
+
+/**
+ * Partially update default challenge reviewer.
+ *
+ * @param {Object} req the request
+ * @param {Object} res the response
+ */
+async function partiallyUpdateDefaultChallengeReviewer(req, res) {
+  const result = await service.partiallyUpdateDefaultChallengeReviewer(
+    req.authUser,
+    req.params.defaultChallengeReviewerId,
+    req.body
+  );
+  res.send(result);
+}
+
+/**
+ * Delete default challenge reviewer.
+ *
+ * @param {Object} req the request
+ * @param {Object} res the response
+ */
+async function deleteDefaultChallengeReviewer(req, res) {
+  const result = await service.deleteDefaultChallengeReviewer(
+    req.params.defaultChallengeReviewerId
+  );
+  res.send(result);
+}
+
+module.exports = {
+  searchDefaultChallengeReviewers,
+  createDefaultChallengeReviewer,
+  getDefaultChallengeReviewer,
+  fullyUpdateDefaultChallengeReviewer,
+  partiallyUpdateDefaultChallengeReviewer,
+  deleteDefaultChallengeReviewer,
+};
+

src/routes.js

@@ -316,6 +316,52 @@ module.exports = {
       scopes: [DELETE, ALL],
     },
   },
+  "/default-challenge-reviewers": {
+    get: {
+      controller: "DefaultChallengeReviewerController",
+      method: "searchDefaultChallengeReviewers",
+      auth: "jwt",
+      access: [constants.UserRoles.Admin],
+      scopes: [READ, ALL],
+    },
+    post: {
+      controller: "DefaultChallengeReviewerController",
+      method: "createDefaultChallengeReviewer",
+      auth: "jwt",
+      access: [constants.UserRoles.Admin],
+      scopes: [CREATE, ALL],
+    },
+  },
+  "/default-challenge-reviewers/:defaultChallengeReviewerId": {
+    get: {
+      controller: "DefaultChallengeReviewerController",
+      method: "getDefaultChallengeReviewer",
+      auth: "jwt",
+      access: [constants.UserRoles.Admin],
+      scopes: [READ, ALL],
+    },
+    put: {
+      controller: "DefaultChallengeReviewerController",
+      method: "fullyUpdateDefaultChallengeReviewer",
+      auth: "jwt",
+      access: [constants.UserRoles.Admin],
+      scopes: [UPDATE, ALL],
+    },
+    patch: {
+      controller: "DefaultChallengeReviewerController",
+      method: "partiallyUpdateDefaultChallengeReviewer",
+      auth: "jwt",
+      access: [constants.UserRoles.Admin],
+      scopes: [UPDATE, ALL],
+    },
+    delete: {
+      controller: "DefaultChallengeReviewerController",
+      method: "deleteDefaultChallengeReviewer",
+      auth: "jwt",
+      access: [constants.UserRoles.Admin],
+      scopes: [DELETE, ALL],
+    },
+  },
   "/timeline-templates": {
     get: {
       controller: "TimelineTemplateController",