Fix #1293 : Telegram messages should be formatted with the right user…

… unit preferences
GladysAssistant · Nov 12, 2021 · a78af0a · a78af0a
1 parent 7ed2d52
commit a78af0a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/server/lib/user/user.getByTelegramUserId.js b/server/lib/user/user.getByTelegramUserId.js
@@ -14,13 +14,25 @@ const { NotFoundError } = require('../../utils/coreErrors');
 async function getByTelegramUserId(telegramUserId) {
   const user = await db.User.findOne({
     where: { telegram_user_id: telegramUserId },
-    attributes: ['id', 'language'],
-    raw: true,
+    attributes: [
+      'id',
+      'firstname',
+      'lastname',
+      'selector',
+      'email',
+      'language',
+      'birthdate',
+      'role',
+      'temperature_unit_preference',
+      'distance_unit_preference',
+      'created_at',
+      'updated_at',
+    ],
   });
   if (user === null) {
     throw new NotFoundError(`User with telegram_user_id "${telegramUserId}" not found`);
   }
-  return user;
+  return user.get({ plain: true });
 }
 
 module.exports = {

diff --git a/server/test/lib/user/user.getByTelegramUserId.test.js b/server/test/lib/user/user.getByTelegramUserId.test.js
@@ -8,7 +8,17 @@ describe('user.getByTelegramUserId', () => {
     const userFound = await user.getByTelegramUserId('555555555');
     expect(userFound).to.deep.equal({
       id: '0cd30aef-9c4e-4a23-88e3-3547971296e5',
+      firstname: 'John',
+      lastname: 'Doe',
+      selector: 'john',
+      email: 'demo@demo.com',
       language: 'en',
+      birthdate: '12/12/1990',
+      temperature_unit_preference: 'celsius',
+      distance_unit_preference: 'metric',
+      role: 'admin',
+      created_at: new Date('2019-02-12T07:49:07.556Z'),
+      updated_at: new Date('2019-02-12T07:49:07.556Z'),
     });
   });
   it('should throw notFound error', async () => {