Fix up raising bus messages

Author: jmgasper

app-constants.js

@@ -42,33 +42,61 @@ const Topics = {
   ChallengeCreated: "challenge.notification.create",
   ChallengeUpdated: "challenge.notification.update",
   ChallengeDeleted: "challenge.notification.delete",
-  ChallengeTypeCreated: "test.new.bus.events", // 'challenge.action.type.created',
-  ChallengeTypeUpdated: "test.new.bus.events", // 'challenge.action.type.updated',
-  ChallengeTypeDeleted: "test.new.bus.events", // 'challenge.action.type.deleted',
-  ChallengeTrackCreated: "test.new.bus.events", // 'challenge.action.track.created',
-  ChallengeTrackUpdated: "test.new.bus.events", // 'challenge.action.track.updated',
-  ChallengeTrackDeleted: "test.new.bus.events", // 'challenge.action.track.deleted',
-  PhaseCreated: "test.new.bus.events", // 'phase.action.created',
-  PhaseUpdated: "test.new.bus.events", // 'phase.action.updated',
-  PhaseDeleted: "test.new.bus.events", // 'phase.action.deleted',
-  TimelineTemplateCreated: "test.new.bus.events", // 'challenge.action.timeline.template.created',
-  TimelineTemplateUpdated: "test.new.bus.events", // 'challenge.action.timeline.template.updated',
-  TimelineTemplateDeleted: "test.new.bus.events", // 'challenge.action.timeline.template.deleted',
-  ChallengeTypeTimelineTemplateCreated: "test.new.bus.events", // 'challenge.action.type.timeline.template.created',
-  ChallengeTypeTimelineTemplateUpdated: "test.new.bus.events", // 'challenge.action.type.timeline.template.updated',
-  ChallengeTypeTimelineTemplateDeleted: "test.new.bus.events", // 'challenge.action.type.timeline.template.deleted'
-  ChallengeAttachmentCreated: "test.new.bus.events", // 'challenge.action.attachment.created',
-  ChallengeAttachmentUpdated: "test.new.bus.events", // 'challenge.action.attachment.updated',
-  ChallengeAttachmentDeleted: "test.new.bus.events", // 'challenge.action.attachment.deleted',
+  ChallengeTypeCreated: "challenge.action.type.created",
+  ChallengeTypeUpdated: "challenge.action.type.updated",
+  ChallengeTypeDeleted: "challenge.action.type.deleted",
+  ChallengeTrackCreated: "challenge.action.track.created",
+  ChallengeTrackUpdated: "challenge.action.track.updated",
+  ChallengeTrackDeleted: "challenge.action.track.deleted",
+  PhaseCreated: "phase.action.created",
+  PhaseUpdated: "phase.action.updated",
+  PhaseDeleted: "phase.action.deleted",
+  TimelineTemplateCreated: "challenge.action.timeline.template.created",
+  TimelineTemplateUpdated: "challenge.action.timeline.template.updated",
+  TimelineTemplateDeleted: "challenge.action.timeline.template.deleted",
+  ChallengeTypeTimelineTemplateCreated: "challenge.action.type.timeline.template.created",
+  ChallengeTypeTimelineTemplateUpdated: "challenge.action.type.timeline.template.updated",
+  ChallengeTypeTimelineTemplateDeleted: "challenge.action.type.timeline.template.deleted",
+  ChallengeAttachmentCreated: "challenge.action.attachment.created",
+  ChallengeAttachmentUpdated: "challenge.action.attachment.updated",
+  ChallengeAttachmentDeleted: "challenge.action.attachment.deleted",
   ChallengeTimelineTemplateCreated: "challenge.action.challenge.timeline.created",
   ChallengeTimelineTemplateUpdated: "challenge.action.challenge.timeline.updated",
   ChallengeTimelineTemplateDeleted: "challenge.action.challenge.timeline.deleted",
-  ChallengePhaseUpdated: "test.new.bus.events", // 'challenge.action.phase.updated',
-  ChallengePhaseDeleted: "test.new.bus.events", // 'challenge.action.phase.deleted',
+  ChallengePhaseUpdated: "challenge.action.phase.updated",
+  ChallengePhaseDeleted: "challenge.action.phase.deleted",
   // Self Service topics
   Notifications: "notifications.action.create",
 };
 
+// Kafka topics temporarily disabled.  We probably don't need all these right now, and this just cuts
+// down on overhead.
+const DisabledTopics = [
+  Topics.ChallengeTypeCreated,
+  Topics.ChallengeTypeUpdated,
+  Topics.ChallengeTypeDeleted,
+  Topics.ChallengeTrackCreated,
+  Topics.ChallengeTrackUpdated,
+  Topics.ChallengeTrackDeleted,
+  Topics.PhaseCreated,
+  Topics.PhaseUpdated,
+  Topics.PhaseDeleted,
+  Topics.TimelineTemplateCreated,
+  Topics.TimelineTemplateUpdated,
+  Topics.TimelineTemplateDeleted,
+  Topics.ChallengeTypeTimelineTemplateCreated,
+  Topics.ChallengeTypeTimelineTemplateUpdated,
+  Topics.ChallengeTypeTimelineTemplateDeleted,
+  Topics.ChallengeAttachmentCreated,
+  Topics.ChallengeAttachmentUpdated,
+  Topics.ChallengeAttachmentDeleted,
+  Topics.ChallengeTimelineTemplateCreated,
+  Topics.ChallengeTimelineTemplateUpdated,
+  Topics.ChallengeTimelineTemplateDeleted,
+  Topics.ChallengePhaseUpdated,
+  Topics.ChallengePhaseDeleted,
+];
+
 const challengeTextSortField = {
   Name: "name",
   TypeId: "typeId",
@@ -128,6 +156,7 @@ module.exports = {
   EVENT_ORIGINATOR,
   EVENT_MIME_TYPE,
   Topics,
+  DisabledTopics,
   challengeTextSortField,
   SelfServiceNotificationTypes,
   SelfServiceNotificationSettings,

src/common/helper.js

@@ -19,6 +19,8 @@ const projectHelper = require("./project-helper");
 const m2mHelper = require("./m2m-helper");
 const { hasAdminRole } = require("./role-helper");
 
+const DISABLED_TOPICS = new Set(constants.DisabledTopics || []);
+
 // Bus API Client
 let busApiClient;
 
@@ -919,6 +921,10 @@ function getBusApiClient() {
  * @param {Object} options the extra options to the message
  */
 async function postBusEvent(topic, payload, options = {}) {
+  if (DISABLED_TOPICS.has(topic)) {
+    logger.debug(`helper.postBusEvent: skipping disabled topic ${topic}`);
+    return;
+  }
   const client = getBusApiClient();
   const message = {
     topic,

src/services/ChallengePhaseService.js

@@ -11,6 +11,7 @@ const logger = require("../common/logger");
 const errors = require("../common/errors");
 const constants = require("../../app-constants");
 const { getReviewClient } = require("../common/review-prisma");
+const { indexChallengeAndPostToKafka } = require("./ChallengeService");
 
 const { getClient } = require("../common/prisma");
 const prisma = getClient();
@@ -68,6 +69,27 @@ async function checkChallengeExists(challengeId) {
   }
 }
 
+/**
+ * Publish a challenge update event with the latest challenge payload.
+ * @param {String} challengeId the challenge id
+ */
+async function postChallengeUpdatedNotification(challengeId) {
+  try {
+    const challenge = await prisma.challenge.findUnique({ where: { id: challengeId } });
+    if (!challenge) {
+      logger.error(`Failed to publish challenge update event: challenge ${challengeId} not found`);
+      return;
+    }
+    await indexChallengeAndPostToKafka(challenge);
+  } catch (error) {
+    logger.error(
+      `Failed to publish challenge update event for challenge ${challengeId}: ${error.message}`,
+      error
+    );
+    throw error;
+  }
+}
+
 /**
  * Get all phase information for that challenge
  * @param {String} challengeId the challenge id
@@ -273,6 +295,7 @@ async function partiallyUpdateChallengePhase(currentUser, challengeId, id, data)
     constants.Topics.ChallengePhaseUpdated,
     _.assignIn({ id: result.id }, data)
   );
+  await postChallengeUpdatedNotification(challengeId);
   return _.omit(result, constants.auditFields);
 }
 
@@ -352,6 +375,7 @@ async function deleteChallengePhase(currentUser, challengeId, id) {
   const ret = _.omit(result, constants.auditFields);
   // post bus event
   await helper.postBusEvent(constants.Topics.ChallengePhaseDeleted, ret);
+  await postChallengeUpdatedNotification(challengeId);
   return ret;
 }
 

src/services/ChallengeService.js

@@ -3387,6 +3387,7 @@ module.exports = {
   advancePhase,
   getDefaultReviewers,
   setDefaultReviewers,
+  indexChallengeAndPostToKafka,
 };
 
 logger.buildService(module.exports);