Skip deleted actors for backfilling lastLoginAt (#1671)

* Fixes getodk/central#1447: skip deleted actor for backfilling lastLoginAt

* PR Feedback

Author: sadiqkhoja

lib/model/migrations/20250910-02-backfill-last-login-at.js

@@ -20,7 +20,9 @@ const up = (db) =>
         AND "actorId" IS NOT NULL
       GROUP BY "actorId"
     ) AS latest_login
-    WHERE users."actorId" = latest_login."actorId";
+    JOIN actors ON actors.id = latest_login."actorId"
+    WHERE users."actorId" = latest_login."actorId"
+      AND actors."deletedAt" IS NULL;
   `);
 
 const down = (db) =>

test/db-migrations/20250910-02-backfill-last-login-at.spec.js

@@ -6,22 +6,25 @@ describeMigration('20250910-02-backfill-last-login-at', ({ runMigrationBeingTest
     await rowsExistFor('actees',
       { id: 'actee1', species: 'user' },
       { id: 'actee2', species: 'user' },
-      { id: 'actee3', species: 'user' }
+      { id: 'actee3', species: 'user' },
+      { id: 'actee4', species: 'user' },
     );
 
     await rowsExistFor('actors',
       { id: 1, type: 'user', acteeId: 'actee1', displayName: 'Alice', createdAt: new Date('2025-01-01T10:00:00Z') },
       { id: 2, type: 'user', acteeId: 'actee2', displayName: 'Bob', createdAt: new Date('2025-01-01T11:00:00Z') },
-      { id: 3, type: 'user', acteeId: 'actee3', displayName: 'Charlie', createdAt: new Date('2025-01-01T12:00:00Z') }
+      { id: 3, type: 'user', acteeId: 'actee3', displayName: 'Charlie', createdAt: new Date('2025-01-01T12:00:00Z') },
+      { id: 4, type: 'user', acteeId: 'actee4', displayName: 'Dave', createdAt: new Date('2025-01-01T12:00:00Z') }
     );
 
     await rowsExistFor('users',
       { actorId: 1, email: '[email protected]', lastLoginAt: null },
       { actorId: 2, email: '[email protected]', lastLoginAt: null },
-      { actorId: 3, email: '[email protected]', lastLoginAt: null }
+      { actorId: 3, email: '[email protected]', lastLoginAt: null },
+      { actorId: 4, email: '[email protected]', lastLoginAt: null }
     );
 
-    // Create audit records - Alice has multiple logins, Bob has one, Charlie has none
+    // Create audit records - Alice has multiple logins, Bob has one, Charlie has none, Dave has one
     await rowsExistFor('audits',
       // Alice's login sessions (most recent should be picked)
       { actorId: 1, action: 'user.session.create', acteeId: 'actee1', loggedAt: new Date('2025-01-10T10:00:00Z') },
@@ -30,6 +33,27 @@ describeMigration('20250910-02-backfill-last-login-at', ({ runMigrationBeingTest
 
       // Bob's single login session
       { actorId: 2, action: 'user.session.create', acteeId: 'actee2', loggedAt: new Date('2025-01-08T16:45:00Z') },
+
+      // Dave's single login session
+      { actorId: 4, action: 'user.session.create', acteeId: 'actee4', loggedAt: new Date('2025-01-08T16:45:00Z') },
+    );
+
+    // Delete Dave
+    await db.any(sql`UPDATE actors SET "deletedAt" = '2025-02-01T00:00:00Z' WHERE id = 4`);
+
+    // Create Dave again
+    await rowsExistFor('actees',
+      { id: 'actee5', species: 'user' }
+    );
+    await rowsExistFor('actors',
+      { id: 5, type: 'user', acteeId: 'actee5', displayName: 'NewDave', createdAt: new Date('2025-03-01T00:00:00Z') }
+    );
+    await rowsExistFor('users',
+      { actorId: 5, email: '[email protected]', lastLoginAt: null }
+    );
+    // Login with new Dave
+    await rowsExistFor('audits',
+      { actorId: 5, action: 'user.session.create', acteeId: 'actee5', loggedAt: new Date('2025-03-20T10:00:00Z') }
     );
 
     await runMigrationBeingTested();
@@ -44,7 +68,13 @@ describeMigration('20250910-02-backfill-last-login-at', ({ runMigrationBeingTest
       { actorId: 2, email: '[email protected]', lastLoginAt: 1736354700000 },
 
       // Charlie should remain null (never logged in)
-      { actorId: 3, email: '[email protected]', lastLoginAt: null }
+      { actorId: 3, email: '[email protected]', lastLoginAt: null },
+
+      // Dave should remain null because actor is deleted
+      { actorId: 4, email: '[email protected]', lastLoginAt: null },
+
+      // New Dave should get his login time (2025-03-20T10:00:00Z)
+      { actorId: 5, email: '[email protected]', lastLoginAt: 1742464800000 },
     );
   });
 });