Skip to content

fix: rm redundant query #1023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jona159 wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

fix: rm redundant query #1023

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85fd623
fix: rm redundant query
jona159 Jul 14, 2026
ac4ea11
Merge branch 'dev' into fix/rm-redundant-db-query
jona159 Jul 15, 2026
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
21 changes: 1 addition & 20 deletions app/db/models/measurement.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { and, desc, eq, gt, gte, inArray, lt, lte, sql } from 'drizzle-orm'
import { ArchivedDeviceError } from './device.server'
import {
type LastMeasurement,
location,
Expand Down Expand Up @@ -235,25 +234,7 @@ export async function saveMeasurements(
})

await drizzleClient.transaction(async (tx) => {
const [currentDevice] = await tx
.select({
id: device.id,
archivedAt: device.archivedAt,
})
.from(device)
.where(eq(device.id, minimalDevice.id))
.limit(1)
timing?.mark('transactionDeviceLookup')

if (!currentDevice) {
const error = new Error('Device not found')
error.name = 'NotFoundError'
throw error
}

if (currentDevice.archivedAt) {
throw new ArchivedDeviceError(currentDevice.id)

@scheidtdav scheidtdav Jul 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minimalDevice should carry the archivedAt field, you can keep the check but get rid of the redundant lookup.

}
timing?.mark('transactionStart')

const locations =
deviceLocationUpdates.length > 0
Expand Down
Loading