fix(data): add deleted rows back to patient to prevent misalignment of patient IDs (#584)

In #582, rows were removed from the QuestionnaireDB `patient` table, to let the `SyncPublishQuestionnaire` event populate this table.

However, this caused a misalignment of patient IDs, because deleted patients were no longer being added to the table. This led to rows in `answerQuestionnaire` and `answer` being misattributed to the wrong users (e.g., a row in `answerQuestionnaire` previously attributing a questionnaire to Laurie, patient 9, was now linking it to Kathy, new patient 9).

This PR adds all row inserts back to `patient` (including the deleted rows), to fix the offset in IDs (e.g. restoring Laurie as patient 9), and to prevent issues with unpredictable syncing in general. This will also allow us to more easily clean up questionnaire data for deleted users.

Author: staceybeard

db_management/questionnairedb/data/test/answers.sql

@@ -2,6 +2,7 @@
 --
 -- SPDX-License-Identifier: AGPL-3.0-or-later
 
+-- TODO clean up data for deleted patientIds (see db_management/questionnairedb/data/test/omi/patients.sql)
 INSERT INTO `answer` (`ID`, `questionnaireId`, `sectionId`, `questionId`, `typeId`, `answerSectionId`, `languageId`, `patientId`, `answered`, `skipped`, `deleted`, `deletedBy`, `creationDate`, `createdBy`, `lastUpdated`, `updatedBy`) VALUES
 (281, 11, 11, 823, 2, 55, -1, 1, 1, 0, 0, '', '2016-11-25 18:18:38', 'QUESTIONNAIRE_MIGRATION_2019', '2023-06-02 14:25:14', 'QUESTIONNAIRE_MIGRATION_2019'),
 (282, 11, 11, 824, 2, 55, -1, 1, 1, 0, 0, '', '2016-11-25 18:18:38', 'QUESTIONNAIRE_MIGRATION_2019', '2023-06-02 14:25:14', 'QUESTIONNAIRE_MIGRATION_2019'),
@@ -2797,6 +2798,7 @@ SET creationDate = DATE_ADD(now(), INTERVAL -13 DAY),
 WHERE questionnaireId=204
 and sectionId=154;
 
+-- TODO clean up data for deleted patientIds (see db_management/questionnairedb/data/test/omi/patients.sql)
 INSERT INTO `answerQuestionnaire` (`ID`, `questionnaireId`, `patientId`, `status`, `deleted`, `deletedBy`, `creationDate`, `createdBy`, `lastUpdated`, `updatedBy`, `respondentUsername`, `respondentDisplayName`) VALUES
 -- esas-r answer instances for bart homer and marge and lisa and rory
 (184, 136, 1, 0, 0, '', '2000-01-01 00:00:00', 'QUESTIONNAIRE_V2_AUTO_SYNC', '2000-01-01 00:00:00', '3_APP_100.100.100', '', ''),

db_management/questionnairedb/data/test/ohigph/patients.sql

@@ -2,4 +2,7 @@
 --
 -- SPDX-License-Identifier: AGPL-3.0-or-later
 
--- patients get synced automatically via the DB event that runs periodically
+-- TODO Rows in `answerQuestionnaire` and `answer` from `db_management/questionnairedb/data/test/answers.sql` may not line up
+-- TODO   with the right PatientIds based on data synced here. Consider separating questionnaire answers per hospital.
+
+-- patients get synced automatically via the DB event SyncPublishQuestionnaire that runs periodically

db_management/questionnairedb/data/test/omi/patients.sql

@@ -2,4 +2,30 @@
 --
 -- SPDX-License-Identifier: AGPL-3.0-or-later
 
--- patients get synced automatically via the DB event that runs periodically
+-- Legacy (deleted) test patients are kept until all their remaining data in QuestionnaireDB is cleaned up
+-- Otherwise, data linked to certain patientIds will be orphaned
+REPLACE INTO `patient` (`ID`, `hospitalId`, `externalId`, `deleted`, `deletedBy`, `creationDate`, `createdBy`, `lastUpdated`, `updatedBy`) VALUES
+(1, -1, 51, 1, '', '2025-01-01 00:00:00', 'TEST_DATA_MARGE_DELETED', '2025-01-01 00:00:00', 'TEST_DATA'),
+(2, -1, 52, 1, '', '2025-01-01 00:00:00', 'TEST_DATA_HOMER_DELETED', '2025-01-01 00:00:00', 'TEST_DATA'),
+(3, -1, 53, 1, '', '2025-01-01 00:00:00', 'TEST_DATA_BART_DELETED', '2025-01-01 00:00:00', 'TEST_DATA'),
+(5, -1, 55, 1, '', '2025-01-01 00:00:00', 'TEST_DATA_MONA_DELETED', '2025-01-01 00:00:00', 'TEST_DATA'),
+(6, -1, 56, 1, '', '2025-01-01 00:00:00', 'TEST_DATA_FRED_DELETED', '2025-01-01 00:00:00', 'TEST_DATA'),
+(7, -1, 57, 1, '', '2025-01-01 00:00:00', 'TEST_DATA_PEBBLES_DELETED', '2025-01-01 00:00:00', 'TEST_DATA'),
+(8, -1, 58, 1, '', '2025-01-01 00:00:00', 'TEST_DATA_WEDNESDAY_DELETED', '2025-01-01 00:00:00', 'TEST_DATA'),
+
+(9, -1, 92, 0, '', '2025-01-01 00:00:00', 'TEST_DATA_LAURIE', '2025-01-01 00:00:00', 'TEST_DATA'),
+(10, -1, 59, 0, '', '2025-01-01 00:00:00', 'TEST_DATA_RORY', '2025-01-01 00:00:00', 'TEST_DATA'),
+(11, -1, 93, 0, '', '2025-01-01 00:00:00', 'TEST_DATA_JOHN', '2025-01-01 00:00:00', 'TEST_DATA'),
+(12, -1, 94, 0, '', '2025-01-01 00:00:00', 'TEST_DATA_RICHARD', '2025-01-01 00:00:00', 'TEST_DATA'),
+(13, -1, 96, 0, '', '2025-01-01 00:00:00', 'TEST_DATA_CARA', '2025-01-01 00:00:00', 'TEST_DATA'),
+(14, -1, 99, 0, '', '2025-01-01 00:00:00', 'TEST_DATA_VALERIE', '2025-01-01 00:00:00', 'TEST_DATA'),
+(15, -1, 100, 0, '', '2025-01-01 00:00:00', 'TEST_DATA_PETE', '2025-01-01 00:00:00', 'TEST_DATA'),
+(16, -1, 101, 0, '', '2025-01-01 00:00:00', 'TEST_DATA_MARTIN', '2025-01-01 00:00:00', 'TEST_DATA'),
+(17, -1, 102, 0, '', '2025-01-01 00:00:00', 'TEST_DATA_KATHY', '2025-01-01 00:00:00', 'TEST_DATA'),
+(18, -1, 103, 0, '', '2025-01-01 00:00:00', 'TEST_DATA_MIKE', '2025-01-01 00:00:00', 'TEST_DATA');
+
+-- Update all timestamps to the current time
+UPDATE `patient`
+SET
+`creationDate` = now(),
+`lastUpdated` = now();