Add notification sending when a reminder is triggered

Author: floflo0

pill_mate/backend/eslint.config.mjs

@@ -17,6 +17,7 @@ export default tseslint.config(
             globals: globals.node,
         },
         rules: {
+            'no-console': 'error',
             'max-len': ['error', { code: 100 }],
             indent: ['error', 4],
             semi: ['error', 'always'],

pill_mate/backend/src/app.ts

@@ -2,6 +2,7 @@ import express from 'express';
 import morgan from 'morgan';
 
 import { createLogger } from './logger';
+import homeAssistantRoutes from './routes/homeAssistantRoutes';
 import medicationRoutes from './routes/medicationRoutes';
 import reminderRoutes from './routes/reminderRoutes';
 import userRoutes from './routes/userRoutes';
@@ -24,6 +25,7 @@ app.use(express.json());
 
 app.use(homeAssistantHeaders);
 
+app.use('/homeassistant', homeAssistantRoutes);
 app.use('/medication', medicationRoutes);
 app.use('/reminder', reminderRoutes);
 app.use('/user', userRoutes);

pill_mate/backend/src/controllers/homeAssistantController.ts

@@ -0,0 +1,20 @@
+import assert from 'assert';
+
+import { Request, Response } from 'express';
+
+import { HTTP_200_OK } from '../status';
+import { asyncErrorHandler } from '../utils';
+import { HomeAssistantService } from '../services/HomeAssistantService';
+
+export const getMobileAppDevices = asyncErrorHandler(async (
+    request: Request,
+    response: Response,
+) => {
+    assert(request.user !== undefined);
+
+    const devies = await HomeAssistantService.getMobileAppDevices();
+
+    response
+        .status(HTTP_200_OK)
+        .json(devies.map(device => device.name));
+});

pill_mate/backend/src/controllers/userController.ts

@@ -12,6 +12,7 @@ import {
     HTTP_404_NOT_FOUND,
 } from '../status';
 import { asyncErrorHandler, checkUnexpectedKeys } from '../utils';
+import { HomeAssistantService } from '../services/HomeAssistantService';
 
 export const me = asyncErrorHandler(async (request: Request, response: Response) => {
     assert(request.user !== undefined);
@@ -21,6 +22,7 @@ export const me = asyncErrorHandler(async (request: Request, response: Response)
         userName: request.homeAssistantUserName,
         userDisplayName: request.homeAssistantUserDisplayName,
         role: request.user.role,
+        mobileAppDevice: request.user.mobileAppDevice,
     });
 });
 
@@ -35,15 +37,25 @@ export const me = asyncErrorHandler(async (request: Request, response: Response)
  *       properties:
  *         role:
  *           $ref: '#/components/schemas/UserRole'
+ *         mobileAppDevice:
+ *           type: string
+ *           nullable: true
+ *           description: The devices where notifications will be send.
+ *           example: Redmi Note 8T
  */
 type CreateUserBody = {
     role: unknown,
+    mobileAppDevice: unknown,
 };
 
 export const createUser = asyncErrorHandler(async (request: Request, response: Response) => {
-    if (!checkUnexpectedKeys<CreateUserBody>(request.body, ['role'], response)) return;
+    if (!checkUnexpectedKeys<CreateUserBody>(
+        request.body,
+        ['role', 'mobileAppDevice'],
+        response,
+    )) return;
 
-    const { role } = request.body as CreateUserBody;
+    const { role, mobileAppDevice } = request.body as CreateUserBody;
 
     if (role === undefined) {
         response
@@ -59,6 +71,19 @@ export const createUser = asyncErrorHandler(async (request: Request, response: R
         return;
     }
 
+    if ((mobileAppDevice !== undefined &&
+         mobileAppDevice !== null &&
+         typeof mobileAppDevice !== 'string') ||
+        (typeof mobileAppDevice === 'string' &&
+         (await HomeAssistantService.getMobileAppDevices()).find(
+             device => device.name === mobileAppDevice,
+         ) === undefined)) {
+        response
+            .status(HTTP_400_BAD_REQUEST)
+            .json({ message: 'Invalid mobileAppDevice.' });
+        return;
+    }
+
     const user = await User.findOne({
         where: {
             homeAssistantUserId: request.homeAssistantUserId,
@@ -75,6 +100,7 @@ export const createUser = asyncErrorHandler(async (request: Request, response: R
     const newUser = await User.create({
         homeAssistantUserId: request.homeAssistantUserId,
         role,
+        mobileAppDevice,
     });
 
     response
@@ -85,6 +111,7 @@ export const createUser = asyncErrorHandler(async (request: Request, response: R
             userName: request.homeAssistantUserName,
             userDisplayName: request.homeAssistantUserDisplayName,
             role: newUser.role,
+            mobileAppDevice: newUser.mobileAppDevice,
         });
 });
 

pill_mate/backend/src/index.ts

@@ -3,9 +3,9 @@ import { config } from 'dotenv';
 config({ path: '../.env' });
 
 import app from './app';
-import { HomeAssistantService } from './services/homeAssistantService';
+import { HomeAssistantService } from './services/HomeAssistantService';
 import { createLogger } from './logger';
-import { ReminderService } from './services/reminderService';
+import { ReminderService } from './services/ReminderService';
 import { sequelize } from './sequelize';
 
 const SUPERVISOR_TOKEN = process.env.SUPERVISOR_TOKEN;
@@ -20,9 +20,10 @@ const logger = createLogger('backend');
     }
 
     await Promise.all([
-        sequelize.sync({ alter: { drop: false } }).then(() => ReminderService.initAllTimeouts()),
+        sequelize.sync({ alter: { drop: false } }),
         HomeAssistantService.init(SUPERVISOR_TOKEN),
     ]);
+    await ReminderService.initAllTimeouts();
 
     app.listen(PORT, () => {
         logger.info(`Server running at http://localhost:${PORT}`);

pill_mate/backend/src/models/MedicationUnit.ts

@@ -1,3 +1,4 @@
+import assert from 'assert';
 /**
  * @openapi
  * components:
@@ -25,3 +26,20 @@ export enum MedicationUnit {
 export const isMedicationUnit = (value: unknown): value is MedicationUnit => {
     return typeof value === 'number' && value in MedicationUnit;
 };
+
+export const medicationUnitToString = (medicationUnit: MedicationUnit, plural: boolean) => {
+    switch (medicationUnit) {
+    case MedicationUnit.TABLET:
+        return plural ? 'comprimés' : 'comprimé';
+    case MedicationUnit.PILL:
+        return plural ? 'pilules' : 'pilule';
+    case MedicationUnit.ML:
+        return plural ? 'millilitres' : 'millilitre';
+    case MedicationUnit.DROPS:
+        return 'gouttes';
+    case MedicationUnit.UNIT:
+        return plural ? 'unités' : 'unité';
+    default:
+        assert(false, 'unreachable');
+    }
+};

pill_mate/backend/src/models/Reminder.ts

@@ -1,3 +1,8 @@
+import {
+    BelongsToCreateAssociationMixin,
+    BelongsToGetAssociationMixin,
+    BelongsToSetAssociationMixin,
+} from 'sequelize';
 import {
     AllowNull,
     BeforeCreate,
@@ -12,7 +17,7 @@ import {
     Table,
 } from 'sequelize-typescript';
 
-import { ReminderService } from '../services/reminderService';
+import { ReminderService } from '../services/ReminderService';
 import { Medication } from './Medication';
 import { User } from './User';
 
@@ -74,14 +79,18 @@ export class Reminder extends Model {
     @Column(DataType.DATEONLY)
     declare nextDate: string;
 
-    @BelongsTo(() => Medication)
-    declare medication: Medication;
-
     @ForeignKey(() => Medication)
     @AllowNull(false)
     @Column
     declare medicationId: number;
 
+    @BelongsTo(() => Medication)
+    declare medication: Medication;
+
+    declare getMedication: BelongsToGetAssociationMixin<Medication>;
+    declare setMedication: BelongsToSetAssociationMixin<Medication, number>;
+    declare createMedication: BelongsToCreateAssociationMixin<Medication>;
+
     @ForeignKey(() => User)
     @AllowNull(false)
     @Column
@@ -90,6 +99,10 @@ export class Reminder extends Model {
     @BelongsTo(() => User)
     declare user: User;
 
+    declare getUser: BelongsToGetAssociationMixin<User>;
+    declare setUser: BelongsToSetAssociationMixin<User, number>;
+    declare createUser: BelongsToCreateAssociationMixin<User>;
+
     /**
      * Computes the exact `Date` object when the reminder should trigger.
      *
@@ -100,6 +113,8 @@ export class Reminder extends Model {
         const nextDate = new Date(this.nextDate);
         nextDate.setHours(hours, minutes, 0, 0);
         return nextDate;
+
+
     }
 
     @BeforeCreate

pill_mate/backend/src/models/User.ts

@@ -25,6 +25,7 @@ import {
     BelongsToMany,
     Column,
     DataType,
+    Default,
     ForeignKey,
     HasMany,
     Length,
@@ -62,6 +63,11 @@ import { UserRole } from './UserRole';
  *           example: John Doe
  *         role:
  *           $ref: '#/components/schemas/UserRole'
+ *         mobileAppDevice:
+ *           type: string
+ *           nullable: true
+ *           description: The devices where notifications will be send.
+ *           example: Redmi Note 8T
  */
 
 @Table({ timestamps: false })
@@ -77,6 +83,10 @@ export class User extends Model {
     @Column
     declare role: UserRole;
 
+    @Default(null)
+    @Column(DataType.STRING(255))
+    declare mobileAppDevice: string | null;
+
     @BelongsToMany(() => User, () => UserHelp)
     declare helpedUsers: User[];
 

pill_mate/backend/src/routes/homeAssistantRoutes.test.ts

@@ -0,0 +1,116 @@
+import request from 'supertest';
+
+import app from '../app';
+
+import { User } from '../models/User';
+import { UserRole } from '../models/UserRole';
+import { HomeAssistantService } from '../services/HomeAssistantService';
+
+jest.mock('../models/User', () => {
+    return {
+        User: {
+            findOne: jest.fn(),
+        },
+    };
+});
+
+jest.mock('../services/HomeAssistantService', () => {
+    return {
+        HomeAssistantService: {
+            getMobileAppDevices: jest.fn(),
+        },
+    };
+});
+
+beforeEach(() => {
+    jest.clearAllMocks();
+});
+
+describe('GET /homeassistant/mobile-app-devices', () => {
+    it('should return 400 if the x-remote-user-id header is missing', async () => {
+        const response = await request(app)
+            .get('/homeassistant/mobile-app-devices')
+            .set('x-remote-user-name', 'johndoe')
+            .set('x-remote-user-display-name', 'John Doe');
+        expect(response.body).toStrictEqual({
+            message: 'Missing required header: x-remote-user-id.',
+        });
+        expect(response.status).toBe(400);
+    });
+
+    it('should return 400 if the x-remote-user-id is not a valid user id', async () => {
+        const response = await request(app)
+            .get('/homeassistant/mobile-app-devices')
+            .set('x-remote-user-id', 'bad home assistant id')
+            .set('x-remote-user-name', 'johndoe')
+            .set('x-remote-user-display-name', 'John Doe');
+        expect(response.body).toStrictEqual({
+            message: 'Invalid home assistant user id in x-remote-user-id.',
+        });
+        expect(response.status).toBe(400);
+    });
+
+    it('should return 400 if the x-remote-user-name header is missing', async () => {
+        const response = await request(app)
+            .get('/homeassistant/mobile-app-devices')
+            .set('x-remote-user-id', 'c355d2aaeee44e4e84ff8394fa4794a9')
+            .set('x-remote-user-display-name', 'John Doe');
+        expect(response.body).toStrictEqual({
+            message: 'Missing required header: x-remote-user-name.',
+        });
+        expect(response.status).toBe(400);
+    });
+
+    it('should return 400 if the x-remote-user-display-name header is missing', async () => {
+        const response = await request(app)
+            .get('/homeassistant/mobile-app-devices')
+            .set('x-remote-user-id', 'c355d2aaeee44e4e84ff8394fa4794a9')
+            .set('x-remote-user-name', 'johndoe');
+        expect(response.body).toStrictEqual({
+            message: 'Missing required header: x-remote-user-display-name.',
+        });
+        expect(response.status).toBe(400);
+    });
+
+    it('should return 401 if user is not in the database', async () => {
+        (User.findOne as jest.Mock).mockResolvedValue(null);
+
+        const response = await request(app)
+            .get('/homeassistant/mobile-app-devices')
+            .set('x-remote-user-id', 'c355d2aaeee44e4e84ff8394fa4794a9')
+            .set('x-remote-user-name', 'johndoe')
+            .set('x-remote-user-display-name', 'John Doe');
+        expect(response.body).toStrictEqual({ message: 'User not registered.' });
+        expect(response.status).toBe(401);
+        expect(User.findOne).toHaveBeenCalledTimes(1);
+        expect(User.findOne).toHaveBeenCalledWith({
+            where: { homeAssistantUserId: 'c355d2aaeee44e4e84ff8394fa4794a9' },
+        });
+    });
+
+    it('should return the list of the names of the available devices', async () => {
+        (User.findOne as jest.Mock).mockResolvedValue({
+            id: 1,
+            homeAssistantUserId: 'c355d2aaeee44e4e84ff8394fa4794a9',
+            role: UserRole.HELPED,
+            mobileAppDevice: 'Redmi Note 8T',
+        });
+
+        (HomeAssistantService.getMobileAppDevices as jest.Mock).mockResolvedValue([
+            { name: 'Redmi Note 8T' },
+            { name: 'Redmi Note 9' },
+        ]);
+
+        const response = await request(app)
+            .get('/homeassistant/mobile-app-devices')
+            .set('x-remote-user-id', 'c355d2aaeee44e4e84ff8394fa4794a9')
+            .set('x-remote-user-name', 'johndoe')
+            .set('x-remote-user-display-name', 'John Doe');
+        expect(response.body).toStrictEqual(['Redmi Note 8T', 'Redmi Note 9']);
+        expect(response.status).toBe(200);
+        expect(User.findOne).toHaveBeenCalledTimes(1);
+        expect(User.findOne).toHaveBeenCalledWith({
+            where: { homeAssistantUserId: 'c355d2aaeee44e4e84ff8394fa4794a9' },
+        });
+    });
+});