#76 - Correct message format passed to bus api

callmekatootie · callmekatootie · commit b4cd25dc63db · 2021-01-07T14:59:50.000+05:30
diff --git a/src/modules/achievement/service.js b/src/modules/achievement/service.js
@@ -29,7 +29,7 @@ async function create (entity, auth) {
   await dbHelper.makeSureUnique(Achievement, entity, uniqueFields)
 
   const result = await dbHelper.create(Achievement, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
 
   return result
 }
@@ -61,7 +61,7 @@ async function patch (id, entity, auth, params) {
   await dbHelper.makeSureUnique(Achievement, entity, uniqueFields, params)
 
   const newEntity = await dbHelper.update(Achievement, id, entity, auth, params)
-  await serviceHelper.patchRecordInEs(resource, newEntity)
+  await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)
 
   return newEntity
 }
diff --git a/src/modules/achievementsProvider/service.js b/src/modules/achievementsProvider/service.js
@@ -26,7 +26,7 @@ async function create (entity, auth) {
   await dbHelper.makeSureUnique(AchievementsProvider, entity, uniqueFields)
 
   const result = await dbHelper.create(AchievementsProvider, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
 
   return result
 }
@@ -50,7 +50,7 @@ async function patch (id, entity, auth, params) {
   await dbHelper.makeSureUnique(AchievementsProvider, entity, uniqueFields)
 
   const newEntity = await dbHelper.update(AchievementsProvider, id, entity, auth)
-  await serviceHelper.patchRecordInEs(resource, newEntity)
+  await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)
 
   return newEntity
 }
diff --git a/src/modules/attribute/service.js b/src/modules/attribute/service.js
@@ -28,7 +28,7 @@ async function create (entity, auth) {
   await dbHelper.makeSureUnique(Attribute, entity, uniqueFields)
 
   const result = await dbHelper.create(Attribute, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
   return result
 }
 
@@ -55,7 +55,7 @@ async function patch (id, entity, auth, params) {
   await dbHelper.makeSureUnique(Attribute, entity, uniqueFields)
 
   const newEntity = await dbHelper.update(Attribute, id, entity, auth)
-  await serviceHelper.patchRecordInEs(resource, newEntity)
+  await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)
   return newEntity
 }
 
diff --git a/src/modules/attributeGroup/service.js b/src/modules/attributeGroup/service.js
@@ -28,7 +28,7 @@ async function create (entity, auth) {
   await dbHelper.makeSureUnique(AttributeGroup, entity, uniqueFields)
 
   const result = await dbHelper.create(AttributeGroup, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
   return result
 }
 
@@ -55,7 +55,7 @@ async function patch (id, entity, auth, params) {
   await dbHelper.makeSureUnique(AttributeGroup, entity, uniqueFields)
 
   const newEntity = await dbHelper.update(AttributeGroup, id, entity, auth)
-  await serviceHelper.patchRecordInEs(resource, newEntity)
+  await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)
   return newEntity
 }
 
diff --git a/src/modules/externalProfile/service.js b/src/modules/externalProfile/service.js
@@ -30,7 +30,7 @@ async function create (entity, auth) {
   await dbHelper.makeSureUnique(ExternalProfile, entity, uniqueFields)
 
   const result = await dbHelper.create(ExternalProfile, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
 
   return result
 }
@@ -61,7 +61,7 @@ async function patch (id, entity, auth, params) {
   await dbHelper.makeSureUnique(ExternalProfile, entity, uniqueFields, params)
 
   const newEntity = await dbHelper.update(ExternalProfile, id, entity, auth, params)
-  await serviceHelper.patchRecordInEs(resource, newEntity)
+  await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)
 
   return newEntity
 }
diff --git a/src/modules/organization/service.js b/src/modules/organization/service.js
@@ -27,7 +27,7 @@ const uniqueFields = [['name']]
 async function create (entity, auth) {
   await dbHelper.makeSureUnique(Organization, entity, uniqueFields)
   const result = await dbHelper.create(Organization, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
 
   return result
 }
@@ -50,7 +50,7 @@ create.schema = {
 async function patch (id, entity, auth, params) {
   await dbHelper.makeSureUnique(Organization, entity, uniqueFields)
   const newEntity = await dbHelper.update(Organization, id, entity, auth)
-  await serviceHelper.patchRecordInEs(resource, newEntity)
+  await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)
 
   return newEntity
 }
diff --git a/src/modules/organizationSkillsProvider/service.js b/src/modules/organizationSkillsProvider/service.js
@@ -29,7 +29,7 @@ async function create (entity, auth) {
   await dbHelper.makeSureUnique(OrganizationSkillsProvider, entity, uniqueFields)
 
   const result = await dbHelper.create(OrganizationSkillsProvider, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
 
   return result
 }
@@ -61,7 +61,7 @@ async function patch (id, entity, auth, params) {
   await dbHelper.makeSureUnique(OrganizationSkillsProvider, entity, uniqueFields, params)
 
   const newEntity = await dbHelper.update(OrganizationSkillsProvider, id, entity, auth, params)
-  await serviceHelper.patchRecordInEs(resource, newEntity)
+  await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)
 
   return newEntity
 }
diff --git a/src/modules/role/service.js b/src/modules/role/service.js
@@ -26,7 +26,7 @@ async function create (entity, auth) {
   await dbHelper.makeSureUnique(Role, entity, uniqueFields)
 
   const result = await dbHelper.create(Role, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
 
   return result
 }
@@ -50,7 +50,7 @@ async function patch (id, entity, auth, params) {
   await dbHelper.makeSureUnique(Role, entity, uniqueFields)
 
   const newEntity = await dbHelper.update(Role, id, entity, auth)
-  await serviceHelper.patchRecordInEs(resource, newEntity)
+  await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)
 
   return newEntity
 }
diff --git a/src/modules/skill/service.js b/src/modules/skill/service.js
@@ -28,7 +28,7 @@ async function create (entity, auth) {
   await dbHelper.makeSureUnique(Skill, entity, uniqueFields)
 
   const result = await dbHelper.create(Skill, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
 
   return result
 }
@@ -58,7 +58,7 @@ async function patch (id, entity, auth, params) {
   await dbHelper.makeSureUnique(Skill, entity, uniqueFields)
 
   const newEntity = await dbHelper.update(Skill, id, entity, auth)
-  await serviceHelper.patchRecordInEs(resource, newEntity)
+  await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)
 
   return newEntity
 }
diff --git a/src/modules/skillsProvider/service.js b/src/modules/skillsProvider/service.js
@@ -24,7 +24,7 @@ const resource = serviceHelper.getResource('SkillsProvider')
  */
 async function create (entity, auth) {
   const result = await dbHelper.create(SkillsProvider, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
   return result
 }
 
@@ -45,7 +45,7 @@ create.schema = {
  */
 async function patch (id, entity, auth, params) {
   const newEntity = await dbHelper.update(SkillsProvider, id, entity, auth)
-  await serviceHelper.patchRecordInEs(resource, newEntity)
+  await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)
   return newEntity
 }
 
diff --git a/src/modules/user/service.js b/src/modules/user/service.js
@@ -31,7 +31,7 @@ async function create (entity, auth) {
   await dbHelper.makeSureUnique(User, entity, uniqueFields)
 
   const result = await dbHelper.create(User, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
 
   return result
 }
@@ -57,7 +57,7 @@ async function patch (id, entity, auth, params) {
   await dbHelper.makeSureUnique(User, entity, uniqueFields)
 
   const newEntity = await dbHelper.update(User, id, entity, auth)
-  await serviceHelper.patchRecordInEs(resource, newEntity)
+  await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)
 
   return newEntity
 }
diff --git a/src/modules/usersAttribute/service.js b/src/modules/usersAttribute/service.js
@@ -29,7 +29,7 @@ async function create (entity, auth) {
   await dbHelper.makeSureUnique(UserAttribute, entity, uniqueFields)
 
   const result = await dbHelper.create(UserAttribute, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
 
   return result
 }
@@ -62,7 +62,7 @@ async function patch (id, entity, auth, params) {
   await dbHelper.makeSureUnique(UserAttribute, entity, uniqueFields, params)
 
   const newEntity = await dbHelper.update(UserAttribute, id, entity, auth, params)
-  await serviceHelper.patchRecordInEs(resource, newEntity)
+  await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)
 
   return newEntity
 }
diff --git a/src/modules/usersRole/service.js b/src/modules/usersRole/service.js
@@ -29,7 +29,7 @@ async function create (entity, auth) {
   await dbHelper.makeSureUnique(UsersRole, entity, uniqueFields)
 
   const result = await dbHelper.create(UsersRole, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
 
   return result
 }
diff --git a/src/modules/usersSkill/service.js b/src/modules/usersSkill/service.js
@@ -28,7 +28,7 @@ async function create (entity, auth) {
   await dbHelper.makeSureUnique(UsersSkill, entity, uniqueFields)
 
   const result = await dbHelper.create(UsersSkill, entity, auth)
-  await serviceHelper.createRecordInEs(resource, result)
+  await serviceHelper.createRecordInEs(resource, result.dataValues)
 
   return result
 }
@@ -63,7 +63,7 @@ async function patch (id, entity, auth, params) {
   await dbHelper.makeSureUnique(UsersSkill, entity, uniqueFields, params)
 
   const newEntity = await dbHelper.update(UsersSkill, id, entity, auth, params)
-  await serviceHelper.patchRecordInEs(resource, newEntity)
+  await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)
 
   return newEntity
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ async function create (entity, auth) {`
`29`	`29`	`await dbHelper.makeSureUnique(Achievement, entity, uniqueFields)`
`30`	`30`
`31`	`31`	`const result = await dbHelper.create(Achievement, entity, auth)`
`32`		`- await serviceHelper.createRecordInEs(resource, result)`
	`32`	`+ await serviceHelper.createRecordInEs(resource, result.dataValues)`
`33`	`33`
`34`	`34`	`return result`
`35`	`35`	`}`
`@@ -61,7 +61,7 @@ async function patch (id, entity, auth, params) {`
`61`	`61`	`await dbHelper.makeSureUnique(Achievement, entity, uniqueFields, params)`
`62`	`62`
`63`	`63`	`const newEntity = await dbHelper.update(Achievement, id, entity, auth, params)`
`64`		`- await serviceHelper.patchRecordInEs(resource, newEntity)`
	`64`	`+ await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)`
`65`	`65`
`66`	`66`	`return newEntity`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ async function create (entity, auth) {`
`26`	`26`	`await dbHelper.makeSureUnique(AchievementsProvider, entity, uniqueFields)`
`27`	`27`
`28`	`28`	`const result = await dbHelper.create(AchievementsProvider, entity, auth)`
`29`		`- await serviceHelper.createRecordInEs(resource, result)`
	`29`	`+ await serviceHelper.createRecordInEs(resource, result.dataValues)`
`30`	`30`
`31`	`31`	`return result`
`32`	`32`	`}`
`@@ -50,7 +50,7 @@ async function patch (id, entity, auth, params) {`
`50`	`50`	`await dbHelper.makeSureUnique(AchievementsProvider, entity, uniqueFields)`
`51`	`51`
`52`	`52`	`const newEntity = await dbHelper.update(AchievementsProvider, id, entity, auth)`
`53`		`- await serviceHelper.patchRecordInEs(resource, newEntity)`
	`53`	`+ await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)`
`54`	`54`
`55`	`55`	`return newEntity`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ async function create (entity, auth) {`
`28`	`28`	`await dbHelper.makeSureUnique(Attribute, entity, uniqueFields)`
`29`	`29`
`30`	`30`	`const result = await dbHelper.create(Attribute, entity, auth)`
`31`		`- await serviceHelper.createRecordInEs(resource, result)`
	`31`	`+ await serviceHelper.createRecordInEs(resource, result.dataValues)`
`32`	`32`	`return result`
`33`	`33`	`}`
`34`	`34`
`@@ -55,7 +55,7 @@ async function patch (id, entity, auth, params) {`
`55`	`55`	`await dbHelper.makeSureUnique(Attribute, entity, uniqueFields)`
`56`	`56`
`57`	`57`	`const newEntity = await dbHelper.update(Attribute, id, entity, auth)`
`58`		`- await serviceHelper.patchRecordInEs(resource, newEntity)`
	`58`	`+ await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)`
`59`	`59`	`return newEntity`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ async function create (entity, auth) {`
`30`	`30`	`await dbHelper.makeSureUnique(ExternalProfile, entity, uniqueFields)`
`31`	`31`
`32`	`32`	`const result = await dbHelper.create(ExternalProfile, entity, auth)`
`33`		`- await serviceHelper.createRecordInEs(resource, result)`
	`33`	`+ await serviceHelper.createRecordInEs(resource, result.dataValues)`
`34`	`34`
`35`	`35`	`return result`
`36`	`36`	`}`
`@@ -61,7 +61,7 @@ async function patch (id, entity, auth, params) {`
`61`	`61`	`await dbHelper.makeSureUnique(ExternalProfile, entity, uniqueFields, params)`
`62`	`62`
`63`	`63`	`const newEntity = await dbHelper.update(ExternalProfile, id, entity, auth, params)`
`64`		`- await serviceHelper.patchRecordInEs(resource, newEntity)`
	`64`	`+ await serviceHelper.patchRecordInEs(resource, newEntity.dataValues)`
`65`	`65`
`66`	`66`	`return newEntity`
`67`	`67`	`}`