[PROD RELEASE] - Fixes

.circleci/config.yml

@@ -91,7 +91,7 @@ workflows:
               only:
                 - develop
                 - security
-                - PM-3327
+                - PM-3351
 
       - "build-qa":
           context: org-global

app-constants.js

@@ -151,6 +151,14 @@ const PhaseFact = {
   UNRECOGNIZED: -1
 }
 
+const PhaseChangeNotificationSettings = {
+  PHASE_CHANGE: {
+    sendgridTemplateId: config.PHASE_CHANGE_SENDGRID_TEMPLATE_ID,
+    cc: [],
+  },
+};
+
+
 const auditFields = [
   'createdAt', 'createdBy', 'updatedAt', 'updatedBy'
 ]
@@ -168,4 +176,5 @@ module.exports = {
   SelfServiceNotificationSettings,
   PhaseFact,
   auditFields,
+  PhaseChangeNotificationSettings,
 };

app.js

@@ -70,15 +70,7 @@
 
 app.use(
   cors({
-    origin: (origin, callback) => {
-      if (!origin) {
-        console.log("No origin - probably curl or server to server request");
-        // disable cors if service to service request
-        callback(null, false);
-      } else {
-        callback(null, '*')
-      }
-    },
+    origin: "*",
     exposedHeaders: [
       "X-Prev-Page",
       "X-Next-Page",

config/default.js

@@ -133,4 +133,6 @@ module.exports = {
   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,
+  CHALLENGE_URL: process.env.CHALLENGE_URL || 'https://www.topcoder-dev.com/challenges' ,
+  PHASE_CHANGE_SENDGRID_TEMPLATE_ID: process.env.PHASE_CHANGE_SENDGRID_TEMPLATE_ID || "",
 };

data-migration/prisma/schema.prisma

@@ -74,6 +74,7 @@ model Challenge {
   currentPhaseNames     String[]             // current phase names
 
   wiproAllowed          Boolean              @default(false)
+  funChallenge          Boolean              @default(false)
 
   // simple arrays for tags and groups (PostgreSQL native array type)
   tags                  String[]

docs/swagger.yaml

@@ -2538,6 +2538,10 @@ definitions:
         type: boolean
         default: false
         description: Flag to indicate whether Wipro employees can join challenge
+      funChallenge:
+        type: boolean
+        default: false
+        description: Flag to indicate this challenge contributes to leaderboard scoring without individual prize payouts
       descriptionFormat:
         type: string
         default: markup
@@ -3597,6 +3601,18 @@ definitions:
             type: string
             description: The timeline template id.
             format: UUID
+          typeId:
+            type: string
+            description: The challenge type id mapped to this timeline template row.
+            format: UUID
+          trackId:
+            type: string
+            description: The challenge track id mapped to this timeline template row.
+            format: UUID
+          isDefault:
+            type: boolean
+            description: Indicates this timeline template is the default for the mapped type/track.
+            default: false
       - $ref: "#/definitions/TimelineTemplateData"
     required:
       - id

prisma/migrations/20260222100000_add_fun_challenge_flag/migration.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "Challenge"
+ADD COLUMN "funChallenge" BOOLEAN NOT NULL DEFAULT false;

prisma/migrations/20260227120000_add_challenge_term_index/migration.sql

@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX "ChallengeTerm_challengeId_idx" ON "ChallengeTerm"("challengeId");

prisma/schema.prisma

@@ -92,6 +92,7 @@ model Challenge {
   currentPhaseNames          String[] // current phase names
 
   wiproAllowed Boolean @default(false)
+  funChallenge Boolean @default(false)
 
   // simple arrays for tags and groups (PostgreSQL native array type)
   tags   String[]
@@ -375,6 +376,8 @@ model ChallengeTerm {
   createdBy String
   updatedAt DateTime @updatedAt
   updatedBy String
+
+  @@index([challengeId])
 }
 
 //////////////////////////////////////////
@@ -732,4 +735,4 @@ model TimelineTemplatePhase {
 
   @@index([timelineTemplateId])
   @@index([timelineTemplateId, phaseId])
-}
+}

src/common/challenge-helper.js

@@ -91,7 +91,6 @@ class ChallengeHelper {
       promises.push(
         (async () => {
           const group = await helper.getGroupById(g);
-          console.log("group", group);
           if (!group) {
             throw new errors.BadRequestError("The groups provided are invalid " + g);
           }

src/common/helper.js

@@ -1428,22 +1428,48 @@ function sumOfPrizes(prizes) {
 }
 
 /**
- * Get group by id
- * @param {String} groupId the group id
+ * Get group by id, with oldId fallback for backward compatibility.
+ * @param {String} groupId the group id or oldId
  * @returns {Promise<Object>} the group
  */
 async function getGroupById(groupId) {
+  const normalizedGroupId = _.toString(groupId || "").trim();
+  if (!normalizedGroupId) {
+    return;
+  }
+
   const token = await m2mHelper.getM2MToken();
+  const requestHeaders = { Authorization: `Bearer ${token}` };
   try {
-    const result = await axios.get(`${config.GROUPS_API_URL}/${groupId}`, {
-      headers: { Authorization: `Bearer ${token}` },
+    const result = await axios.get(`${config.GROUPS_API_URL}/${encodeURIComponent(normalizedGroupId)}`, {
+      headers: requestHeaders,
     });
     return result.data;
   } catch (err) {
-    if (err.response.status === HttpStatus.NOT_FOUND) {
-      return;
+    const status = _.get(err, "response.status");
+    if (status !== HttpStatus.NOT_FOUND) {
+      throw err;
+    }
+  }
+
+  try {
+    const result = await axios.get(config.GROUPS_API_URL, {
+      headers: requestHeaders,
+      params: {
+        page: 1,
+        perPage: 1,
+        oldId: normalizedGroupId,
+      },
+    });
+    const groups = _.get(result, "data", []);
+    if (groups.length > 0) {
+      return groups[0];
+    }
+  } catch (err) {
+    const status = _.get(err, "response.status");
+    if (status !== HttpStatus.NOT_FOUND) {
+      throw err;
     }
-    throw err;
   }
 }
 
@@ -1638,6 +1664,72 @@ async function sendSelfServiceNotification(type, recipients, data) {
   }
 }
 
+/**
+ * Build payload for phase change email notification
+ * @param {String} challenge Id
+ * @param {String} challenge name
+ * @param {String} challenge phase name
+ * @param {String} operation to be performed on the phase - open | close | reopen
+ * @param {String|Date} at - The date/time when the phase opened/closed
+ */
+function buildPhaseChangeEmailData({ challengeId, challengeName, phaseName, operation, at }) {
+  const isOpen = operation === 'open' || operation === 'reopen';
+  const isClose = operation === 'close';
+
+  return {
+    challengeURL: `${config.CHALLENGE_URL}/${challengeId}`,
+    challengeName,
+    phaseOpen: isOpen ? phaseName : null,
+    phaseOpenDate: isOpen ? at : null,
+    phaseClose: isClose ? phaseName : null,
+    phaseCloseDate: isClose ? at : null,
+  };
+}
+
+
+/**
+ * Send phase change notification
+ * @param {String} type the notification type
+ * @param {Array} recipients the array of recipients emails
+ * @param {Object} data the data
+ */
+async function sendPhaseChangeNotification(type, recipients, data) {
+  try {
+    const settings = constants.PhaseChangeNotificationSettings?.[type];
+
+    if (!settings) {
+      logger.debug(`sendPhaseChangeNotification: unknown type ${type}`);
+      return;
+    }
+
+    if (!settings.sendgridTemplateId) {
+      logger.debug(
+        `sendPhaseChangeNotification: sendgridTemplateId not configured for type ${type}`
+      );
+      return;
+    }
+    const safeRecipients = Array.isArray(recipients) ? recipients.filter(Boolean) : [];
+
+    if (!safeRecipients.length) {
+      logger.debug(`sendPhaseChangeNotification: no recipients for type ${type}`);
+      return;
+    }
+
+    await postBusEvent('external.action.email', 
+      {
+        from: config.EMAIL_FROM,
+        replyTo: config.EMAIL_FROM,
+        recipients: safeRecipients,
+        data: data,
+        sendgrid_template_id: settings.sendgridTemplateId,
+        version: 'v3',
+      }, 
+    );
+  } catch (e) {
+    logger.debug(`Failed to post notification ${type}: ${e.message}`);
+  }
+}
+
 /**
  * Submit a request to zendesk
  * @param {Object} request the request
@@ -1756,6 +1848,8 @@ module.exports = {
   setToInternalCache,
   flushInternalCache,
   removeNullProperties,
+  buildPhaseChangeEmailData,
+  sendPhaseChangeNotification
 };
 
 logger.buildService(module.exports);

src/common/prisma-helper.js

@@ -95,6 +95,7 @@ function convertChallengeSchemaToPrisma(currentUser, challenge) {
     "groups",
     "legacyId",
     "wiproAllowed",
+    "funChallenge",
     "numOfRegistrants",
     "numOfSubmissions",
     "numOfCheckpointSubmissions",

src/services/ChallengePhaseService.js

@@ -813,9 +813,74 @@ async function partiallyUpdateChallengePhase(currentUser, challengeId, id, data)
     _.assignIn({ id: result.id }, data)
   );
   await postChallengeUpdatedNotification(challengeId);
+
+  // send notification logic
+  try {
+    const shouldNotifyClose = Boolean(isClosingPhase);
+    const shouldNotifyOpen = Boolean(isOpeningPhase); // includes reopen
+
+    if (shouldNotifyClose || shouldNotifyOpen) {
+      // Single template - single type
+      const notificationType = "PHASE_CHANGE";
+
+      const operation = shouldNotifyClose
+        ? "close"
+        : (isReopeningPhase ? "reopen" : "open");
+
+      const at = shouldNotifyClose
+        ? (result.actualEndDate || new Date().toISOString())
+        : (result.actualStartDate || new Date().toISOString());
+
+      // fetch challenge name
+      const challenge = await prisma.challenge.findUnique({
+        where: { id: challengeId },
+        select: { name: true },
+      });
+
+      const challengeName = challenge?.name;
+
+      // build recipients
+      const resources = await helper.getChallengeResources(challengeId);
+
+      const recipients = Array.from(
+        new Set(
+          (resources || [])
+            .map(r => r?.email || r?.memberEmail)
+            .filter(Boolean)
+            .map(e => String(e).trim().toLowerCase())
+        )
+      );
+
+      if (!recipients.length) {
+        logger.debug(
+          `phase change notification skipped: no recipients for challenge ${challengeId}`
+        );
+        return _.omit(result, constants.auditFields);
+      }
+
+      // build payload that matches the SendGrid HTML template
+      const phaseName = result.name || data.name || challengePhase.name;
+
+      const payload = helper.buildPhaseChangeEmailData({
+        challengeId,
+        challengeName,
+        phaseName,
+        operation,
+        at,
+      });
+
+      await helper.sendPhaseChangeNotification(notificationType, recipients, payload);
+    }
+  } catch (e) {
+    logger.debug(
+      `phase change notification failed for challenge ${challengeId}, phase ${id}: ${e.message}`
+    );
+  }
+
   return _.omit(result, constants.auditFields);
 }
 
+
 partiallyUpdateChallengePhase.schema = {
   currentUser: Joi.any(),
   challengeId: Joi.id(),