Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ model Device {
isActive Boolean @default(true) @map("is_active")
isFlagged Boolean @default(false) @map("is_flagged")
flaggedReason String? @map("flagged_reason")
usage Int @default(0) @map("usage")
usage BigInt @default(0) @map("usage")
createdAt DateTime @default(now()) @map("created_at")
updatedAt DateTime @updatedAt @map("updated_at")
teamDevices TeamDevice[] @relation("DeviceToTeamDevice")
Expand Down
9 changes: 8 additions & 1 deletion src/app/routers/grid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,16 @@ import {

const SERVER_UP_TIME = new Date().toISOString();

function serializeDevice(device: any) {
return {
...device,
usage: Number(device.usage),
};
}

async function getSavedDevices(request: Request, response: Response) {
const devices = await prisma.device.findMany();
return response.json(devices);
return response.json(devices.map(serializeDevice));
}

async function getDevices(request: Request, response: Response) {
Expand Down
9 changes: 8 additions & 1 deletion src/auth/services/device-allocation.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,17 @@ import { ATDRepository } from '../../data-service/db';
/**
* Device allocation service for handling device allocation operations
*/
function serializeDevice(device: any) {
return {
...device,
usage: Number(device.usage),
};
}

export class DeviceAllocationService {
async getAllDevices() {
const devices = await prisma.device.findMany();
return devices;
return devices.map(serializeDevice);
}

/**
Expand Down
5 changes: 4 additions & 1 deletion src/auth/services/team.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,10 @@ export class TeamService {
},
});

return createdTeamDevices;
return createdTeamDevices.map((td) => ({
...td,
device: td.device ? { ...td.device, usage: Number(td.device.usage) } : null,
}));
} catch (error) {
log.error(`Error adding devices to team: ${error}`);
throw error;
Expand Down
7 changes: 5 additions & 2 deletions src/data-service/device-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ export async function updateDeviceDetails() {
.update(function (d: IDevice) {
d.name = device.name ?? d.name;
d.tags = device.tags?.split(',').filter(Boolean) || [];
d.totalUtilizationTimeMilliSec = device.usage;
d.totalUtilizationTimeMilliSec = Number(device.usage);
});
}
}
Expand Down Expand Up @@ -252,7 +252,10 @@ export async function getTeamDevicesForUser(userId: string): Promise<TeamDevice[
},
});

return teamDevices;
return teamDevices.map((td) => ({
...td,
device: td.device ? { ...td.device, usage: Number(td.device.usage) } : null,
}));
}

export async function filterDeviceForUser(
Expand Down
2 changes: 1 addition & 1 deletion src/modules
Loading