Use id and name attributes for group instead of groupId and groupName

Author: callmekatootie

docker-kafka-es/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - "9092:9092"
     environment:
       KAFKA_ADVERTISED_HOST_NAME: localhost
-      KAFKA_CREATE_TOPICS: "u-bahn.action.create:1:1,u-bahn.action.update:1:1,u-bahn.action.delete:1:1,u-bahn.action.aggregate:1:1,groups.notification.member.add:1:1,groups.notification.member.delete:1:1"
+      KAFKA_CREATE_TOPICS: "u-bahn.action.aggregate:1:1,groups.notification.member.add:1:1,groups.notification.member.delete:1:1"
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
   esearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.4.2

src/services/GroupsProcessorService.js

@@ -22,11 +22,11 @@ async function processMemberAdd (message, transactionId) {
       user[propertyName] = []
     }
     // check the group member does not exist
-    if (_.some(user[propertyName], { groupId })) {
+    if (_.some(user[propertyName], { id: groupId })) {
       logger.error(`userId: ${userId} is already a member of group with the groupId ${groupId}`)
       throw helper.getErrorWithStatus('[version_conflict_engine_exception]', 409)
     } else {
-      user[propertyName].push({ groupId, groupName })
+      user[propertyName].push({ id: groupId, name: groupName })
       await helper.updateUser(userId, user, seqNo, primaryTerm, transactionId)
     }
   } else {
@@ -61,11 +61,11 @@ async function processMemberDelete (message, transactionId) {
   const { seqNo, primaryTerm, user } = await helper.getUser(userId, transactionId)
 
   // check the group member exist
-  if (!user[propertyName] || !_.some(user[propertyName], { groupId })) {
+  if (!user[propertyName] || !_.some(user[propertyName], { id: groupId })) {
     logger.error(`The user: ${userId} not exist in group: ${groupId}`)
     throw helper.getErrorWithStatus('[resource_not_found_exception]', 404)
   } else {
-    _.remove(user[propertyName], { groupId })
+    _.remove(user[propertyName], { id: groupId })
     await helper.updateUser(userId, user, seqNo, primaryTerm, transactionId)
   }
 }

test/common/testHelper.js

@@ -52,12 +52,12 @@ async function getESRecord (payload) {
 async function getESGroupRecord (userId, groupId) {
   const propertyName = config.get('ES.USER_GROUP_PROPERTY_NAME')
   const { user } = await helper.getUser(userId)
-  if (!user || !user[propertyName] || !_.some(user[propertyName], { groupId })) {
+  if (!user || !user[propertyName] || !_.some(user[propertyName], { id: groupId })) {
     const err = Error('[resource_not_found_exception]')
     err.statusCode = 404
     throw err
   }
-  return _.find(user[propertyName], { groupId })
+  return _.find(user[propertyName], { id: groupId })
 }
 
 module.exports = {

test/e2e/test.js

@@ -310,7 +310,7 @@ describe('UBahn - Elasticsearch Data Processor E2E Test', () => {
       await sleep(1000)
       const ret = await getESGroupRecord(message.universalUID, message.groupId)
       const { groupId, name: groupName } = message
-      should.deepEqual(ret, { groupId, groupName })
+      should.deepEqual(ret, { id: groupId, name: groupName })
     })
 
     it(`test process add groups member message with duplicate id`, async () => {

test/unit/test.js

@@ -197,7 +197,7 @@ describe('UBahn - Elasticsearch Data Processor Unit Test', () => {
       await groupsProcessorService.processMemberAdd(groupsTopics.addData, 'transaction_11111')
       const ret = await getESGroupRecord(message.universalUID, message.groupId)
       const { groupId, name: groupName } = message
-      should.deepEqual(ret, { groupId, groupName })
+      should.deepEqual(ret, { id: groupId, name: groupName })
     })
 
     it(`test process add groups member message with duplicate id`, async () => {