feat: updates from another repo

Author: maxceem

README.md

@@ -13,7 +13,6 @@ Microservice to manage CRUD operations for all things Projects.
 * Install [libpg](https://www.npmjs.com/package/pg-native)
 
 ### Steps to run locally
-
 1. Install node dependencies
    ```bash
    npm install
@@ -142,5 +141,4 @@ You may replace 172.17.0.1 with your docker0 IP.
 You can paste **swagger.yaml** to  [swagger editor](http://editor.swagger.io/) or import **postman.json** and **postman_environment.json** to verify endpoints.
 
 #### Deploying without docker
-
 If you don't want to use docker to deploy to localhost. You can simply run `npm run start:dev` from root of project. This should start the server on default port `8001`.

package.json

@@ -75,7 +75,7 @@
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-es2015": "^6.9.0",
-    "bunyan": "^1.8.1",
+    "bunyan": "^1.8.12",
     "chai": "^3.5.0",
     "chai-as-promised": "^7.1.1",
     "eslint": "^3.16.1",

src/events/index.js

@@ -14,33 +14,59 @@ import {
   milestoneUpdatedKafkaHandler,
 } from './milestones';
 
+/**
+ * Void RabbitMQ event handler.
+ * It "ack"s messages which are still published but we don't want to consume.
+ *
+ * It's used to "disable" events which we don't want to handle anymore. But for a time being
+ * we don't want to remove the code of them until we validate that we are good without them.
+ *
+ * @param {Object} logger  logger
+ * @param {Object} msg     RabbitMQ message
+ * @param {Object} channel RabbitMQ channel
+ * @returns {Promise} nothing
+ */
+const voidRabbitHandler = (logger, msg, channel) => {
+  logger.debug('Calling void RabbitMQ handler.');
+  channel.ack(msg);
+  return Promise.resolve();
+};
+
 // NOTE: We use "project-processor-es" for ES indexing now.
 //       So I disable indexing using RabbitMQ for a transition period for most of the objects
 //       which don't have any special logic.
 //       As soon as we are sure, that "project-processor-es" works well for ES indexing,
 //       we should completely remove the handlers for this events.
 export const rabbitHandlers = {
   'project.initial': projectCreatedHandler, // is only used `seedElasticsearchIndex.js` and can be removed
-  // [EVENT.ROUTING_KEY.PROJECT_DRAFT_CREATED]: projectCreatedHandler,
-  // [EVENT.ROUTING_KEY.PROJECT_UPDATED]: projectUpdatedHandler,
-  // [EVENT.ROUTING_KEY.PROJECT_DELETED]: projectDeletedHandler,
-  // [EVENT.ROUTING_KEY.PROJECT_MEMBER_ADDED]: projectMemberAddedHandler,
-  // [EVENT.ROUTING_KEY.PROJECT_MEMBER_REMOVED]: projectMemberRemovedHandler,
-  // [EVENT.ROUTING_KEY.PROJECT_MEMBER_UPDATED]: projectMemberUpdatedHandler,
-  // [EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_CREATED]: projectMemberInviteCreatedHandler,
-  // [EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_UPDATED]: projectMemberInviteUpdatedHandler,
-  // [EVENT.ROUTING_KEY.PROJECT_ATTACHMENT_ADDED]: projectAttachmentAddedHandler,
-  // [EVENT.ROUTING_KEY.PROJECT_ATTACHMENT_REMOVED]: projectAttachmentRemovedHandler,
-  // [EVENT.ROUTING_KEY.PROJECT_ATTACHMENT_UPDATED]: projectAttachmentUpdatedHandler,
+  [EVENT.ROUTING_KEY.PROJECT_DRAFT_CREATED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.PROJECT_UPDATED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.PROJECT_DELETED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.PROJECT_MEMBER_ADDED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.PROJECT_MEMBER_REMOVED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.PROJECT_MEMBER_UPDATED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_CREATED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_UPDATED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.PROJECT_ATTACHMENT_ADDED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.PROJECT_ATTACHMENT_REMOVED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.PROJECT_ATTACHMENT_UPDATED]: voidRabbitHandler, // DISABLED
 
   // project phase handles additionally implement logic for creating associated topics in Message Service
   [EVENT.ROUTING_KEY.PROJECT_PHASE_ADDED]: projectPhaseAddedHandler, // index in ES because of cascade updates
   [EVENT.ROUTING_KEY.PROJECT_PHASE_REMOVED]: projectPhaseRemovedHandler, // doesn't index in ES
   [EVENT.ROUTING_KEY.PROJECT_PHASE_UPDATED]: projectPhaseUpdatedHandler, // index in ES because of cascade updates
 
+  [EVENT.ROUTING_KEY.PROJECT_PHASE_PRODUCT_ADDED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.PROJECT_PHASE_PRODUCT_REMOVED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.PROJECT_PHASE_PRODUCT_UPDATED]: voidRabbitHandler, // DISABLED
+
   // Timeline and milestone
   'timeline.initial': timelineAddedHandler, // is only used `seedElasticsearchIndex.js` and can be removed
+  [EVENT.ROUTING_KEY.TIMELINE_ADDED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.TIMELINE_REMOVED]: voidRabbitHandler, // DISABLED
+  [EVENT.ROUTING_KEY.TIMELINE_UPDATED]: voidRabbitHandler, // DISABLED
   [EVENT.ROUTING_KEY.MILESTONE_ADDED]: milestoneAddedHandler, // index in ES because of cascade updates
+  [EVENT.ROUTING_KEY.MILESTONE_REMOVED]: voidRabbitHandler, // DISABLED
   [EVENT.ROUTING_KEY.MILESTONE_UPDATED]: milestoneUpdatedHandler, // index in ES because of cascade updates
 };
 

src/routes/projects/list.js

@@ -569,9 +569,11 @@ module.exports = [
       return retrieveProjects(req, criteria, sort, req.query.fields)
       .then((result) => {
         if (result.rows.length === 0) {
+          req.log.debug('No projects found in ES');
           return retrieveProjectsFromDB(req, criteria, sort, req.query.fields)
             .then(r => util.setPaginationHeaders(req, res, r));
         }
+        req.log.debug('Projects found in ES');
         // set header
         return util.setPaginationHeaders(req, res, result);
       })
@@ -584,9 +586,11 @@ module.exports = [
     return retrieveProjects(req, criteria, sort, req.query.fields)
       .then((result) => {
         if (result.rows.length === 0) {
+          req.log.debug('No projects found in ES');
           return retrieveProjectsFromDB(req, criteria, sort, req.query.fields)
             .then(r => util.setPaginationHeaders(req, res, r));
         }
+        req.log.debug('Projects found in ES');
         return util.setPaginationHeaders(req, res, result);
       })
       .catch(err => next(err));

src/services/busApi.js

@@ -46,19 +46,19 @@ async function getClient() {
 function createEvent(topic, payload, logger) {
   logger.debug(`Sending message to topic ${topic}: ${JSON.stringify(payload)}`);
   return getClient().then((busClient) => {
-    logger.debug('calling bus-api');
+    logger.debug(`calling bus-api for topic ${topic}`);
     return busClient.post('/bus/events', {
       topic,
       originator: 'project-api',
       timestamp: (new Date()).toISOString(),
       'mime-type': 'application/json',
       payload,
     }).then((resp) => {
-      logger.debug('Sent event to bus-api');
-      logger.debug(`Sent event to bus-api [data]: ${_.get(resp, 'data')}`);
-      logger.debug(`Sent event to bus-api [status]: ${_.get(resp, 'status')}`);
+      logger.debug(`Sent event to bus-api for topic ${topic}`);
+      logger.debug(`Sent event to bus-api for topic ${topic} [data]: ${_.get(resp, 'data')}`);
+      logger.debug(`Sent event to bus-api for topic ${topic} [status]: ${_.get(resp, 'status')}`);
     }).catch((error) => {
-      logger.debug('Error sending event to bus-api');
+      logger.debug(`Error sending event to bus-api for topic ${topic}`);
       if (error.response) {
         // The request was made and the server responded with a status code
         // that falls out of the range of 2xx