kyle/vip-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: restore soft-deleted driver record when re-enabling driver toggle

Browse Source 
When a coordinator's driver status was toggled off (soft-delete) and
then back on, the create failed because the soft-deleted record still
existed. Now checks for active vs soft-deleted driver records and
restores the existing record instead of trying to create a duplicate.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
kyle
2026-02-03 21:49:58 +01:00
parent 858793d698
commit 21fb193d01
1 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
backend/src/users/users.service.ts
View File

@@ -38,8 +38,20 @@ export class UsersService {
const { isAlsoDriver, ...prismaData } = updateUserDto;
const effectiveRole = updateUserDto.role || user.role;
// Handle role change to DRIVER: auto-create driver record
if (updateUserDto.role === Role.DRIVER && !user.driver) {
const hasActiveDriver = user.driver && !user.driver.deletedAt;
const hasSoftDeletedDriver = user.driver && user.driver.deletedAt;
// Handle role change to DRIVER: auto-create or restore driver record
if (updateUserDto.role === Role.DRIVER && !hasActiveDriver) {
if (hasSoftDeletedDriver) {
this.logger.log(
`Restoring soft-deleted Driver record for user ${user.email} (role change to DRIVER)`,
);
await this.prisma.driver.update({
where: { id: user.driver!.id },
data: { deletedAt: null, name: user.name || user.email },
});
} else {
this.logger.log(
`Creating Driver record for user ${user.email} (role change to DRIVER)`,
);
@@ -51,12 +63,22 @@ export class UsersService {
},
});
}
}
// When promoting FROM DRIVER to Admin/Coordinator, keep the driver record
// (admin can explicitly uncheck the driver box later if they want)
// Handle "Also a Driver" toggle (independent of role)
if (isAlsoDriver === true && !user.driver) {
if (isAlsoDriver === true && !hasActiveDriver) {
if (hasSoftDeletedDriver) {
this.logger.log(
`Restoring soft-deleted Driver record for user ${user.email} (isAlsoDriver toggled on)`,
);
await this.prisma.driver.update({
where: { id: user.driver!.id },
data: { deletedAt: null, name: user.name || user.email },
});
} else {
this.logger.log(
`Creating Driver record for user ${user.email} (isAlsoDriver toggled on)`,
);
@@ -67,13 +89,14 @@ export class UsersService {
userId: user.id,
},
});
} else if (isAlsoDriver === false && user.driver && effectiveRole !== Role.DRIVER) {
}
} else if (isAlsoDriver === false && hasActiveDriver && effectiveRole !== Role.DRIVER) {
// Only allow removing driver record if user is NOT in the DRIVER role
this.logger.log(
`Soft-deleting Driver record for user ${user.email} (isAlsoDriver toggled off)`,
);
await this.prisma.driver.update({
where: { id: user.driver.id },
where: { id: user.driver!.id },
data: { deletedAt: new Date() },
});
}